diff --git a/README.md b/README.md
index 993b576..f304d5c 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ Let's see if we can use [PHP QR Code](http://phpqrcode.sourceforge.net/) to impl
 <?php
 require_once '../../phpqrcode.php';                 // Yeah, we're gonna need that
 
-namespace RobThree\TwoFactorAuth\Providers\Qr
+namespace RobThree\Auth\Providers\Qr
 
 class MyProvider implements IQRCodeProvider {
   public function getMimeType() {
diff --git a/lib/Providers/Qr/BaseHTTPQRCodeProvider.php b/lib/Providers/Qr/BaseHTTPQRCodeProvider.php
index 7cf2d82..c531663 100644
--- a/lib/Providers/Qr/BaseHTTPQRCodeProvider.php
+++ b/lib/Providers/Qr/BaseHTTPQRCodeProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RobThree\TwoFactorAuth\Providers\Qr;
+namespace RobThree\Auth\Providers\Qr;
 
 abstract class BaseHTTPQRCodeProvider implements IQRCodeProvider
 {
diff --git a/lib/Providers/Qr/GoogleQRCodeProvider.php b/lib/Providers/Qr/GoogleQRCodeProvider.php
index 02ab3be..1fe65a0 100644
--- a/lib/Providers/Qr/GoogleQRCodeProvider.php
+++ b/lib/Providers/Qr/GoogleQRCodeProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RobThree\TwoFactorAuth\Providers\Qr;
+namespace RobThree\Auth\Providers\Qr;
 
 // https://developers.google.com/chart/infographics/docs/qr_codes
 class GoogleQRCodeProvider extends BaseHTTPQRCodeProvider 
diff --git a/lib/Providers/Qr/IQRCodeProvider.php b/lib/Providers/Qr/IQRCodeProvider.php
index 8a0840a..f3f6e78 100644
--- a/lib/Providers/Qr/IQRCodeProvider.php
+++ b/lib/Providers/Qr/IQRCodeProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RobThree\TwoFactorAuth\Providers\Qr;
+namespace RobThree\Auth\Providers\Qr;
 
 interface IQRCodeProvider
 {
diff --git a/lib/Providers/Qr/QRException.php b/lib/Providers/Qr/QRException.php
index 6adf084..1eba26d 100644
--- a/lib/Providers/Qr/QRException.php
+++ b/lib/Providers/Qr/QRException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RobThree\TwoFactorAuth\Providers\Qr;
+namespace RobThree\Auth\Providers\Qr;
 
 class QRException extends \Exception
 {
diff --git a/lib/Providers/Qr/QRServerProvider.php b/lib/Providers/Qr/QRServerProvider.php
index 8bf92cc..87717f1 100644
--- a/lib/Providers/Qr/QRServerProvider.php
+++ b/lib/Providers/Qr/QRServerProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RobThree\TwoFactorAuth\Providers\Qr;
+namespace RobThree\Auth\Providers\Qr;
 
 // http://goqr.me/api/doc/create-qr-code/
 class QRServerProvider extends BaseHTTPQRCodeProvider 
diff --git a/lib/Providers/Qr/QRicketProvider.php b/lib/Providers/Qr/QRicketProvider.php
index bcd5e89..b6aed5a 100644
--- a/lib/Providers/Qr/QRicketProvider.php
+++ b/lib/Providers/Qr/QRicketProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RobThree\TwoFactorAuth\Providers\Qr;
+namespace RobThree\Auth\Providers\Qr;
 
 // http://qrickit.com/qrickit_apps/qrickit_api.php
 class QRicketProvider extends BaseHTTPQRCodeProvider 
diff --git a/lib/Providers/Rng/HashRNGProvider.php b/lib/Providers/Rng/HashRNGProvider.php
index 645c7dc..fe7a8b7 100644
--- a/lib/Providers/Rng/HashRNGProvider.php
+++ b/lib/Providers/Rng/HashRNGProvider.php
@@ -1,5 +1,5 @@
 <?php
-namespace RobThree\TwoFactorAuth\Providers\Rng;
+namespace RobThree\Auth\Providers\Rng;
 
 class HashRNGProvider implements IRNGProvider
 {
diff --git a/lib/Providers/Rng/IRNGProvider.php b/lib/Providers/Rng/IRNGProvider.php
index 44bb9d5..6be2800 100644
--- a/lib/Providers/Rng/IRNGProvider.php
+++ b/lib/Providers/Rng/IRNGProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RobThree\TwoFactorAuth\Providers\Rng;
+namespace RobThree\Auth\Providers\Rng;
 
 interface IRNGProvider
 {
diff --git a/lib/Providers/Rng/MCryptRNGProvider.php b/lib/Providers/Rng/MCryptRNGProvider.php
index b97be1a..493ccf3 100644
--- a/lib/Providers/Rng/MCryptRNGProvider.php
+++ b/lib/Providers/Rng/MCryptRNGProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RobThree\TwoFactorAuth\Providers\Rng;
+namespace RobThree\Auth\Providers\Rng;
 
 class MCryptRNGProvider implements IRNGProvider
 {
diff --git a/lib/Providers/Rng/OpenSSLRNGProvider.php b/lib/Providers/Rng/OpenSSLRNGProvider.php
index 2105136..b1931bf 100644
--- a/lib/Providers/Rng/OpenSSLRNGProvider.php
+++ b/lib/Providers/Rng/OpenSSLRNGProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RobThree\TwoFactorAuth\Providers\Rng;
+namespace RobThree\Auth\Providers\Rng;
 
 class OpenSSLRNGProvider implements IRNGProvider
 {
diff --git a/lib/Providers/Rng/RNGException.php b/lib/Providers/Rng/RNGException.php
index 882d7f7..48ecdd8 100644
--- a/lib/Providers/Rng/RNGException.php
+++ b/lib/Providers/Rng/RNGException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RobThree\TwoFactorAuth\Providers\Rng;
+namespace RobThree\Auth\Providers\Rng;
 
 class RNGException extends \Exception
 {
diff --git a/lib/TwoFactorAuth.php b/lib/TwoFactorAuth.php
index 5259eac..c65590d 100644
--- a/lib/TwoFactorAuth.php
+++ b/lib/TwoFactorAuth.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RobThree\TwoFactorAuth;
+namespace RobThree\Auth;
 
 // Based on / inspired by: https://github.com/PHPGangsta/GoogleAuthenticator
 // Algorithms, digits, period etc. explained: https://github.com/google/google-authenticator/wiki/Key-Uri-Format
diff --git a/lib/TwoFactorAuthException.php b/lib/TwoFactorAuthException.php
index 9de9d3a..2d46d4e 100644
--- a/lib/TwoFactorAuthException.php
+++ b/lib/TwoFactorAuthException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RobThree\TwoFactorAuth;
+namespace RobThree\Auth;
 
 class TwoFactorAuthException extends \Exception
 {