diff --git a/app/config/services.yml b/app/config/services.yml
index 572b8fd59..799a8cfde 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -220,7 +220,7 @@ services:
 
     Wallabag\Helper\HttpClientFactory:
         calls:
-            - ['addSubscriber', ['@Wallabag\Guzzle\AuthenticatorSubscriber']]
+            - ['addSubscriber', ['@Wallabag\HttpClient\Authenticator']]
 
     RulerZ\RulerZ:
         alias: rulerz
diff --git a/src/Guzzle/AuthenticatorSubscriber.php b/src/HttpClient/Authenticator.php
similarity index 94%
rename from src/Guzzle/AuthenticatorSubscriber.php
rename to src/HttpClient/Authenticator.php
index dd11f6d30..47a7a17aa 100644
--- a/src/Guzzle/AuthenticatorSubscriber.php
+++ b/src/HttpClient/Authenticator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\Guzzle;
+namespace Wallabag\HttpClient;
 
 use GuzzleHttp\Psr7\Uri;
 use Psr\Http\Message\UriInterface;
@@ -12,7 +12,7 @@ use Wallabag\SiteConfig\LoginFormAuthenticator;
 use Wallabag\SiteConfig\SiteConfig;
 use Wallabag\SiteConfig\SiteConfigBuilder;
 
-class AuthenticatorSubscriber implements LoggerAwareInterface
+class Authenticator implements LoggerAwareInterface
 {
     /** @var SiteConfigBuilder */
     private $configBuilder;
@@ -23,9 +23,6 @@ class AuthenticatorSubscriber implements LoggerAwareInterface
     /** @var LoggerInterface */
     private $logger;
 
-    /**
-     * AuthenticatorSubscriber constructor.
-     */
     public function __construct(SiteConfigBuilder $configBuilder, LoginFormAuthenticator $authenticator)
     {
         $this->configBuilder = $configBuilder;
diff --git a/tests/Guzzle/AuthenticatorSubscriberTest.php b/tests/Tests/Wallabag/HttpClient/AuthenticatorTest.php
similarity index 92%
rename from tests/Guzzle/AuthenticatorSubscriberTest.php
rename to tests/Tests/Wallabag/HttpClient/AuthenticatorTest.php
index dc45bb19e..d58ae6591 100644
--- a/tests/Guzzle/AuthenticatorSubscriberTest.php
+++ b/tests/Tests/Wallabag/HttpClient/AuthenticatorTest.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Tests\Wallabag\Guzzle;
+namespace Tests\Wallabag\HttpClient;
 
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
 use Symfony\Contracts\HttpClient\ResponseInterface;
-use Wallabag\Guzzle\AuthenticatorSubscriber;
+use Wallabag\HttpClient\Authenticator;
 use Wallabag\SiteConfig\ArraySiteConfigBuilder;
 use Wallabag\SiteConfig\LoginFormAuthenticator;
 
-class AuthenticatorSubscriberTest extends TestCase
+class AuthenticatorTest extends TestCase
 {
     public function testLoginIfRequiredNotRequired()
     {
@@ -19,7 +19,7 @@ class AuthenticatorSubscriberTest extends TestCase
             ->getMock();
 
         $builder = new ArraySiteConfigBuilder(['example.com' => []]);
-        $subscriber = new AuthenticatorSubscriber($builder, $authenticator);
+        $subscriber = new \Wallabag\HttpClient\Authenticator($builder, $authenticator);
 
         $logger = new Logger('foo');
         $handler = new TestHandler();
@@ -51,7 +51,7 @@ class AuthenticatorSubscriberTest extends TestCase
             ->method('login');
 
         $builder = new ArraySiteConfigBuilder(['example.com' => ['requiresLogin' => true]]);
-        $subscriber = new AuthenticatorSubscriber($builder, $authenticator);
+        $subscriber = new Authenticator($builder, $authenticator);
 
         $logger = new Logger('foo');
         $handler = new TestHandler();
@@ -76,7 +76,7 @@ class AuthenticatorSubscriberTest extends TestCase
             ->getMock();
 
         $builder = new ArraySiteConfigBuilder(['example.com' => []]);
-        $subscriber = new AuthenticatorSubscriber($builder, $authenticator);
+        $subscriber = new Authenticator($builder, $authenticator);
 
         $logger = new Logger('foo');
         $handler = new TestHandler();
@@ -117,7 +117,7 @@ class AuthenticatorSubscriberTest extends TestCase
             'requiresLogin' => true,
             'notLoggedInXpath' => '//html',
         ]]);
-        $subscriber = new AuthenticatorSubscriber($builder, $authenticator);
+        $subscriber = new Authenticator($builder, $authenticator);
 
         $logger = new Logger('foo');
         $handler = new TestHandler();
@@ -165,7 +165,7 @@ class AuthenticatorSubscriberTest extends TestCase
             'requiresLogin' => true,
             'notLoggedInXpath' => '//html',
         ]]);
-        $subscriber = new AuthenticatorSubscriber($builder, $authenticator);
+        $subscriber = new Authenticator($builder, $authenticator);
 
         $logger = new Logger('foo');
         $handler = new TestHandler();
@@ -206,7 +206,7 @@ class AuthenticatorSubscriberTest extends TestCase
             'requiresLogin' => true,
             'notLoggedInXpath' => '//html',
         ]]);
-        $subscriber = new AuthenticatorSubscriber($builder, $authenticator);
+        $subscriber = new Authenticator($builder, $authenticator);
 
         $logger = new Logger('foo');
         $handler = new TestHandler();