diff --git a/src/Storage/MacTokenInterface.php b/src/Storage/MacTokenInterface.php
index 62e9e544..1e504589 100644
--- a/src/Storage/MacTokenInterface.php
+++ b/src/Storage/MacTokenInterface.php
@@ -11,8 +11,7 @@
 
 namespace League\OAuth2\Server\Storage;
 
-use League\OAuth2\Server\Entity\AccessTokenInterface;
-use League\OAuth2\Server\Entity\MacKeyInterface;
+use League\OAuth2\Server\Entity\AccessTokenEntity;
 
 /**
  * MacTokenInterface
@@ -21,15 +20,16 @@ interface MacTokenInterface extends StorageInterface
 {
     /**
      * Create a MAC key linked to an access token
-     * @param string                                            $macKey
-     * @param \League\OAuth2\Server\Entity\AccessTokenInterface $accessToken
+     * @param  string                                         $macKey
+     * @param  \League\OAuth2\Server\Entity\AccessTokenEntity $accessTokenEntity
+     * @return void
      */
-    public function create($macKey, AccessTokenInterface $accessToken);
+    public function create($macKey, AccessTokenEntity $accessTokenEntity);
 
     /**
      * Get a MAC key by access token
-     * @param string $accessToken
+     * @param  string $accessToken
      * @return string
      */
     public function getByAccessToken($accessToken);
-}
\ No newline at end of file
+}
diff --git a/src/TokenType/MAC.php b/src/TokenType/MAC.php
index c5003e99..3732e53e 100644
--- a/src/TokenType/MAC.php
+++ b/src/TokenType/MAC.php
@@ -120,8 +120,8 @@ class MAC extends AbstractTokenType implements TokenTypeInterface
 
     /**
      * Prevent timing attack
-     * @param string $knownString
-     * @param string $userString
+     * @param  string $knownString
+     * @param  string $userString
      * @return bool
      */
     private function hash_equals($knownString, $userString)
@@ -144,4 +144,4 @@ class MAC extends AbstractTokenType implements TokenTypeInterface
 
         return hash_equals($knownString, $userString);
     }
-}
\ No newline at end of file
+}