diff --git a/src/Type/OpenApi.php b/src/Type/OpenApi.php
index 6346d3a..cc4907e 100644
--- a/src/Type/OpenApi.php
+++ b/src/Type/OpenApi.php
@@ -153,13 +153,13 @@ public function render(
 
         if ($apiGetCollectionHandler->exists()) {
             $class
-                ->useClass($apiDeleteResourceHandler->getComponent()->getFqcn())
+                ->useClass($apiGetCollectionHandler->getComponent()->getFqcn())
                 ->useClass($collection->getFqcn());
 
             // phpcs:disable Generic.Files.LineLength.TooLong
             $comments[] = <<<COMM
 /**
- * @see {$apiDeleteResourceHandler->getComponent()->getClassName()}::handle()
+ * @see {$apiGetCollectionHandler->getComponent()->getClassName()}::handle()
  */
 #[OA\Get(
     path: '/{$entity->toKebabCase()}',
diff --git a/src/Type/RoutesDelegator.php b/src/Type/RoutesDelegator.php
index 19633e0..4ebe7d3 100644
--- a/src/Type/RoutesDelegator.php
+++ b/src/Type/RoutesDelegator.php
@@ -140,10 +140,10 @@ public function render(
             $invoke->appendBody(
                 sprintf(
                     '->get(\'/%s\', %s, \'%s::list-%s\')',
-                    Component::pluralize($entity->toKebabCase()),
+                    $entity->toKebabCase(),
                     $apiGetCollectionHandler->getComponent()->getClassString(),
                     $entity->toKebabCase(),
-                    Component::pluralize($entity->toKebabCase()),
+                    $entity->toKebabCase(),
                 ),
                 12
             );
diff --git a/test/Type/OpenApiTest.php b/test/Type/OpenApiTest.php
index 20a558c..7921d1b 100644
--- a/test/Type/OpenApiTest.php
+++ b/test/Type/OpenApiTest.php
@@ -155,6 +155,7 @@ private function dataProviderRenderedOpenApi(): string
 use Api\ModuleName\Collection\ModuleNameCollection;
 use Api\ModuleName\Entity\ModuleName;
 use Api\ModuleName\Handler\ModuleName\DeleteModuleNameResourceHandler;
+use Api\ModuleName\Handler\ModuleName\GetModuleNameCollectionHandler;
 use Api\ModuleName\Handler\ModuleName\GetModuleNameResourceHandler;
 use Api\ModuleName\Handler\ModuleName\PatchModuleNameResourceHandler;
 use Api\ModuleName\Handler\ModuleName\PostModuleNameResourceHandler;
@@ -225,7 +226,7 @@ private function dataProviderRenderedOpenApi(): string
 )]
 
 /**
- * @see DeleteModuleNameResourceHandler::handle()
+ * @see GetModuleNameCollectionHandler::handle()
  */
 #[OA\Get(
     path: '/module-name',
diff --git a/test/Type/RoutesDelegatorTest.php b/test/Type/RoutesDelegatorTest.php
index 671b7e3..36823a5 100644
--- a/test/Type/RoutesDelegatorTest.php
+++ b/test/Type/RoutesDelegatorTest.php
@@ -224,7 +224,7 @@ public function __invoke(
         \$routeCollector
             ->delete('/book-store/' . \$uuid, DeleteBookStoreResourceHandler::class, 'book-store::delete-book-store')
             ->get('/book-store/' . \$uuid, GetBookStoreResourceHandler::class, 'book-store::view-book-store')
-            ->get('/book-stores', GetBookStoreCollectionHandler::class, 'book-store::list-book-stores')
+            ->get('/book-store', GetBookStoreCollectionHandler::class, 'book-store::list-book-store')
             ->patch('/book-store/' . \$uuid, PatchBookStoreResourceHandler::class, 'book-store::update-book-store')
             ->post('/book-store', PostBookStoreResourceHandler::class, 'book-store::create-book-store')
             ->put('/book-store/' . \$uuid, PutBookStoreResourceHandler::class, 'book-store::replace-book-store');