diff --git a/bundle/Command/RefreshStoredResourcesCommand.php b/bundle/Command/RefreshStoredResourcesCommand.php
index 31e12737..90e73bcb 100644
--- a/bundle/Command/RefreshStoredResourcesCommand.php
+++ b/bundle/Command/RefreshStoredResourcesCommand.php
@@ -29,7 +29,7 @@ final class RefreshStoredResourcesCommand extends Command
 
     private int $batchSize = 500;
 
-    /** @var \Netgen\RemoteMedia\API\Values\RemoteResource[] */
+    /** @var RemoteResource[] */
     private array $resourcesToDelete;
 
     public function __construct(
@@ -97,7 +97,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     }
 
     /**
-     * @return \Netgen\RemoteMedia\API\Values\RemoteResource[]
+     * @return RemoteResource[]
      */
     private function getBatch(int $limit, int $offset): array
     {
@@ -105,7 +105,7 @@ private function getBatch(int $limit, int $offset): array
     }
 
     /**
-     * @param \Netgen\RemoteMedia\API\Values\RemoteResource[] $resources
+     * @param RemoteResource[] $resources
      */
     private function refreshResources(array $resources): void
     {
@@ -135,7 +135,7 @@ private function refreshResources(array $resources): void
     /**
      * @param string[] $remoteIds
      *
-     * @return array<string, \Netgen\RemoteMedia\API\Values\RemoteResource>
+     * @return array<string, RemoteResource>
      */
     private function getRemoteBatch(array $remoteIds): array
     {
diff --git a/bundle/Controller/Resource/AbstractController.php b/bundle/Controller/Resource/AbstractController.php
index e2d0ad62..5cad638b 100644
--- a/bundle/Controller/Resource/AbstractController.php
+++ b/bundle/Controller/Resource/AbstractController.php
@@ -52,7 +52,7 @@ protected function formatResource(RemoteResource $resource): array
     }
 
     /**
-     * @param \Netgen\RemoteMedia\API\Values\RemoteResource[] $resources
+     * @param RemoteResource[] $resources
      */
     protected function formatResources(array $resources): array
     {
diff --git a/bundle/Templating/Twig/Extension/RemoteMediaExtension.php b/bundle/Templating/Twig/Extension/RemoteMediaExtension.php
index c19ce670..b09b6005 100644
--- a/bundle/Templating/Twig/Extension/RemoteMediaExtension.php
+++ b/bundle/Templating/Twig/Extension/RemoteMediaExtension.php
@@ -12,7 +12,7 @@
 final class RemoteMediaExtension extends AbstractExtension
 {
     /**
-     * @return \Twig\TwigFunction[]
+     * @return TwigFunction[]
      */
     public function getFunctions(): array
     {
@@ -97,7 +97,7 @@ public function getFunctions(): array
     }
 
     /**
-     * @return \Twig\TwigFilter[]
+     * @return TwigFilter[]
      */
     public function getFilters(): array
     {
diff --git a/lib/API/Search/Query.php b/lib/API/Search/Query.php
index 01fe7ae2..0c564a1c 100644
--- a/lib/API/Search/Query.php
+++ b/lib/API/Search/Query.php
@@ -4,6 +4,8 @@
 
 namespace Netgen\RemoteMedia\API\Search;
 
+use Netgen\RemoteMedia\API\Values\Folder;
+
 use function get_object_vars;
 use function http_build_query;
 use function implode;
@@ -13,7 +15,7 @@ final class Query
 {
     /**
      * @param string[] $types
-     * @param \Netgen\RemoteMedia\API\Values\Folder[] $folders
+     * @param Folder[] $folders
      * @param string[] $visibilities
      * @param string[] $tags
      * @param string[] $remoteIds
diff --git a/lib/API/Search/Result.php b/lib/API/Search/Result.php
index b2e4d9ae..a3a6993c 100644
--- a/lib/API/Search/Result.php
+++ b/lib/API/Search/Result.php
@@ -4,10 +4,12 @@
 
 namespace Netgen\RemoteMedia\API\Search;
 
+use Netgen\RemoteMedia\API\Values\RemoteResource;
+
 final class Result
 {
     /**
-     * @param \Netgen\RemoteMedia\API\Values\RemoteResource[] $resources
+     * @param RemoteResource[] $resources
      */
     public function __construct(
         private int $totalCount,
@@ -26,7 +28,7 @@ public function getNextCursor(): ?string
     }
 
     /**
-     * @return \Netgen\RemoteMedia\API\Values\RemoteResource[]
+     * @return RemoteResource[]
      */
     public function getResources(): array
     {
diff --git a/lib/API/Values/RemoteResource.php b/lib/API/Values/RemoteResource.php
index 7df6f4fe..c122ea04 100644
--- a/lib/API/Values/RemoteResource.php
+++ b/lib/API/Values/RemoteResource.php
@@ -42,7 +42,7 @@ class RemoteResource
      * @param string[] $tags
      * @param array<string,mixed> $metadata
      * @param array<string,mixed> $context
-     * @param Collection|\Netgen\RemoteMedia\API\Values\RemoteResourceLocation[] $locations
+     * @param Collection|RemoteResourceLocation[] $locations
      */
     public function __construct(
         private string $remoteId,
@@ -343,7 +343,7 @@ public function removeContextProperty(string $name): self
     }
 
     /**
-     * @return Collection|\Netgen\RemoteMedia\API\Values\RemoteResourceLocation[]
+     * @return Collection|RemoteResourceLocation[]
      */
     public function getLocations(): array|Collection
     {
diff --git a/lib/API/Values/RemoteResourceLocation.php b/lib/API/Values/RemoteResourceLocation.php
index b7fd8e07..201068c1 100644
--- a/lib/API/Values/RemoteResourceLocation.php
+++ b/lib/API/Values/RemoteResourceLocation.php
@@ -41,7 +41,7 @@ public function setSource(?string $source): self
     }
 
     /**
-     * @return \Netgen\RemoteMedia\API\Values\CropSettings[]
+     * @return CropSettings[]
      */
     public function getCropSettings(): array
     {
@@ -49,7 +49,7 @@ public function getCropSettings(): array
     }
 
     /**
-     * @param \Netgen\RemoteMedia\API\Values\CropSettings[] $cropSettings
+     * @param CropSettings[] $cropSettings
      */
     public function setCropSettings(array $cropSettings): self
     {
diff --git a/lib/Core/AbstractProvider.php b/lib/Core/AbstractProvider.php
index 349f84b6..11a05a52 100644
--- a/lib/Core/AbstractProvider.php
+++ b/lib/Core/AbstractProvider.php
@@ -46,7 +46,7 @@ public function __construct(
     }
 
     /**
-     * @return \Netgen\RemoteMedia\API\Values\Folder[]
+     * @return Folder[]
      *
      * @throws NotSupportedException
      */
@@ -356,7 +356,7 @@ public function generateRawVariationHtmlTag(
     }
 
     /**
-     * @return \Netgen\RemoteMedia\API\Values\Folder[]
+     * @return Folder[]
      */
     abstract protected function internalListFolders(?Folder $parent = null): array;
 
diff --git a/lib/Core/Transformation/Registry.php b/lib/Core/Transformation/Registry.php
index 350f0a88..8e57cf99 100644
--- a/lib/Core/Transformation/Registry.php
+++ b/lib/Core/Transformation/Registry.php
@@ -8,7 +8,7 @@
 
 final class Registry
 {
-    /** @var \Netgen\RemoteMedia\Core\Transformation\HandlerInterface[] */
+    /** @var HandlerInterface[] */
     private array $transformationHandlers = [];
 
     public function addHandler(string $provider, string $identifier, HandlerInterface $transformationHandler): void
diff --git a/lib/Form/DataTransformer/RemoteMediaTransformer.php b/lib/Form/DataTransformer/RemoteMediaTransformer.php
index edc6dd73..112706ae 100644
--- a/lib/Form/DataTransformer/RemoteMediaTransformer.php
+++ b/lib/Form/DataTransformer/RemoteMediaTransformer.php
@@ -110,7 +110,7 @@ private function resolveCropSettingsString(RemoteResourceLocation $location): st
     }
 
     /**
-     * @return \Netgen\RemoteMedia\API\Values\CropSettings[]
+     * @return CropSettings[]
      */
     private function resolveCropSettings(array $data): array
     {