diff --git a/src/Eher/OAuth/OAuthSignatureMethod_HMAC_SHA1.php b/src/Eher/OAuth/SignatureMethod/HmacSha1.php
similarity index 90%
rename from src/Eher/OAuth/OAuthSignatureMethod_HMAC_SHA1.php
rename to src/Eher/OAuth/SignatureMethod/HmacSha1.php
index 2da7fc4..d7a2d7b 100644
--- a/src/Eher/OAuth/OAuthSignatureMethod_HMAC_SHA1.php
+++ b/src/Eher/OAuth/SignatureMethod/HmacSha1.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Eher\OAuth;
+namespace Eher\OAuth\SignatureMethod;
 
 /**
  * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104]
@@ -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/SignatureMethod/PlainText.php
similarity index 91%
rename from src/Eher/OAuth/OAuthSignatureMethod_PLAINTEXT.php
rename to src/Eher/OAuth/SignatureMethod/PlainText.php
index 05e3670..8a74833 100644
--- a/src/Eher/OAuth/OAuthSignatureMethod_PLAINTEXT.php
+++ b/src/Eher/OAuth/SignatureMethod/PlainText.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Eher\OAuth;
+namespace Eher\OAuth\SignatureMethod;
 
 /**
  * The PLAINTEXT method does not provide any security protection and SHOULD only be used
  * 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/SignatureMethod/RsaSha1.php
similarity index 96%
rename from src/Eher/OAuth/OAuthSignatureMethod_RSA_SHA1.php
rename to src/Eher/OAuth/SignatureMethod/RsaSha1.php
index 39e0196..a749ce3 100644
--- a/src/Eher/OAuth/OAuthSignatureMethod_RSA_SHA1.php
+++ b/src/Eher/OAuth/SignatureMethod/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/SignatureMethod.php
similarity index 93%
rename from src/Eher/OAuth/OAuthSignatureMethod.php
rename to src/Eher/OAuth/SignatureMethod/SignatureMethod.php
index fd43470..825eb7a 100644
--- a/src/Eher/OAuth/OAuthSignatureMethod.php
+++ b/src/Eher/OAuth/SignatureMethod/SignatureMethod.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Eher\OAuth;
+namespace Eher\OAuth\SignatureMethod;
 
 /**
  * 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