diff --git a/.phpdoc-md b/.phpdoc-md
index 6b2c36ee..87654921 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 15c4c8a1..360f7803 100644
--- a/src/ActionHandler/EnrichDownloadHandler.php
+++ b/src/ActionHandler/EnrichDownloadHandler.php
@@ -4,7 +4,7 @@
 
 use  CommonGateway\CoreBundle\ActionHandler\ActionHandlerInterface;
 use OpenCatalogi\OpenCatalogiBundle\Service\DownloadObjectService;
-use OpenCatalogi\OpenCatalogiBundle\Service\FindGithubRepositoryThroughOrganizationService;
+use OpenCatalogi\OpenCatalogiBundle\Service\FindRepositoryThroughOrganizationService;
 use OpenCatalogi\OpenCatalogiBundle\Service\GithubApiService;
 
 /**
diff --git a/src/ActionHandler/EnrichOrganizationHandler.php b/src/ActionHandler/EnrichOrganizationHandler.php
index a986e4f6..4098304c 100644
--- a/src/ActionHandler/EnrichOrganizationHandler.php
+++ b/src/ActionHandler/EnrichOrganizationHandler.php
@@ -4,7 +4,7 @@
 
 use  CommonGateway\CoreBundle\ActionHandler\ActionHandlerInterface;
 use OpenCatalogi\OpenCatalogiBundle\Service\EnrichOrganizationService;
-use OpenCatalogi\OpenCatalogiBundle\Service\FindGithubRepositoryThroughOrganizationService;
+use OpenCatalogi\OpenCatalogiBundle\Service\FindRepositoryThroughOrganizationService;
 use OpenCatalogi\OpenCatalogiBundle\Service\GithubApiService;
 
 /**
diff --git a/src/Command/ComponentenCatalogusGetApplicationsCommand.php b/src/Command/ComponentenCatalogusGetApplicationsCommand.php
index 19dd5595..efb528a5 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 a5094305..4f5c7cdf 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 ec8f56fa..1bf9a106 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 Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -11,7 +11,7 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 
 /**
- * Command to execute the FindGithubRepositoryThroughOrganizationService.
+ * Command to execute the FindRepositoryThroughOrganizationService.
  */
 class FindGithubRepositoryThroughOrganizationCommand extends Command
 {
@@ -23,9 +23,9 @@ class FindGithubRepositoryThroughOrganizationCommand extends Command
     protected static $defaultName = 'opencatalogi:github:discoverrepository';
 
     /**
-     * @var FindGithubRepositoryThroughOrganizationService
+     * @var FindRepositoryThroughOrganizationService
      */
-    private FindGithubRepositoryThroughOrganizationService $findGitService;
+    private FindRepositoryThroughOrganizationService $findGitService;
 
     /**
      * @var GatewayResourceService
@@ -34,11 +34,11 @@ class FindGithubRepositoryThroughOrganizationCommand extends Command
 
 
     /**
-     * @param FindGithubRepositoryThroughOrganizationService $findGitService  find Github Repository Through Organization Service
+     * @param FindRepositoryThroughOrganizationService $findGitService  find Github Repository Through Organization Service
      * @param GatewayResourceService                         $resourceService The Gateway Resource Service
      */
     public function __construct(
-        FindGithubRepositoryThroughOrganizationService $findGitService,
+        FindRepositoryThroughOrganizationService $findGitService,
         GatewayResourceService $resourceService
     ) {
         $this->findGitService  = $findGitService;
@@ -54,7 +54,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');
 
@@ -76,12 +76,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $organizationId = $input->getOption('organizationId', false);
 
         if ($organizationId === null) {
-            if (empty($this->findGitService->findGithubRepositoryThroughOrganizationHandler([], $configuration)) === true) {
+            if (empty($this->findGitService->findRepositoryThroughOrganizationHandler([], $configuration)) === true) {
                 return Command::FAILURE;
             }
         }
 
-        if (empty($this->findGitService->findGithubRepositoryThroughOrganizationHandler([], $configuration, $organizationId)) === true) {
+        if (empty($this->findGitService->findRepositoryThroughOrganizationHandler([], $configuration, $organizationId)) === true) {
             return Command::FAILURE;
         }