diff --git a/app/config/services.yml b/app/config/services.yml
index 662a858ef..61e628225 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 96%
rename from src/Guzzle/AuthenticatorSubscriber.php
rename to src/HttpClient/Authenticator.php
index 4b565076e..4b649af79 100644
--- a/src/Guzzle/AuthenticatorSubscriber.php
+++ b/src/HttpClient/Authenticator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\Guzzle;
+namespace Wallabag\HttpClient;
 
 use GuzzleHttp\Event\BeforeEvent;
 use GuzzleHttp\Event\CompleteEvent;
@@ -13,7 +13,7 @@ use Wallabag\SiteConfig\LoginFormAuthenticator;
 use Wallabag\SiteConfig\SiteConfig;
 use Wallabag\SiteConfig\SiteConfigBuilder;
 
-class AuthenticatorSubscriber implements SubscriberInterface, LoggerAwareInterface
+class Authenticator implements SubscriberInterface, LoggerAwareInterface
 {
     // avoid loop when login failed which can just be a bad login/password
     // after 2 attempts, we skip the login
diff --git a/tests/Guzzle/AuthenticatorSubscriberTest.php b/tests/HttpClient/AuthenticatorTest.php
similarity index 93%
rename from tests/Guzzle/AuthenticatorSubscriberTest.php
rename to tests/HttpClient/AuthenticatorTest.php
index 8ffb99208..cb607974f 100644
--- a/tests/Guzzle/AuthenticatorSubscriberTest.php
+++ b/tests/HttpClient/AuthenticatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Wallabag\Guzzle;
+namespace Tests\Wallabag\HttpClient;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Event\BeforeEvent;
@@ -12,11 +12,11 @@ use GuzzleHttp\Subscriber\Mock;
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
-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 testGetEvents()
     {
@@ -24,7 +24,7 @@ class AuthenticatorSubscriberTest extends TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        $subscriber = new AuthenticatorSubscriber(
+        $subscriber = new Authenticator(
             new ArraySiteConfigBuilder(),
             $authenticator
         );
@@ -43,7 +43,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();
@@ -83,7 +83,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();
@@ -128,7 +128,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();
@@ -168,7 +168,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();
@@ -220,7 +220,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();
@@ -271,7 +271,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();