diff --git a/Command/EntitySchemaCommand.php b/Command/GenerateCommand.php
similarity index 100%
rename from Command/EntitySchemaCommand.php
rename to Command/GenerateCommand.php
diff --git a/Model/Namespace_/Php/AbstractNamespace.php b/Model/Namespace_/Php/AbstractNamespace.php
index 2d591ee16b8106ca6be534093332589820c1f821..d0ba86c3b3aecbdf89df2c9d9e47b6522c9d2414 100644
--- a/Model/Namespace_/Php/AbstractNamespace.php
+++ b/Model/Namespace_/Php/AbstractNamespace.php
@@ -8,9 +8,8 @@
 
 namespace Irstea\PlantUmlBundle\Model\Namespace_\Php;
 
+use Irstea\PlantUmlBundle\Model\Namespace_\AbstractNamespace as Base;
 use Irstea\PlantUmlBundle\Model\NamespaceInterface;
-use Irstea\PlantUmlBundle\Model\NodeInterface;
-use Irstea\PlantUmlBundle\Writer\WritableInterface;
 use Irstea\PlantUmlBundle\Writer\WriterInterface;
 
 /**
@@ -18,7 +17,7 @@ use Irstea\PlantUmlBundle\Writer\WriterInterface;
  *
  * @author Guillaume Perréal <guillaume.perreal@irstea.fr>
  */
-abstract class AbstractNamespace extends AbstractNamespace
+abstract class AbstractNamespace extends Base
 {
     /**
      * @var NamespaceInterface
@@ -50,15 +49,6 @@ abstract class AbstractNamespace extends AbstractNamespace
      */
     abstract protected function getNamespacePrefix();
 
-    public function getNodeLabel($name)
-    {
-        $prefix = $this->getNamespacePrefix();
-        if (0 === strpos($name, $prefix)) {
-            return substr($name, strlen($prefix));
-        }
-        return $name;
-    }
-
     public function getNodeId($name)
     {
         return str_replace('\\', '.', $name).'_node';
diff --git a/Model/Namespace_/Php/Namespace_.php b/Model/Namespace_/Php/Namespace_.php
index 8c6da0bb3a05bb01468f99467be482657b5e6c98..7fff4a592d2401f90e5ecdbf7b7b396badf430d2 100644
--- a/Model/Namespace_/Php/Namespace_.php
+++ b/Model/Namespace_/Php/Namespace_.php
@@ -9,7 +9,6 @@
 namespace Irstea\PlantUmlBundle\Model\Namespace_\Php;
 
 use Irstea\PlantUmlBundle\Model\ArrowInterface;
-use Irstea\PlantUmlBundle\Model\NamespaceInterface;
 use Irstea\PlantUmlBundle\Writer\WriterInterface;
 
 /**
@@ -17,7 +16,7 @@ use Irstea\PlantUmlBundle\Writer\WriterInterface;
  *
  * @author Guillaume Perréal <guillaume.perreal@irstea.fr>
  */
-class Namespace_ extends AbstractHierachicalNamespace
+class Namespace_ extends AbstractNamespace
 {
     /**
      * @var AbstractNamespace
@@ -29,7 +28,7 @@ class Namespace_ extends AbstractHierachicalNamespace
      */
     private $name;
 
-    public function __construct(AbstractHierachicalNamespace $parent, $name)
+    public function __construct(AbstractNamespace $parent, $name)
     {
         $this->parent = $parent;
         $this->name = $name;
@@ -53,6 +52,15 @@ class Namespace_ extends AbstractHierachicalNamespace
         return $this->parent->getNamespacePrefix() . $this->name . '\\';
     }
 
+    public function getNodeLabel($name)
+    {
+        $prefix = $this->getNamespacePrefix();
+        if (0 === strpos($name, $prefix)) {
+            return substr($name, strlen($prefix));
+        }
+        return $name;
+    }
+
         /**
      * @param resource WriterInterface $writer
      * @return self
diff --git a/Model/Namespace_/Php/RootNamespace.php b/Model/Namespace_/Php/RootNamespace.php
index 90c5f1a391075ef9a16020a3bef9bc7c78a67032..7b07b8b26945cd16717dfb53292ca5afcac1e406 100644
--- a/Model/Namespace_/Php/RootNamespace.php
+++ b/Model/Namespace_/Php/RootNamespace.php
@@ -51,4 +51,9 @@ class RootNamespace extends AbstractNamespace
     {
         return "";
     }
+
+    public function getNodeLabel($className)
+    {
+        return $className;
+    }
 }