diff --git a/application/Espo/Classes/Jobs/Cleanup.php b/application/Espo/Classes/Jobs/Cleanup.php
index b8a63a51fb..87b92b0cca 100644
--- a/application/Espo/Classes/Jobs/Cleanup.php
+++ b/application/Espo/Classes/Jobs/Cleanup.php
@@ -135,7 +135,7 @@ class Cleanup implements JobDataLess
 
         foreach ($items as $name => $item) {
             try {
-                /** @var class-string<\Espo\Core\Cleanup\Cleanup> */
+                /** @var class-string<\Espo\Core\Cleanup\Cleanup> $className */
                 $className = $item['className'];
 
                 $obj = $injectableFactory->create($className);
@@ -362,7 +362,7 @@ class Cleanup implements JobDataLess
 
         $datetimeFrom->modify($fromPeriod);
 
-        /** @var string[] */
+        /** @var string[] $scopeList */
         $scopeList = array_keys($this->metadata->get(['scopes']));
 
         foreach ($scopeList as $scope) {
@@ -572,7 +572,7 @@ class Cleanup implements JobDataLess
         $fileManager = $this->fileManager;
 
         if ($fileManager->exists($path)) {
-            /** @var string[] */
+            /** @var string[] $fileList */
             $fileList = $fileManager->getFileList($path, false, '', false);
 
             foreach ($fileList as $dirName) {
@@ -731,7 +731,7 @@ class Cleanup implements JobDataLess
 
         $datetime = new DateTime($period);
 
-        /** @var string[] */
+        /** @var string[] $scopeList */
         $scopeList = array_keys($this->metadata->get(['scopes']));
 
         foreach ($scopeList as $scope) {
diff --git a/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php b/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php
index 181b0334ad..171f65c196 100644
--- a/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php
+++ b/application/Espo/Classes/Select/Email/AccessControlFilters/PortalOnlyAccount.php
@@ -61,7 +61,7 @@ class PortalOnlyAccount implements Filter
             'emailUser.userId' => $this->user->getId(),
         ];
 
-        /** @var string[] */
+        /** @var string[] $accountIdList */
         $accountIdList = $this->user->getLinkMultipleIdList('accounts');
 
         if (count($accountIdList)) {
diff --git a/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php b/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php
index e94d6071a1..0261fd48e4 100644
--- a/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php
+++ b/application/Espo/Classes/Select/User/BoolFilters/OnlyMyTeam.php
@@ -50,7 +50,7 @@ class OnlyMyTeam implements Filter
 
     public function apply(SelectBuilder $queryBuilder, OrGroupBuilder $orGroupBuilder): void
     {
-        /** @var string[] */
+        /** @var string[] $teamIdList */
         $teamIdList = $this->user->getLinkMultipleIdList('teams');
 
         if (count($teamIdList) === 0) {
diff --git a/application/Espo/Controllers/ExternalAccount.php b/application/Espo/Controllers/ExternalAccount.php
index 1e9e896139..ba7734058e 100644
--- a/application/Espo/Controllers/ExternalAccount.php
+++ b/application/Espo/Controllers/ExternalAccount.php
@@ -66,7 +66,7 @@ class ExternalAccount extends RecordBase
                 $entity->get('enabled') &&
                 $this->metadata->get('integrations.' . $entity->getId() .'.allowUserAccounts')
             ) {
-                /** @var string */
+                /** @var string $id */
                 $id = $entity->getId();
 
                 $userAccountAclScope = $this->metadata
@@ -118,7 +118,7 @@ class ExternalAccount extends RecordBase
 
     public function getActionRead(Request $request, Response $response): stdClass
     {
-        /** @var string */
+        /** @var string $id */
         $id = $request->getRouteParam('id');
 
         if ($id === '') {
@@ -132,7 +132,7 @@ class ExternalAccount extends RecordBase
 
     public function putActionUpdate(Request $request, Response $response): stdClass
     {
-        /** @var string */
+        /** @var string $id */
         $id = $request->getRouteParam('id');
 
         $data = $request->getParsedBody();
diff --git a/application/Espo/Controllers/Integration.php b/application/Espo/Controllers/Integration.php
index 0131c5b932..6df13ba69f 100644
--- a/application/Espo/Controllers/Integration.php
+++ b/application/Espo/Controllers/Integration.php
@@ -56,7 +56,7 @@ class Integration
 
     public function getActionRead(Request $request): stdClass
     {
-        /** @var string */
+        /** @var string $id */
         $id = $request->getRouteParam('id');
 
         $entity = $this->service->read($id);
@@ -66,7 +66,7 @@ class Integration
 
     public function putActionUpdate(Request $request): stdClass
     {
-        /** @var string */
+        /** @var string $id */
         $id = $request->getRouteParam('id');
         $data = $request->getParsedBody();
 
diff --git a/application/Espo/Controllers/Kanban.php b/application/Espo/Controllers/Kanban.php
index bed7da86d5..9445919c0a 100644
--- a/application/Espo/Controllers/Kanban.php
+++ b/application/Espo/Controllers/Kanban.php
@@ -53,7 +53,7 @@ class Kanban
 
     public function getActionGetData(Request $request): stdClass
     {
-        /** @var string */
+        /** @var string $entityType */
         $entityType = $request->getRouteParam('entityType');
 
         $searchParams = $this->searchParamsFetcher->fetch($request);
diff --git a/application/Espo/Core/AclManager.php b/application/Espo/Core/AclManager.php
index 79435441ac..f0d572efdf 100644
--- a/application/Espo/Core/AclManager.php
+++ b/application/Espo/Core/AclManager.php
@@ -618,7 +618,7 @@ class AclManager
         }
 
         if ($permission === Table::LEVEL_TEAM) {
-            /** @var string[] */
+            /** @var string[] $teamIdList */
             $teamIdList = $user->getLinkMultipleIdList('teams');
 
             /** @var \Espo\Repositories\User $userRepository */
diff --git a/application/Espo/Core/Application.php b/application/Espo/Core/Application.php
index b5e4f41f51..949a2991b8 100644
--- a/application/Espo/Core/Application.php
+++ b/application/Espo/Core/Application.php
@@ -61,7 +61,7 @@ class Application
 
     protected function initContainer(): void
     {
-        /** @var Container */
+        /** @var Container $container */
         $container = (new ContainerBuilder())->build();
 
         $this->container = $container;
diff --git a/application/Espo/Core/Container.php b/application/Espo/Core/Container.php
index d906ce5c3f..e69b46337a 100644
--- a/application/Espo/Core/Container.php
+++ b/application/Espo/Core/Container.php
@@ -91,7 +91,7 @@ class Container implements ContainerInterface
 
         $this->bindingContainer = $bindingContainer;
 
-        /** @var InjectableFactory */
+        /** @var InjectableFactory $injectableFactory */
         $injectableFactory = $this->get('injectableFactory');
 
         $this->injectableFactory = $injectableFactory;
@@ -217,7 +217,7 @@ class Container implements ContainerInterface
             throw new RuntimeException("Loader method for service '{$name}' does not have a named return type.");
         }
 
-        /** @var class-string */
+        /** @var class-string $className */
         $className = $returnType->getName();
 
         $this->classCache[$name] = new ReflectionClass($className);
@@ -282,7 +282,7 @@ class Container implements ContainerInterface
      * @return ?class-string<Loader>
      */
     private function getLoaderClassName(string $name): ?string
-    {       
+    {
         $loader = $this->loaderClassNames[$name] ?? null;
 
         if ($loader) {
diff --git a/application/Espo/Core/HookManager.php b/application/Espo/Core/HookManager.php
index 8b009682bb..958f44bdbc 100644
--- a/application/Espo/Core/HookManager.php
+++ b/application/Espo/Core/HookManager.php
@@ -166,7 +166,7 @@ class HookManager
     private function loadHooks(): void
     {
         if ($this->config->get('useCache') && $this->dataCache->has($this->cacheKey)) {
-            /** @var array<string,array<string,mixed>> */
+            /** @var array<string,array<string,mixed>> $cachedData */
             $cachedData = $this->dataCache->get($this->cacheKey);
 
             $this->data = $cachedData;
@@ -218,7 +218,7 @@ class HookManager
             return $hookData;
         }
 
-        /** @var array<string,string[]> */
+        /** @var array<string,string[]> $fileList */
         $fileList = $this->fileManager->getFileList($hookDir, 1, '\.php$', true);
 
         foreach ($fileList as $scopeName => $hookFiles) {
@@ -233,7 +233,7 @@ class HookManager
 
                 $hookMethods = array_diff($classMethods, $this->ignoredMethodList);
 
-                /** @var string[] */
+                /** @var string[] $hookMethods */
                 $hookMethods = array_filter($hookMethods, function ($item) {
                     if (strpos($item, 'set') === 0) {
                         return false;
diff --git a/application/Espo/Core/InjectableFactory.php b/application/Espo/Core/InjectableFactory.php
index 9192a109ab..16f5c98127 100644
--- a/application/Espo/Core/InjectableFactory.php
+++ b/application/Espo/Core/InjectableFactory.php
@@ -189,7 +189,7 @@ class InjectableFactory
             !$type->isBuiltin()
         ) {
             try {
-                /** @var class-string */
+                /** @var class-string $dependencyClassName */
                 $dependencyClassName = $type->getName();
 
                 $dependencyClass = new ReflectionClass($dependencyClassName);
@@ -395,7 +395,7 @@ class InjectableFactory
             $type instanceof ReflectionNamedType &&
             !$type->isBuiltin()
         ) {
-            /** @var class-string */
+            /** @var class-string $dependencyClassName */
             $dependencyClassName = $type->getName();
 
             $paramClass = new ReflectionClass($dependencyClassName);