diff --git a/src/Repositories/RefreshTokenInterface.php b/src/Repositories/RefreshTokenRepositoryInterface.php
similarity index 100%
rename from src/Repositories/RefreshTokenInterface.php
rename to src/Repositories/RefreshTokenRepositoryInterface.php
diff --git a/src/ServiceProviders/ClientCredentialsGrantServerProvider.php b/src/ServiceProviders/ClientCredentialsGrantProvider.php
similarity index 100%
rename from src/ServiceProviders/ClientCredentialsGrantServerProvider.php
rename to src/ServiceProviders/ClientCredentialsGrantProvider.php
diff --git a/src/ResponseTypes/AbstractResponseType.php b/src/TokenTypes/AbstractTokenType.php
similarity index 87%
rename from src/ResponseTypes/AbstractResponseType.php
rename to src/TokenTypes/AbstractTokenType.php
index 5b874c08..47900ca8 100644
--- a/src/ResponseTypes/AbstractResponseType.php
+++ b/src/TokenTypes/AbstractTokenType.php
@@ -9,12 +9,12 @@
  * @link        https://github.com/thephpleague/oauth2-server
  */
 
-namespace League\OAuth2\Server\ResponseTypes;
+namespace League\OAuth2\Server\TokenTypes;
 
 use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface;
 use Symfony\Component\HttpFoundation\Response;
 
-abstract class AbstractResponseType implements ResponseTypeInterface
+abstract class AbstractTokenType implements TokenTypeInterface
 {
     /**
      * Response array
@@ -45,7 +45,7 @@ abstract class AbstractResponseType implements ResponseTypeInterface
     }
 
     /**
-     * @param \League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface $accessToken
+     * {@inheritdoc}
      */
     public function setAccessToken(AccessTokenEntityInterface $accessToken)
     {
diff --git a/src/ResponseTypes/BearerTokenResponseType.php b/src/TokenTypes/BearerTokenType.php
similarity index 92%
rename from src/ResponseTypes/BearerTokenResponseType.php
rename to src/TokenTypes/BearerTokenType.php
index b3b61b52..2fb932bf 100644
--- a/src/ResponseTypes/BearerTokenResponseType.php
+++ b/src/TokenTypes/BearerTokenType.php
@@ -9,11 +9,11 @@
  * @link        https://github.com/thephpleague/oauth2-server
  */
 
-namespace League\OAuth2\Server\ResponseTypes;
+namespace League\OAuth2\Server\TokenTypes;
 
 use Symfony\Component\HttpFoundation\Request;
 
-class BearerTokenResponseType extends AbstractResponseType
+class BearerTokenType extends AbstractTokenType
 {
     /**
      * {@inheritdoc}
diff --git a/src/ResponseTypes/MAC.php b/src/TokenTypes/MAC.php
similarity index 100%
rename from src/ResponseTypes/MAC.php
rename to src/TokenTypes/MAC.php
diff --git a/src/ResponseTypes/ResponseTypeInterface.php b/src/TokenTypes/TokenTypeInterface.php
similarity index 84%
rename from src/ResponseTypes/ResponseTypeInterface.php
rename to src/TokenTypes/TokenTypeInterface.php
index 2bd83dd9..e3e4db22 100644
--- a/src/ResponseTypes/ResponseTypeInterface.php
+++ b/src/TokenTypes/TokenTypeInterface.php
@@ -9,15 +9,12 @@
  * @link        https://github.com/thephpleague/oauth2-server
  */
 
-namespace League\OAuth2\Server\ResponseTypes;
+namespace League\OAuth2\Server\TokenTypes;
 
-use League\OAuth2\Server\AbstractServer;
 use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface;
-use League\OAuth2\Server\Entity\SessionEntity;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 
-interface ResponseTypeInterface
+interface ResponseTokenInterface
 {
     /**
      * Generate a response
@@ -58,7 +55,7 @@ interface ResponseTypeInterface
     public function determineAccessTokenInHeader(Request $request);
 
     /**
-     * @return Response
+     * @return \Symfony\Component\HttpFoundation\Response
      */
     public function generateHttpResponse();
 }