diff --git a/src/Configuration.php b/src/Configuration.php
index 09bd23d..1520d99 100644
--- a/src/Configuration.php
+++ b/src/Configuration.php
@@ -1,5 +1,5 @@
 <?php
-namespace BSR\Lib;
+namespace BSR\Webservice;
 
 class Configuration {
     private static $instance = null;
diff --git a/src/Exception/AuthenticationException.php b/src/Exception/AuthenticationException.php
index 3f5cb47..701f316 100644
--- a/src/Exception/AuthenticationException.php
+++ b/src/Exception/AuthenticationException.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace BSR\Lib\Exception;
+namespace BSR\Webservice\Exception;
 
 /**
  * This exception should be raised when an error
  * related to the authentication mechanism arise.
  *
- * @package BSR\Lib\Exception
+ * @package BSR\Webservice\Exception
  */
 class AuthenticationException extends WebException {
     const USER_NOT_FOUND = 200;
     const BAD_LOGIN = 201;
     const AUTHENTICATION_FAILED = 202;
     const LOGIN_EMPTY = 203;
-}
\ No newline at end of file
+}
diff --git a/src/Exception/InvalidAttributeException.php b/src/Exception/InvalidAttributeException.php
index 5598723..47b2b99 100644
--- a/src/Exception/InvalidAttributeException.php
+++ b/src/Exception/InvalidAttributeException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BSR\Lib\Exception;
+namespace BSR\Webservice\Exception;
 
 /**
  * Exception raised when an invalid attribute name is accessed
diff --git a/src/Exception/SqlException.php b/src/Exception/SqlException.php
index 9384ab4..aa0c8b4 100644
--- a/src/Exception/SqlException.php
+++ b/src/Exception/SqlException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BSR\Lib\Exception;
+namespace BSR\Webservice\Exception;
 
 class SqlException extends \Exception
 {
diff --git a/src/Exception/UsageException.php b/src/Exception/UsageException.php
index cae0488..9872efa 100644
--- a/src/Exception/UsageException.php
+++ b/src/Exception/UsageException.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace BSR\Lib\Exception;
+namespace BSR\Webservice\Exception;
 
 /**
  * This exception should be raised by the WebService engine when
  * there is an error preventing the correct calling of a method.
  *
- * @package BSR\Lib\Exception
+ * @package BSR\Webservice\Exception
  */
 class UsageException extends WebException {
     const NO_ARGS = 100;
diff --git a/src/Exception/WebException.php b/src/Exception/WebException.php
index d02503a..5849f8b 100644
--- a/src/Exception/WebException.php
+++ b/src/Exception/WebException.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BSR\Lib\Exception;
+namespace BSR\Webservice\Exception;
 
 class WebException extends \Exception
 {
diff --git a/src/Formatter/Formatter.php b/src/Formatter/Formatter.php
index bced18d..f9895db 100644
--- a/src/Formatter/Formatter.php
+++ b/src/Formatter/Formatter.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BSR\Lib\Formatter;
+namespace BSR\Webservice\Formatter;
 
 abstract class Formatter {
     private static $formats = array();
@@ -49,7 +49,7 @@ abstract class Formatter {
      */
     private static function getFormatFromHeader() {
         //TODO this is ugly
-		return 'BSR\Lib\Formatter\Json';
+		return 'BSR\Webservice\Formatter\Json';
         if(isset($_SERVER['HTTP_ACCEPT'])) {
             $formats = array_map(function($f) {
                 $parts = explode(';', $f);
@@ -67,7 +67,7 @@ abstract class Formatter {
 
         }
 
-        return 'BSR\Lib\Formatter\Json';
+        return 'BSR\Webservice\Formatter\Json';
     }
 
     /**
diff --git a/src/Formatter/Html.php b/src/Formatter/Html.php
index 9d27240..e545d60 100644
--- a/src/Formatter/Html.php
+++ b/src/Formatter/Html.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BSR\Lib\Formatter;
+namespace BSR\Webservice\Formatter;
 
-use BSR\Lib\Logger;
+use BSR\Webservice\Logger;
 
 class Html extends Formatter {
     protected static function init() {
diff --git a/src/Formatter/Json.php b/src/Formatter/Json.php
index 647ca96..45d46a8 100644
--- a/src/Formatter/Json.php
+++ b/src/Formatter/Json.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BSR\Lib\Formatter;
+namespace BSR\Webservice\Formatter;
 
 class Json extends Formatter {
     protected static function init() {
diff --git a/src/Formatter/Text.php b/src/Formatter/Text.php
index e570c5d..83369ad 100644
--- a/src/Formatter/Text.php
+++ b/src/Formatter/Text.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BSR\Lib\Formatter;
+namespace BSR\Webservice\Formatter;
 
 class Text extends Formatter {
     protected static function init() {
diff --git a/src/Formatter/Xml.php b/src/Formatter/Xml.php
index e9d2108..5e0d81a 100644
--- a/src/Formatter/Xml.php
+++ b/src/Formatter/Xml.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BSR\Lib\Formatter;
+namespace BSR\Webservice\Formatter;
 
 class Xml extends Formatter {
     protected static function init() {
diff --git a/src/Help.php b/src/Help.php
index 97d2792..c3e09d4 100644
--- a/src/Help.php
+++ b/src/Help.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BSR\Lib;
+namespace BSR\Webservice;
 
-use BSR\Lib\Exception\WebException;
-use BSR\Lib\Formatter\Html;
+use BSR\Webservice\Exception\WebException;
+use BSR\Webservice\Formatter\Html;
 
 class Help {
     private static function func($ws, $func) {
@@ -80,4 +80,4 @@ class Help {
     public static function exception(WebException $e, WebService $ws, $func) {
         return static::func($ws, $func);
     }
-}
\ No newline at end of file
+}
diff --git a/src/Logger.php b/src/Logger.php
index fdc1b67..2abd0b0 100644
--- a/src/Logger.php
+++ b/src/Logger.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BSR\Lib;
+namespace BSR\Webservice;
 
 class Logger {
     const QUIET = 0;
diff --git a/src/Renderer.php b/src/Renderer.php
index d9b22db..407fefe 100644
--- a/src/Renderer.php
+++ b/src/Renderer.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace BSR\Lib;
+namespace BSR\Webservice;
 
-use BSR\Lib\Formatter\Formatter;
+use BSR\Webservice\Formatter\Formatter;
 
 class Renderer {
     private static $statusMessages = array(
diff --git a/src/WebService.php b/src/WebService.php
index 5a2ba5e..08a6eed 100644
--- a/src/WebService.php
+++ b/src/WebService.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace BSR\Lib;
+namespace BSR\Webservice;
 
-use BSR\Lib\Exception\UsageException;
-use BSR\Lib\Exception\WebException;
+use BSR\Webservice\Exception\UsageException;
+use BSR\Webservice\Exception\WebException;
 
 abstract class WebService
 {