diff --git a/.phpdoc-md b/.phpdoc-md
index 6b2c36e..8765492 100644
--- a/.phpdoc-md
+++ b/.phpdoc-md
@@ -9,7 +9,7 @@ return (object)[
         '\OpenCatalogi\OpenCatalogiBundle\Service\EnrichPubliccodeFromGithubUrlService',
         '\OpenCatalogi\OpenCatalogiBundle\Service\EnrichPubliccodeService',
         '\OpenCatalogi\OpenCatalogiBundle\Service\FederalizationService',
-        '\OpenCatalogi\OpenCatalogiBundle\Service\FindGithubRepositoryThroughOrganizationService',
+        '\OpenCatalogi\OpenCatalogiBundle\Service\FindRepositoryThroughOrganizationService',
         '\OpenCatalogi\OpenCatalogiBundle\Service\FindOrganizationThroughRepositoriesService',
         '\OpenCatalogi\OpenCatalogiBundle\Service\GithubApiService',
         '\OpenCatalogi\OpenCatalogiBundle\Service\GithubEventService',
diff --git a/src/ActionHandler/EnrichDownloadHandler.php b/src/ActionHandler/EnrichDownloadHandler.php
index 15c4c8a..a667a82 100644
--- a/src/ActionHandler/EnrichDownloadHandler.php
+++ b/src/ActionHandler/EnrichDownloadHandler.php
@@ -4,8 +4,6 @@
 
 use  CommonGateway\CoreBundle\ActionHandler\ActionHandlerInterface;
 use OpenCatalogi\OpenCatalogiBundle\Service\DownloadObjectService;
-use OpenCatalogi\OpenCatalogiBundle\Service\FindGithubRepositoryThroughOrganizationService;
-use OpenCatalogi\OpenCatalogiBundle\Service\GithubApiService;
 
 /**
  * Executes a the EnrichOrganizationHandler and gets an organization from the response of the githubEventAction and formInputAction
diff --git a/src/ActionHandler/EnrichOrganizationHandler.php b/src/ActionHandler/EnrichOrganizationHandler.php
index a986e4f..96e8100 100644
--- a/src/ActionHandler/EnrichOrganizationHandler.php
+++ b/src/ActionHandler/EnrichOrganizationHandler.php
@@ -4,8 +4,6 @@
 
 use  CommonGateway\CoreBundle\ActionHandler\ActionHandlerInterface;
 use OpenCatalogi\OpenCatalogiBundle\Service\EnrichOrganizationService;
-use OpenCatalogi\OpenCatalogiBundle\Service\FindGithubRepositoryThroughOrganizationService;
-use OpenCatalogi\OpenCatalogiBundle\Service\GithubApiService;
 
 /**
  * Executes a the EnrichOrganizationHandler and gets an organization from the response of the githubEventAction and formInputAction
diff --git a/src/Command/ComponentenCatalogusGetApplicationsCommand.php b/src/Command/ComponentenCatalogusGetApplicationsCommand.php
index 19dd559..efb528a 100644
--- a/src/Command/ComponentenCatalogusGetApplicationsCommand.php
+++ b/src/Command/ComponentenCatalogusGetApplicationsCommand.php
@@ -11,7 +11,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 /**
- * Command to execute the FindGithubRepositoryThroughOrganizationService.
+ * Command to execute the FindRepositoryThroughOrganizationService.
  */
 class ComponentenCatalogusGetApplicationsCommand extends Command
 {
diff --git a/src/Command/ComponentenCatalogusGetComponentsCommand.php b/src/Command/ComponentenCatalogusGetComponentsCommand.php
index a509430..4f5c7cd 100644
--- a/src/Command/ComponentenCatalogusGetComponentsCommand.php
+++ b/src/Command/ComponentenCatalogusGetComponentsCommand.php
@@ -11,7 +11,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 /**
- * Command to execute the FindGithubRepositoryThroughOrganizationService.
+ * Command to execute the FindRepositoryThroughOrganizationService.
  */
 class ComponentenCatalogusGetComponentsCommand extends Command
 {
diff --git a/src/Command/FindGithubRepositoryThroughOrganizationCommand.php b/src/Command/FindGithubRepositoryThroughOrganizationCommand.php
index ce86479..d6f0e52 100644
--- a/src/Command/FindGithubRepositoryThroughOrganizationCommand.php
+++ b/src/Command/FindGithubRepositoryThroughOrganizationCommand.php
@@ -3,7 +3,7 @@
 namespace OpenCatalogi\OpenCatalogiBundle\Command;
 
 use CommonGateway\CoreBundle\Service\GatewayResourceService;
-use OpenCatalogi\OpenCatalogiBundle\Service\FindGithubRepositoryThroughOrganizationService;
+use OpenCatalogi\OpenCatalogiBundle\Service\FindRepositoryThroughOrganizationService;
 use OpenCatalogi\OpenCatalogiBundle\Service\FindRepositoryThroughOrganizationService;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -12,7 +12,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 /**
- * Command to execute the FindGithubRepositoryThroughOrganizationService.
+ * Command to execute the FindRepositoryThroughOrganizationService.
  */
 class FindGithubRepositoryThroughOrganizationCommand extends Command
 {
@@ -24,9 +24,9 @@ class FindGithubRepositoryThroughOrganizationCommand extends Command
     protected static $defaultName = 'opencatalogi:github:discoverrepository';
 
     /**
-     * @var FindGithubRepositoryThroughOrganizationService
+     * @var FindRepositoryThroughOrganizationService
      */
-    private FindGithubRepositoryThroughOrganizationService $findGitService;
+    private FindRepositoryThroughOrganizationService $findGitService;
 
     /**
      * @var GatewayResourceService
@@ -35,8 +35,8 @@ class FindGithubRepositoryThroughOrganizationCommand extends Command
 
 
     /**
-     * @param FindGithubRepositoryThroughOrganizationService $findGitService  find Github Repository Through Organization Service
-     * @param GatewayResourceService                         $resourceService The Gateway Resource Service
+     * @param FindRepositoryThroughOrganizationService $findGitService  find Github Repository Through Organization Service
+     * @param GatewayResourceService                   $resourceService The Gateway Resource Service
      */
     public function __construct(
         FindRepositoryThroughOrganizationService $findGitService,
@@ -55,7 +55,7 @@ public function __construct(
     protected function configure(): void
     {
         $this
-            ->setDescription('This command triggers OpenCatalogi FindGithubRepositoryThroughOrganizationService')
+            ->setDescription('This command triggers OpenCatalogi FindRepositoryThroughOrganizationService')
             ->setHelp('This command allows you to update create owned repositories from organisation')
             ->addOption('organizationId', 'o', InputOption::VALUE_OPTIONAL, 'Find owned repositories for a specific organisation by id');