diff --git a/.gitignore b/.gitignore
index b49a421..5622fb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 *.swp
 composer.phar
 composer.lock
-
diff --git a/composer.json b/composer.json
index 3a16639..bd9776f 100644
--- a/composer.json
+++ b/composer.json
@@ -4,11 +4,12 @@
     "description": "OAuth 1 PHP Library",
     "keywords": ["oauth"],
     "homepage": "https://github.com/EHER/OAuth",
-    "authors": 
-    {
-        "name": "Andy Smith",
-        "homepage": "http://term.ie/"
-    },
+    "authors":[
+        {
+            "name": "Andy Smith",
+            "homepage": "http://term.ie/"
+        }
+    ],
     "require": {
         "php": ">=5.3.0"
     }
diff --git a/src/Eher/OAuth/OAuthSignatureMethod_HMAC_SHA1.php b/src/Eher/OAuth/HmacSha1.php
similarity index 92%
rename from src/Eher/OAuth/OAuthSignatureMethod_HMAC_SHA1.php
rename to src/Eher/OAuth/HmacSha1.php
index 2da7fc4..b02b45b 100644
--- a/src/Eher/OAuth/OAuthSignatureMethod_HMAC_SHA1.php
+++ b/src/Eher/OAuth/HmacSha1.php
@@ -9,7 +9,7 @@ namespace Eher\OAuth;
  * character (ASCII code 38) even if empty.
  *   - Chapter 9.2 ("HMAC-SHA1")
  */
-class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod {
+class HmacSha1 extends SignatureMethod {
   function get_name() {
     return "HMAC-SHA1";
   }
diff --git a/src/Eher/OAuth/OAuthSignatureMethod_PLAINTEXT.php b/src/Eher/OAuth/PlainText.php
similarity index 93%
rename from src/Eher/OAuth/OAuthSignatureMethod_PLAINTEXT.php
rename to src/Eher/OAuth/PlainText.php
index 05e3670..6f3ade7 100644
--- a/src/Eher/OAuth/OAuthSignatureMethod_PLAINTEXT.php
+++ b/src/Eher/OAuth/PlainText.php
@@ -7,7 +7,7 @@ namespace Eher\OAuth;
  * over a secure channel such as HTTPS. It does not use the Signature Base String.
  *   - Chapter 9.4 ("PLAINTEXT")
  */
-class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {
+class PlainText extends SignatureMethod {
   public function get_name() {
     return "PLAINTEXT";
   }
diff --git a/src/Eher/OAuth/OAuthSignatureMethod_RSA_SHA1.php b/src/Eher/OAuth/RsaSha1.php
similarity index 96%
rename from src/Eher/OAuth/OAuthSignatureMethod_RSA_SHA1.php
rename to src/Eher/OAuth/RsaSha1.php
index 39e0196..a749ce3 100644
--- a/src/Eher/OAuth/OAuthSignatureMethod_RSA_SHA1.php
+++ b/src/Eher/OAuth/RsaSha1.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Eher\OAuth;
+namespace Eher\OAuth\SignatureMethod;
 
 /**
  * The RSA-SHA1 signature method uses the RSASSA-PKCS1-v1_5 signature algorithm as defined in
@@ -10,7 +10,7 @@ namespace Eher\OAuth;
  * specification.
  *   - Chapter 9.3 ("RSA-SHA1")
  */
-abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod {
+abstract class RsaSha1 extends SignatureMethod {
   public function get_name() {
     return "RSA-SHA1";
   }
diff --git a/src/Eher/OAuth/OAuthSignatureMethod.php b/src/Eher/OAuth/SignatureMethod.php
similarity index 96%
rename from src/Eher/OAuth/OAuthSignatureMethod.php
rename to src/Eher/OAuth/SignatureMethod.php
index fd43470..bad2b9f 100644
--- a/src/Eher/OAuth/OAuthSignatureMethod.php
+++ b/src/Eher/OAuth/SignatureMethod.php
@@ -6,7 +6,7 @@ namespace Eher\OAuth;
  * A class for implementing a Signature Method
  * See section 9 ("Signing Requests") in the spec
  */
-abstract class OAuthSignatureMethod {
+abstract class SignatureMethod {
   /**
    * Needs to return the name of the Signature Method (ie HMAC-SHA1)
    * @return string