diff --git a/src/Grant/AuthCode.php b/src/Grant/AuthCodeGrant.php
similarity index 99%
rename from src/Grant/AuthCode.php
rename to src/Grant/AuthCodeGrant.php
index 931beb8b..fa192c8d 100644
--- a/src/Grant/AuthCode.php
+++ b/src/Grant/AuthCodeGrant.php
@@ -28,7 +28,7 @@ use League\OAuth2\Server\Storage\ScopeInterface;
 /**
  * Auth code grant class
  */
-class AuthCode extends AbstractGrant
+class AuthCodeGrant extends AbstractGrant
 {
     /**
      * Grant identifier
diff --git a/src/Grant/ClientCredentials.php b/src/Grant/ClientCredentialsGrant.php
similarity index 98%
rename from src/Grant/ClientCredentials.php
rename to src/Grant/ClientCredentialsGrant.php
index d0bfb72a..891200d9 100644
--- a/src/Grant/ClientCredentials.php
+++ b/src/Grant/ClientCredentialsGrant.php
@@ -25,7 +25,7 @@ use League\OAuth2\Server\Storage\ScopeInterface;
 /**
  * Client credentials grant class
  */
-class ClientCredentials extends AbstractGrant
+class ClientCredentialsGrant extends AbstractGrant
 {
     /**
      * Grant identifier
diff --git a/src/Grant/Password.php b/src/Grant/PasswordGrant.php
similarity index 99%
rename from src/Grant/Password.php
rename to src/Grant/PasswordGrant.php
index 63284ee3..c20b3a85 100644
--- a/src/Grant/Password.php
+++ b/src/Grant/PasswordGrant.php
@@ -26,7 +26,7 @@ use League\OAuth2\Server\Storage\ScopeInterface;
 /**
  * Password grant class
  */
-class Password extends AbstractGrant
+class PasswordGrant extends AbstractGrant
 {
     /**
      * Grant identifier
diff --git a/src/Grant/RefreshToken.php b/src/Grant/RefreshTokenGrant.php
similarity index 99%
rename from src/Grant/RefreshToken.php
rename to src/Grant/RefreshTokenGrant.php
index e5a9281a..f8c8ad00 100644
--- a/src/Grant/RefreshToken.php
+++ b/src/Grant/RefreshTokenGrant.php
@@ -26,7 +26,7 @@ use League\OAuth2\Server\Entity\ClientEntity;
 /**
  * Referesh token grant
  */
-class RefreshToken extends AbstractGrant
+class RefreshTokenGrant extends AbstractGrant
 {
     /**
      * {@inheritdoc}