diff --git a/src/Grant/AbstractGrant.php b/src/Grant/AbstractGrant.php
index 129878fc..52636173 100644
--- a/src/Grant/AbstractGrant.php
+++ b/src/Grant/AbstractGrant.php
@@ -108,7 +108,7 @@ abstract class AbstractGrant implements GrantTypeInterface
 
     /**
      * Inject the authorization server into the grant
-     * @param  AuthorizationServer $server The authorization server instance
+     * @param  \League\OAuth2\Server\AuthorizationServer   $server The authorization server instance
      * @return self
      */
     public function setAuthorizationServer(AuthorizationServer $server)
@@ -119,11 +119,11 @@ abstract class AbstractGrant implements GrantTypeInterface
     }
 
     /**
-     * Given a list of scopes, validate them and return an arrary of Scope entities
-     * @param  string          $scopeParam A string of scopes (e.g. "profile email birthday")
-     * @param  ClientEntity    $client A string of scopes (e.g. "profile email birthday")
-     * @return array
-     * @throws ClientException If scope is invalid, or no scopes passed when required
+     * Given a list of scopes, validate them and return an array of Scope entities
+     * @param  string                                       $scopeParam  A string of scopes (e.g. "profile email birthday")
+     * @param  \League\OAuth2\Server\Entity\ClientEntity    $client      A string of scopes (e.g. "profile email birthday")
+     * @return \League\OAuth2\Server\Entity\ScopeEntity[]
+     * @throws \League\OAuth2\Server\Exception\ClientException           If scope is invalid, or no scopes passed when required
      */
     public function validateScopes($scopeParam = '', ClientEntity $client)
     {
@@ -171,7 +171,7 @@ abstract class AbstractGrant implements GrantTypeInterface
 
     /**
      * Format the local scopes array
-     * @param  array $unformated Array of Array of \League\OAuth2\Server\Entity\ScopeEntity
+     * @param  \League\OAuth2\Server\Entity\ScopeEntity[]
      * @return array
      */
     protected function formatScopes($unformated = [])
diff --git a/src/Grant/AuthCodeGrant.php b/src/Grant/AuthCodeGrant.php
index eef3d045..b6a44da9 100644
--- a/src/Grant/AuthCodeGrant.php
+++ b/src/Grant/AuthCodeGrant.php
@@ -159,7 +159,7 @@ class AuthCodeGrant extends AbstractGrant
 
     /**
      * Complete the auth code grant
-     * @return array
+     * @return \League\OAuth2\Server\TokenType\TokenTypeInterface
      */
     public function completeFlow()
     {
diff --git a/src/Grant/ClientCredentialsGrant.php b/src/Grant/ClientCredentialsGrant.php
index 3e18af31..6464722d 100644
--- a/src/Grant/ClientCredentialsGrant.php
+++ b/src/Grant/ClientCredentialsGrant.php
@@ -49,8 +49,7 @@ class ClientCredentialsGrant extends AbstractGrant
 
     /**
      * Complete the client credentials grant
-     * @param  null|array $inputParams
-     * @return array
+     * @return \League\OAuth2\Server\TokenType\TokenTypeInterface
      */
     public function completeFlow()
     {
diff --git a/src/Grant/GrantTypeInterface.php b/src/Grant/GrantTypeInterface.php
index 5bad669c..44479a99 100644
--- a/src/Grant/GrantTypeInterface.php
+++ b/src/Grant/GrantTypeInterface.php
@@ -18,7 +18,7 @@ interface GrantTypeInterface
 {
     /**
      * Complete the grant flow
-     * @return array
+     * @return \League\OAuth2\Server\TokenType\TokenTypeInterface
      */
     public function completeFlow();
 }
diff --git a/src/Grant/PasswordGrant.php b/src/Grant/PasswordGrant.php
index 46084a68..03113146 100644
--- a/src/Grant/PasswordGrant.php
+++ b/src/Grant/PasswordGrant.php
@@ -73,7 +73,7 @@ class PasswordGrant extends AbstractGrant
 
     /**
      * Complete the password grant
-     * @return array
+     * @return \League\OAuth2\Server\TokenType\TokenTypeInterface
      */
     public function completeFlow()
     {