diff --git a/app/config/services.yml b/app/config/services.yml
index 3e89e29df..7dbb7f501 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -191,13 +191,13 @@ services:
     wallabag_core.http_client:
         alias: 'httplug.client.wallabag_core'
 
-    Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder:
+    Wallabag\CoreBundle\SiteConfig\GrabySiteConfigBuilder:
         tags:
             - { name: monolog.logger, channel: graby }
 
     # service alias override
     bd_guzzle_site_authenticator.site_config_builder:
-        alias: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder
+        alias: Wallabag\CoreBundle\SiteConfig\GrabySiteConfigBuilder
 
     GuzzleHttp\Cookie\CookieJar:
         alias: 'Wallabag\CoreBundle\Helper\FileCookieJar'
diff --git a/src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php b/src/Wallabag/CoreBundle/SiteConfig/GrabySiteConfigBuilder.php
similarity index 98%
rename from src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
rename to src/Wallabag/CoreBundle/SiteConfig/GrabySiteConfigBuilder.php
index edc7d8402..5c329081f 100644
--- a/src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
+++ b/src/Wallabag/CoreBundle/SiteConfig/GrabySiteConfigBuilder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\GuzzleSiteAuthenticator;
+namespace Wallabag\CoreBundle\SiteConfig;
 
 use BD\GuzzleSiteAuthenticator\SiteConfig\SiteConfig;
 use BD\GuzzleSiteAuthenticator\SiteConfig\SiteConfigBuilder;
diff --git a/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php b/tests/Wallabag/CoreBundle/SiteConfig/GrabySiteConfigBuilderTest.php
similarity index 98%
rename from tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php
rename to tests/Wallabag/CoreBundle/SiteConfig/GrabySiteConfigBuilderTest.php
index 7a3a1c0cf..4b78b99da 100644
--- a/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php
+++ b/tests/Wallabag/CoreBundle/SiteConfig/GrabySiteConfigBuilderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\CoreBundle\GuzzleSiteAuthenticator;
+namespace Tests\Wallabag\CoreBundle\SiteConfig;
 
 use Graby\SiteConfig\ConfigBuilder;
 use Graby\SiteConfig\SiteConfig as GrabySiteConfig;
@@ -10,8 +10,8 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 use Wallabag\CoreBundle\Entity\User;
-use Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder;
 use Wallabag\CoreBundle\Repository\SiteCredentialRepository;
+use Wallabag\CoreBundle\SiteConfig\GrabySiteConfigBuilder;
 
 class GrabySiteConfigBuilderTest extends WallabagCoreTestCase
 {