diff --git a/src/OAuth2/Server.php b/src/OAuth2/AuthServer.php
similarity index 99%
rename from src/OAuth2/Server.php
rename to src/OAuth2/AuthServer.php
index 09ef8a37..9008d829 100644
--- a/src/OAuth2/Server.php
+++ b/src/OAuth2/AuthServer.php
@@ -2,7 +2,7 @@
 
 namespace OAuth2;
 
-class Server
+class AuthServer
 {
     protected $scopeDelimeter = ',';
 
diff --git a/src/OAuth2/Resource.php b/src/OAuth2/ResourceServer.php
similarity index 99%
rename from src/OAuth2/Resource.php
rename to src/OAuth2/ResourceServer.php
index 80590049..ba0d6801 100644
--- a/src/OAuth2/Resource.php
+++ b/src/OAuth2/ResourceServer.php
@@ -6,7 +6,7 @@ use OutOfBoundsException;
 use OAuth2\Storage\SessionInterface;
 use OAuth2\Storage\SessionScopeInterface;
 
-class Resource
+class ResourceServer
 {
     protected $accessToken = null;