diff --git a/StaticFactory/FormatNumber.php b/StaticFactory/FormatNumber.php
new file mode 100644
index 0000000..f7bf851
--- /dev/null
+++ b/StaticFactory/FormatNumber.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace DesignPatterns\StaticFactory;
+
+class FormatNumber implements Formatter
+{
+    
+}
diff --git a/StaticFactory/FormatString.php b/StaticFactory/FormatString.php
new file mode 100644
index 0000000..9f961e7
--- /dev/null
+++ b/StaticFactory/FormatString.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace DesignPatterns\StaticFactory;
+
+class FormatString implements Formatter
+{
+    
+}
diff --git a/StaticFactory/Formatter.php b/StaticFactory/Formatter.php
new file mode 100644
index 0000000..54b0ba0
--- /dev/null
+++ b/StaticFactory/Formatter.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace DesignPatterns\StaticFactory;
+
+interface Formatter
+{
+    
+}
diff --git a/StaticFactory/StaticFactory.php b/StaticFactory/StaticFactory.php
index 6b3da15..fb5a12c 100644
--- a/StaticFactory/StaticFactory.php
+++ b/StaticFactory/StaticFactory.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace DesignPatterns;
+namespace DesignPatterns\StaticFactory;
 
 /**
- * Factory Method pattern
+ * Static Factory pattern
  *
  * Purpose:
  * similar to the AbstractFactory, this pattern is used to create series of related or dependant objects.
@@ -13,9 +13,12 @@ namespace DesignPatterns;
  * Examples:
  * - Zend Framework: Zend_Cache_Backend or _Frontend use a factory method create cache backends or frontends
  * 
+ * Note1: Remember, static => global => evil
+ * Note2: Cannot be subclassed or mock-uped or have multiple different instances
  */
-class FactoryMethod
+class StaticFactory
 {
+
     /**
      * the parametrized function to get create an instance
      *
@@ -24,26 +27,13 @@ class FactoryMethod
      */
     public static function factory($type)
     {
-        $className = 'Format' . ucfirst($type);
-        if ( ! class_exists($className)) {
-            throw new Exception('Missing format class.');
+        $className = __NAMESPACE__ . '\Format' . ucfirst($type);
+
+        if (!class_exists($className)) {
+            throw new \InvalidArgumentException('Missing format class.');
         }
 
         return new $className();
     }
-}
-
-interface Formatter
-{
 
 }
-
-class FormatString implements Formatter
-{
-
-}
-
-class FormatNumber implements Formatter
-{
-    
-}