diff --git a/lib/Tmdb/Client.php b/lib/Tmdb/Client.php
index e9a86df4..07ca5100 100644
--- a/lib/Tmdb/Client.php
+++ b/lib/Tmdb/Client.php
@@ -20,7 +20,7 @@
 use Tmdb\HttpClient\HttpClientInterface;
 
 use Tmdb\ApiToken as Token;
-use Tmdb\HttpClient\Plugin\AcceptJsonHeader;
+use Tmdb\HttpClient\Plugin\AcceptJsonHeaderPlugin;
 use Tmdb\HttpClient\Plugin\ApiTokenPlugin;
 
 /**
@@ -58,10 +58,10 @@ public function __construct(Token $token, ClientInterface $httpClient = null)
         $httpClient = $httpClient ?: new GuzzleClient(self::TMDB_URI);
 
         if ($httpClient instanceof \Guzzle\Common\HasDispatcherInterface) {
-            $apiQueryTokenPlugin = new ApiTokenPlugin($token);
-            $httpClient->addSubscriber($apiQueryTokenPlugin);
+            $apiTokenPlugin = new ApiTokenPlugin($token);
+            $httpClient->addSubscriber($apiTokenPlugin);
 
-            $acceptJsonHeaderPlugin = new AcceptJsonHeader();
+            $acceptJsonHeaderPlugin = new AcceptJsonHeaderPlugin();
             $httpClient->addSubscriber($acceptJsonHeaderPlugin);
         }
 
diff --git a/lib/Tmdb/HttpClient/Plugin/AcceptJsonHeader.php b/lib/Tmdb/HttpClient/Plugin/AcceptJsonHeaderPlugin.php
similarity index 91%
rename from lib/Tmdb/HttpClient/Plugin/AcceptJsonHeader.php
rename to lib/Tmdb/HttpClient/Plugin/AcceptJsonHeaderPlugin.php
index d2a96ee6..d21be6b7 100644
--- a/lib/Tmdb/HttpClient/Plugin/AcceptJsonHeader.php
+++ b/lib/Tmdb/HttpClient/Plugin/AcceptJsonHeaderPlugin.php
@@ -15,7 +15,7 @@
 use Guzzle\Common\Event;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
-class AcceptJsonHeader implements EventSubscriberInterface
+class AcceptJsonHeaderPlugin implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {