diff --git a/hurricane/src/editor/CellEditor.h b/hurricane/src/editor/CellEditor.h
index ddcb7e4f..863bccf8 100644
--- a/hurricane/src/editor/CellEditor.h
+++ b/hurricane/src/editor/CellEditor.h
@@ -2,7 +2,7 @@
 #define __CELL_EDITOR_H
 
 #include "Cell.h"
-using namespace H;
+using namespace Hurricane;
 
 #include <QMainWindow>
 
diff --git a/hurricane/src/editor/CellGraphicsItem.cpp b/hurricane/src/editor/CellGraphicsItem.cpp
index d0e70cdb..abee8e6f 100644
--- a/hurricane/src/editor/CellGraphicsItem.cpp
+++ b/hurricane/src/editor/CellGraphicsItem.cpp
@@ -4,7 +4,7 @@
 #include <QStyleOptionGraphicsItem>
 
 #include "Slice.h"
-using namespace H;
+using namespace Hurricane;
 
 #include "Utils.h"
 #include "InstanceGraphicsItem.h"
diff --git a/hurricane/src/editor/CellScene.h b/hurricane/src/editor/CellScene.h
index b1cfd579..c86f88ce 100644
--- a/hurricane/src/editor/CellScene.h
+++ b/hurricane/src/editor/CellScene.h
@@ -4,7 +4,7 @@
 #include <QGraphicsScene>
 
 #include "Cell.h"
-using namespace H;
+using namespace Hurricane;
 
 class CellScene : public QGraphicsScene {
     Q_OBJECT
diff --git a/hurricane/src/editor/InstanceGraphicsItem.cpp b/hurricane/src/editor/InstanceGraphicsItem.cpp
index ea11c825..3d4d5bdb 100644
--- a/hurricane/src/editor/InstanceGraphicsItem.cpp
+++ b/hurricane/src/editor/InstanceGraphicsItem.cpp
@@ -6,7 +6,7 @@
 #include "Slice.h"
 #include "Segment.h"
 #include "BasicLayer.h"
-using namespace H;
+using namespace Hurricane;
 
 #include "Utils.h"
 #include "InstanceGraphicsItem.h"
diff --git a/hurricane/src/editor/SegmentFigure.cpp b/hurricane/src/editor/SegmentFigure.cpp
index 2095ccb7..ddcadc76 100644
--- a/hurricane/src/editor/SegmentFigure.cpp
+++ b/hurricane/src/editor/SegmentFigure.cpp
@@ -6,7 +6,7 @@
 
 #include "CompositeLayer.h"
 #include "BasicLayer.h"
-using namespace H;
+using namespace Hurricane;
 
 #include "Utils.h"
 #include "CellGraphicsItem.h"
diff --git a/hurricane/src/editor/Utils.h b/hurricane/src/editor/Utils.h
index 2ff68098..3645b9a5 100644
--- a/hurricane/src/editor/Utils.h
+++ b/hurricane/src/editor/Utils.h
@@ -5,7 +5,7 @@
 #include <QTransform>
 #include "Box.h"
 #include "Transformation.h"
-using namespace H;
+using namespace Hurricane;
 
 inline void boxToRectangle(const Box& box, QRectF& rec) {
     double xmin = getValue(box.getXMin());
diff --git a/hurricane/src/hurricane/BasicLayer.cpp b/hurricane/src/hurricane/BasicLayer.cpp
index 03fe48ea..8b6bce03 100644
--- a/hurricane/src/hurricane/BasicLayer.cpp
+++ b/hurricane/src/hurricane/BasicLayer.cpp
@@ -350,19 +350,19 @@ Record* BasicLayer::Type::_getRecord() const
 
 } // End of Hurricane namespace.
 
-bool Scan(const string& s, H::BasicLayer::Type& type)
+bool Scan(const string& s, Hurricane::BasicLayer::Type& type)
 // **************************************************
 {
     if (s == "UNDEFINED") {
-        type = H::BasicLayer::Type::UNDEFINED;
+        type = Hurricane::BasicLayer::Type::UNDEFINED;
         return true;
     }
     if (s == "CONDUCTING") {
-        type = H::BasicLayer::Type::CONDUCTING;
+        type = Hurricane::BasicLayer::Type::CONDUCTING;
         return true;
     }
     if (s == "CONTACT") {
-        type = H::BasicLayer::Type::CONTACT;
+        type = Hurricane::BasicLayer::Type::CONTACT;
         return true;
     }
     return false;
diff --git a/hurricane/src/hurricane/BasicLayer.h b/hurricane/src/hurricane/BasicLayer.h
index 7798df54..64910c3b 100644
--- a/hurricane/src/hurricane/BasicLayer.h
+++ b/hurricane/src/hurricane/BasicLayer.h
@@ -140,7 +140,7 @@ template<>
 SetNestedSlotAdapter(Hurricane::BasicLayer)
 
 
-bool Scan(const string& s, H::BasicLayer::Type& type);
+bool Scan(const string& s, Hurricane::BasicLayer::Type& type);
 
 
 #endif // HURRICANE_BASIC_LAYER
diff --git a/hurricane/src/hurricane/Commons.h b/hurricane/src/hurricane/Commons.h
index 6e20ffe2..9d5a52fb 100644
--- a/hurricane/src/hurricane/Commons.h
+++ b/hurricane/src/hurricane/Commons.h
@@ -49,13 +49,6 @@
 // |                        Macros Definition                        |
 // x-----------------------------------------------------------------x
 
-
-#define Hurricane                 H
-#define BEGIN_NAMESPACE_HURRICANE namespace Hurricane {
-#define END_NAMESPACE_HURRICANE   }
-#define USING_NAMESPACE_HURRICANE using namespace std; using namespace Hurricane;
-
-
 #define is_a (bool)dynamic_cast
 
 
diff --git a/hurricane/src/hurricane/CompositeLayer.cpp b/hurricane/src/hurricane/CompositeLayer.cpp
index a6850d55..46ab3cf6 100644
--- a/hurricane/src/hurricane/CompositeLayer.cpp
+++ b/hurricane/src/hurricane/CompositeLayer.cpp
@@ -246,19 +246,19 @@ Record* CompositeLayer::Type::_getRecord() const
 // Generic functions
 // ****************************************************************************************************
 
-bool Scan(const string& s, H::CompositeLayer::Type& type)
+bool Scan(const string& s, Hurricane::CompositeLayer::Type& type)
 // ***************************************************
 {
     if (s == "UNDEFINED") {
-        type = H::CompositeLayer::Type::UNDEFINED;
+        type = Hurricane::CompositeLayer::Type::UNDEFINED;
         return true;
     }
     if (s == "METAL") {
-        type = H::CompositeLayer::Type::METAL;
+        type = Hurricane::CompositeLayer::Type::METAL;
         return true;
     }
     if (s == "VIA") {
-        type = H::CompositeLayer::Type::VIA;
+        type = Hurricane::CompositeLayer::Type::VIA;
         return true;
     }
     return false;
diff --git a/hurricane/src/hurricane/CompositeLayer.h b/hurricane/src/hurricane/CompositeLayer.h
index 5e0f9b63..d364b4a0 100644
--- a/hurricane/src/hurricane/CompositeLayer.h
+++ b/hurricane/src/hurricane/CompositeLayer.h
@@ -120,7 +120,7 @@ SetNestedSlotAdapter(Hurricane::CompositeLayer)
 // ****************************************************************************************************
 
 
-bool Scan(const string& s, H::CompositeLayer::Type& type);
+bool Scan(const string& s, Hurricane::CompositeLayer::Type& type);
 
 #endif // HURRICANE_COMPOSITE_LAYER
 
diff --git a/hurricane/src/hurricane/Name.cpp b/hurricane/src/hurricane/Name.cpp
index 315ba1f6..e4ea9acd 100644
--- a/hurricane/src/hurricane/Name.cpp
+++ b/hurricane/src/hurricane/Name.cpp
@@ -178,7 +178,7 @@ Record* Name::_getRecord() const
 // Generic functions
 // ****************************************************************************************************
 
-bool Scan ( const string& s, H::Name& name )
+bool Scan ( const string& s, Hurricane::Name& name )
 // *****************************************
 {
   name = s;
diff --git a/hurricane/src/hurricane/Name.h b/hurricane/src/hurricane/Name.h
index 60cfa0d7..f93739e3 100644
--- a/hurricane/src/hurricane/Name.h
+++ b/hurricane/src/hurricane/Name.h
@@ -79,7 +79,7 @@ class Name {
 ValueIOStreamSupport(Hurricane::Name)
 
 
-bool Scan ( const string& s, H::Name& name );
+bool Scan ( const string& s, Hurricane::Name& name );
 
 #endif // HURRICANE_NAME
 
diff --git a/hurricane/src/hurricane/Unit.cpp b/hurricane/src/hurricane/Unit.cpp
index 119cbd3f..7d76a9b3 100644
--- a/hurricane/src/hurricane/Unit.cpp
+++ b/hurricane/src/hurricane/Unit.cpp
@@ -170,12 +170,12 @@ string getValueString(const Unit& unit)
 
 
 
-bool Scan(const string& s, H::Unit& unit)
+bool Scan(const string& s, Hurricane::Unit& unit)
 // ***********************************
 {
     double d;
     if (Scan(s, d)) {
-        unit = H::getUnit(d);
+        unit = Hurricane::getUnit(d);
         return true;
     }
     return false;
diff --git a/hurricane/src/hurricane/Unit.h b/hurricane/src/hurricane/Unit.h
index 77f1b9d5..577dfced 100644
--- a/hurricane/src/hurricane/Unit.h
+++ b/hurricane/src/hurricane/Unit.h
@@ -97,7 +97,7 @@ string getValueString(const Unit& unit);
 
 
 
-bool Scan(const string& s, H::Unit& unit);
+bool Scan(const string& s, Hurricane::Unit& unit);
 
 #endif // HURRICANE_UNIT
 
diff --git a/hurricane/src/hurricane/VectorCollection.h b/hurricane/src/hurricane/VectorCollection.h
index 3d3ff35d..f025a91d 100644
--- a/hurricane/src/hurricane/VectorCollection.h
+++ b/hurricane/src/hurricane/VectorCollection.h
@@ -157,7 +157,7 @@ template<class Element> class VectorCollection : public Collection<Element> {
     public: Record* _getRecord() const
     // *************************
     {
-      H::Record* record = NULL;
+      Hurricane::Record* record = NULL;
       if (!_elementVector->empty()) {
         record = new Record(_getString());
         unsigned n = 1;
diff --git a/hurricane/src/pyext/ProxyProperty.cpp b/hurricane/src/pyext/ProxyProperty.cpp
index 6f3f849a..81ed98db 100644
--- a/hurricane/src/pyext/ProxyProperty.cpp
+++ b/hurricane/src/pyext/ProxyProperty.cpp
@@ -60,11 +60,11 @@
 #include "Error.h"
 #include "Warning.h"
 
-
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 
-namespace  Isobar {
+
+namespace Isobar {
 
 namespace {
 
diff --git a/hurricane/src/pyext/PyBox.cpp b/hurricane/src/pyext/PyBox.cpp
index b33a9ce8..75d09bf1 100644
--- a/hurricane/src/pyext/PyBox.cpp
+++ b/hurricane/src/pyext/PyBox.cpp
@@ -58,8 +58,7 @@
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyCell.cpp b/hurricane/src/pyext/PyCell.cpp
index e26976d1..7f755c15 100644
--- a/hurricane/src/pyext/PyCell.cpp
+++ b/hurricane/src/pyext/PyCell.cpp
@@ -65,7 +65,7 @@
 namespace  Isobar {
 
 
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyCell.h b/hurricane/src/pyext/PyCell.h
index 9dc1fb4e..0d7e2f02 100644
--- a/hurricane/src/pyext/PyCell.h
+++ b/hurricane/src/pyext/PyCell.h
@@ -64,8 +64,7 @@
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 
 extern "C" {
diff --git a/hurricane/src/pyext/PyCellLocator.cpp b/hurricane/src/pyext/PyCellLocator.cpp
index 2a456dd9..e3ed8389 100644
--- a/hurricane/src/pyext/PyCellLocator.cpp
+++ b/hurricane/src/pyext/PyCellLocator.cpp
@@ -58,7 +58,7 @@
 namespace  Isobar {
 
 
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 
 extern "C" {
diff --git a/hurricane/src/pyext/PyComponent.cpp b/hurricane/src/pyext/PyComponent.cpp
index baf6f9d3..2d7bc1f1 100644
--- a/hurricane/src/pyext/PyComponent.cpp
+++ b/hurricane/src/pyext/PyComponent.cpp
@@ -63,7 +63,7 @@
 namespace  Isobar {
 
 
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 
 extern "C" {
diff --git a/hurricane/src/pyext/PyComponentLocator.cpp b/hurricane/src/pyext/PyComponentLocator.cpp
index 2460dcf9..64d8a2c1 100644
--- a/hurricane/src/pyext/PyComponentLocator.cpp
+++ b/hurricane/src/pyext/PyComponentLocator.cpp
@@ -57,7 +57,7 @@
 namespace  Isobar {
 
 
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 
 extern "C" {
diff --git a/hurricane/src/pyext/PyContact.cpp b/hurricane/src/pyext/PyContact.cpp
index ce4e61bb..75ae9bf2 100644
--- a/hurricane/src/pyext/PyContact.cpp
+++ b/hurricane/src/pyext/PyContact.cpp
@@ -62,7 +62,7 @@
 namespace  Isobar {
 
 
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 
 extern "C" {
diff --git a/hurricane/src/pyext/PyDataBase.cpp b/hurricane/src/pyext/PyDataBase.cpp
index 191941f3..76398ee2 100644
--- a/hurricane/src/pyext/PyDataBase.cpp
+++ b/hurricane/src/pyext/PyDataBase.cpp
@@ -58,8 +58,7 @@
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyDataBase.h b/hurricane/src/pyext/PyDataBase.h
index 27170693..a7702f37 100644
--- a/hurricane/src/pyext/PyDataBase.h
+++ b/hurricane/src/pyext/PyDataBase.h
@@ -86,7 +86,7 @@ extern "C" {
   extern  PyMethodDef   PyDataBase_Methods[];
 
   extern  PyObject* PyDataBase_getDataBase  ( PyObject* module );
-  extern  PyObject* PyDataBase_Link         ( H::DataBase* db  );
+  extern  PyObject* PyDataBase_Link         ( Hurricane::DataBase* db  );
   extern  void      PyDataBase_LinkPyType   ();
   extern  void      PyDataBase_Constructor  ();
 
diff --git a/hurricane/src/pyext/PyEntity.cpp b/hurricane/src/pyext/PyEntity.cpp
index 2ca1af90..8b5ae209 100644
--- a/hurricane/src/pyext/PyEntity.cpp
+++ b/hurricane/src/pyext/PyEntity.cpp
@@ -66,7 +66,7 @@
 namespace Isobar {
 
 
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 
 extern "C" {
diff --git a/hurricane/src/pyext/PyHorizontal.cpp b/hurricane/src/pyext/PyHorizontal.cpp
index 727afcb2..8a09ed3e 100644
--- a/hurricane/src/pyext/PyHorizontal.cpp
+++ b/hurricane/src/pyext/PyHorizontal.cpp
@@ -60,7 +60,7 @@
 namespace  Isobar {
 
 
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 
 extern "C" {
diff --git a/hurricane/src/pyext/PyHurricane.cpp b/hurricane/src/pyext/PyHurricane.cpp
index 1981cf84..f7efd15a 100644
--- a/hurricane/src/pyext/PyHurricane.cpp
+++ b/hurricane/src/pyext/PyHurricane.cpp
@@ -121,7 +121,7 @@ namespace {
 } // End of local namespace.
 
 
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 
 
diff --git a/hurricane/src/pyext/PyHyperNet.cpp b/hurricane/src/pyext/PyHyperNet.cpp
index 33ddc006..ad3bba61 100644
--- a/hurricane/src/pyext/PyHyperNet.cpp
+++ b/hurricane/src/pyext/PyHyperNet.cpp
@@ -52,18 +52,17 @@
 
 
 
-# include  "PyHyperNet.h"
-# include  "PyCell.h"
-# include  "PyOccurrence.h"
-# include  "PyOccurrenceLocator.h" 
+#include "PyHyperNet.h"
+#include "PyCell.h"
+#include "PyOccurrence.h"
+#include "PyOccurrenceLocator.h" 
 
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 
 namespace  Isobar {
 
 
-USING_NAMESPACE_HURRICANE
 
 
 extern "C" {
diff --git a/hurricane/src/pyext/PyInstance.cpp b/hurricane/src/pyext/PyInstance.cpp
index 84375ff5..206ddc9f 100644
--- a/hurricane/src/pyext/PyInstance.cpp
+++ b/hurricane/src/pyext/PyInstance.cpp
@@ -62,9 +62,7 @@
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
-
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyInstance.h b/hurricane/src/pyext/PyInstance.h
index 9ec0e5cd..6391839c 100644
--- a/hurricane/src/pyext/PyInstance.h
+++ b/hurricane/src/pyext/PyInstance.h
@@ -65,7 +65,7 @@
 namespace  Isobar {
 
 
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 
 extern "C" {
diff --git a/hurricane/src/pyext/PyInstanceLocator.cpp b/hurricane/src/pyext/PyInstanceLocator.cpp
index 76205abc..ff3c503b 100644
--- a/hurricane/src/pyext/PyInstanceLocator.cpp
+++ b/hurricane/src/pyext/PyInstanceLocator.cpp
@@ -58,8 +58,7 @@
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 
 extern "C" {
diff --git a/hurricane/src/pyext/PyLayer.cpp b/hurricane/src/pyext/PyLayer.cpp
index af5cbf66..e138a2c5 100644
--- a/hurricane/src/pyext/PyLayer.cpp
+++ b/hurricane/src/pyext/PyLayer.cpp
@@ -59,8 +59,7 @@
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyLayer.h b/hurricane/src/pyext/PyLayer.h
index 9639ab9f..787cb28e 100644
--- a/hurricane/src/pyext/PyLayer.h
+++ b/hurricane/src/pyext/PyLayer.h
@@ -57,7 +57,7 @@
 
 namespace  Isobar {
 
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyLibrary.cpp b/hurricane/src/pyext/PyLibrary.cpp
index b30a3dda..75e31123 100644
--- a/hurricane/src/pyext/PyLibrary.cpp
+++ b/hurricane/src/pyext/PyLibrary.cpp
@@ -61,8 +61,7 @@
 
 namespace Isobar {
 
-
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyLibrary.h b/hurricane/src/pyext/PyLibrary.h
index 94ab7e17..e38fe05a 100644
--- a/hurricane/src/pyext/PyLibrary.h
+++ b/hurricane/src/pyext/PyLibrary.h
@@ -61,7 +61,7 @@
 namespace  Isobar {
 
 
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 
 extern "C" {
diff --git a/hurricane/src/pyext/PyName.cpp b/hurricane/src/pyext/PyName.cpp
index ab03a623..758c6297 100644
--- a/hurricane/src/pyext/PyName.cpp
+++ b/hurricane/src/pyext/PyName.cpp
@@ -54,8 +54,7 @@
 
 namespace Isobar {
 
-
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyNet.cpp b/hurricane/src/pyext/PyNet.cpp
index 25fbde9b..043a712e 100644
--- a/hurricane/src/pyext/PyNet.cpp
+++ b/hurricane/src/pyext/PyNet.cpp
@@ -52,25 +52,23 @@
 
 
 
-# include  "PyNet.h"
-# include  "PyName.h"
-# include  "PyCell.h" 
-# include  "PyPoint.h" 
-# include  "PyPlugLocator.h" 
-# include  "PySegmentLocator.h" 
-# include  "PyComponentLocator.h" 
-# include  "PyPinLocator.h" 
+#include "PyNet.h"
+#include "PyName.h"
+#include "PyCell.h" 
+#include "PyPoint.h" 
+#include "PyPlugLocator.h" 
+#include "PySegmentLocator.h" 
+#include "PyComponentLocator.h" 
+#include "PyPinLocator.h" 
+
+#include "NetExternalComponents.h"
+using namespace Hurricane;
 
-# include  "NetExternalComponents.h"
-USING_NAMESPACE_HURRICANE
 
 
 namespace  Isobar {
 
 
-USING_NAMESPACE_HURRICANE
-
-
 extern "C" {
 
 
diff --git a/hurricane/src/pyext/PyNetLocator.cpp b/hurricane/src/pyext/PyNetLocator.cpp
index 488a8c60..f396e1e1 100644
--- a/hurricane/src/pyext/PyNetLocator.cpp
+++ b/hurricane/src/pyext/PyNetLocator.cpp
@@ -50,14 +50,13 @@
 
 
 
-# include  "PyNetLocator.h"
-# include  "PyNet.h"
+#include "PyNetLocator.h"
+#include "PyNet.h"
 
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 
 extern "C" {
diff --git a/hurricane/src/pyext/PyOccurrence.cpp b/hurricane/src/pyext/PyOccurrence.cpp
index f6789eef..dd182190 100644
--- a/hurricane/src/pyext/PyOccurrence.cpp
+++ b/hurricane/src/pyext/PyOccurrence.cpp
@@ -60,8 +60,7 @@
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyOccurrenceLocator.cpp b/hurricane/src/pyext/PyOccurrenceLocator.cpp
index 23869bfe..018dea3c 100644
--- a/hurricane/src/pyext/PyOccurrenceLocator.cpp
+++ b/hurricane/src/pyext/PyOccurrenceLocator.cpp
@@ -50,20 +50,19 @@
 
 
 
-# include  "PyOccurrence.h"
-# include  "PyOccurrenceLocator.h"
+#include "PyOccurrence.h"
+#include "PyOccurrenceLocator.h"
 
 
 namespace  Isobar {
 
 
-USING_NAMESPACE_HURRICANE
-
+using namespace Hurricane;
 
 extern "C" {
 
 
-# define  METHOD_HEAD(function)   GENERIC_METHOD_HEAD(Locator<Occurrence>,locator,function)
+#define  METHOD_HEAD(function)   GENERIC_METHOD_HEAD(Locator<Occurrence>,locator,function)
 
 
 // x=================================================================x
diff --git a/hurricane/src/pyext/PyPath.cpp b/hurricane/src/pyext/PyPath.cpp
index ed9b3e76..81239c45 100644
--- a/hurricane/src/pyext/PyPath.cpp
+++ b/hurricane/src/pyext/PyPath.cpp
@@ -59,8 +59,7 @@
 
 namespace Isobar {
 
-
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyPin.cpp b/hurricane/src/pyext/PyPin.cpp
index bebe209a..f0a5a38e 100644
--- a/hurricane/src/pyext/PyPin.cpp
+++ b/hurricane/src/pyext/PyPin.cpp
@@ -58,8 +58,7 @@
 namespace Isobar {
 
 
-USING_NAMESPACE_HURRICANE
-
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyPin.h b/hurricane/src/pyext/PyPin.h
index 14f45c96..22754a63 100644
--- a/hurricane/src/pyext/PyPin.h
+++ b/hurricane/src/pyext/PyPin.h
@@ -58,7 +58,7 @@
 
 namespace  Isobar {
 
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
     
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyPinLocator.cpp b/hurricane/src/pyext/PyPinLocator.cpp
index 27e7abc3..91c5656a 100644
--- a/hurricane/src/pyext/PyPinLocator.cpp
+++ b/hurricane/src/pyext/PyPinLocator.cpp
@@ -52,28 +52,26 @@
 
 
 
-# include  "PyPinLocator.h"
-# include  "PyPin.h"
+#include "PyPinLocator.h"
+#include "PyPin.h"
 
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
-
+using namespace Hurricane;
 
 extern "C" {
 
-# undef   ACCESS_OBJECT 
-# define  ACCESS_OBJECT           _object
-# define  METHOD_HEAD(function)   GENERIC_METHOD_HEAD(Locator<Pin*>,locator,function)
+#undef  ACCESS_OBJECT 
+#define ACCESS_OBJECT           _object
+#define METHOD_HEAD(function)   GENERIC_METHOD_HEAD(Locator<Pin*>,locator,function)
 
 
 // x=================================================================x
 // |                 "PyPin" Python Module Code Part                 |
 // x=================================================================x
 
-# if defined(__PYTHON_MODULE__)
+#if defined(__PYTHON_MODULE__)
 
 
   // x-------------------------------------------------------------x
diff --git a/hurricane/src/pyext/PyPlug.cpp b/hurricane/src/pyext/PyPlug.cpp
index 2c2cfb15..40b4f440 100644
--- a/hurricane/src/pyext/PyPlug.cpp
+++ b/hurricane/src/pyext/PyPlug.cpp
@@ -52,25 +52,23 @@
 
 
 
-# include  "PyPlug.h"
-# include  "PyInstance.h"
-# include  "PyNet.h"
+#include "PyPlug.h"
+#include "PyInstance.h"
+#include "PyNet.h"
 
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
-
+using namespace Hurricane;
 
 extern "C" {
 
 
-# undef   ACCESS_OBJECT
-# undef   ACCESS_CLASS
-# define  ACCESS_OBJECT            _baseObject._baseObject._object
-# define  ACCESS_CLASS(_pyObject)  &(_pyObject->_baseObject._baseObject)
-# define  METHOD_HEAD(function)    GENERIC_METHOD_HEAD(Plug,plug,function)
+#undef  ACCESS_OBJECT
+#undef  ACCESS_CLASS
+#define ACCESS_OBJECT            _baseObject._baseObject._object
+#define ACCESS_CLASS(_pyObject)  &(_pyObject->_baseObject._baseObject)
+#define METHOD_HEAD(function)    GENERIC_METHOD_HEAD(Plug,plug,function)
 
 
 // x=================================================================x
diff --git a/hurricane/src/pyext/PyPlugLocator.cpp b/hurricane/src/pyext/PyPlugLocator.cpp
index 38361459..3422bed4 100644
--- a/hurricane/src/pyext/PyPlugLocator.cpp
+++ b/hurricane/src/pyext/PyPlugLocator.cpp
@@ -58,9 +58,7 @@
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
-
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyPoint.cpp b/hurricane/src/pyext/PyPoint.cpp
index 440b5fdc..e334c495 100644
--- a/hurricane/src/pyext/PyPoint.cpp
+++ b/hurricane/src/pyext/PyPoint.cpp
@@ -57,9 +57,7 @@
 
 namespace Isobar {
 
-
-USING_NAMESPACE_HURRICANE
-
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyReference.cpp b/hurricane/src/pyext/PyReference.cpp
index cd8a884f..893af33a 100644
--- a/hurricane/src/pyext/PyReference.cpp
+++ b/hurricane/src/pyext/PyReference.cpp
@@ -61,9 +61,7 @@
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
-
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyReferenceLocator.cpp b/hurricane/src/pyext/PyReferenceLocator.cpp
index 42a3f77d..3e469d31 100644
--- a/hurricane/src/pyext/PyReferenceLocator.cpp
+++ b/hurricane/src/pyext/PyReferenceLocator.cpp
@@ -47,23 +47,18 @@
 // |                                                                 |
 // x-----------------------------------------------------------------x
 
-
-
-
-# include  "PyReferenceLocator.h"
-# include  "PyReference.h"
+#include "PyReferenceLocator.h"
+#include "PyReference.h"
 
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
-
+using namespace Hurricane;
 
 extern "C" {
 
 
-# define  METHOD_HEAD(function)   GENERIC_METHOD_HEAD(Locator<Reference*>,locator,function)
+#define METHOD_HEAD(function)   GENERIC_METHOD_HEAD(Locator<Reference*>,locator,function)
 
 
 // x=================================================================x
diff --git a/hurricane/src/pyext/PySegment.cpp b/hurricane/src/pyext/PySegment.cpp
index 7558fa2a..f3cd5fc6 100644
--- a/hurricane/src/pyext/PySegment.cpp
+++ b/hurricane/src/pyext/PySegment.cpp
@@ -62,9 +62,7 @@
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
-
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PySegmentLocator.cpp b/hurricane/src/pyext/PySegmentLocator.cpp
index 298a81bc..6912786c 100644
--- a/hurricane/src/pyext/PySegmentLocator.cpp
+++ b/hurricane/src/pyext/PySegmentLocator.cpp
@@ -52,27 +52,25 @@
 
 
 
-# include  "PySegmentLocator.h"
-# include  "PySegment.h"
+#include "PySegmentLocator.h"
+#include "PySegment.h"
 
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
-
+using namespace Hurricane;
 
 extern "C" {
 
 
-# define  METHOD_HEAD(function)   GENERIC_METHOD_HEAD(Locator<Segment*>,locator,function)
+#define METHOD_HEAD(function)   GENERIC_METHOD_HEAD(Locator<Segment*>,locator,function)
 
 
 // x=================================================================x
 // |           "PySegmentLocator" Python Module Code Part            |
 // x=================================================================x
 
-# if defined(__PYTHON_MODULE__)
+#if defined(__PYTHON_MODULE__)
 
 
   // x-------------------------------------------------------------x
diff --git a/hurricane/src/pyext/PyTechnology.cpp b/hurricane/src/pyext/PyTechnology.cpp
index 51ec17e0..485874e4 100644
--- a/hurricane/src/pyext/PyTechnology.cpp
+++ b/hurricane/src/pyext/PyTechnology.cpp
@@ -60,8 +60,7 @@
 
 namespace Isobar {
 
-USING_NAMESPACE_HURRICANE
-
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyTechnology.h b/hurricane/src/pyext/PyTechnology.h
index 4fc7aa63..cf67cbc6 100644
--- a/hurricane/src/pyext/PyTechnology.h
+++ b/hurricane/src/pyext/PyTechnology.h
@@ -58,7 +58,7 @@
 
 namespace  Isobar {
 
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyTransformation.cpp b/hurricane/src/pyext/PyTransformation.cpp
index 6570544f..2778e533 100644
--- a/hurricane/src/pyext/PyTransformation.cpp
+++ b/hurricane/src/pyext/PyTransformation.cpp
@@ -59,9 +59,7 @@
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
-
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyUnit.cpp b/hurricane/src/pyext/PyUnit.cpp
index 7b5b1669..194b5ba6 100644
--- a/hurricane/src/pyext/PyUnit.cpp
+++ b/hurricane/src/pyext/PyUnit.cpp
@@ -57,8 +57,7 @@
 
 namespace Isobar {
 
-
-USING_NAMESPACE_HURRICANE
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyUpdateSession.cpp b/hurricane/src/pyext/PyUpdateSession.cpp
index 4a915884..04540f79 100644
--- a/hurricane/src/pyext/PyUpdateSession.cpp
+++ b/hurricane/src/pyext/PyUpdateSession.cpp
@@ -54,9 +54,7 @@
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
-
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/pyext/PyVertical.cpp b/hurricane/src/pyext/PyVertical.cpp
index 03f5cc49..8ee0782d 100644
--- a/hurricane/src/pyext/PyVertical.cpp
+++ b/hurricane/src/pyext/PyVertical.cpp
@@ -59,9 +59,7 @@
 
 namespace  Isobar {
 
-
-USING_NAMESPACE_HURRICANE
-
+using namespace Hurricane;
 
 extern "C" {
 
diff --git a/hurricane/src/viewer/CellViewer.h b/hurricane/src/viewer/CellViewer.h
index c7befb26..cd304103 100644
--- a/hurricane/src/viewer/CellViewer.h
+++ b/hurricane/src/viewer/CellViewer.h
@@ -2,7 +2,7 @@
 #define __CELL_VIEWER_H
 
 #include "Cell.h"
-using namespace H;
+using namespace Hurricane;
 
 #include <QMainWindow>
 
diff --git a/hurricane/src/viewer/CellWidget.cpp b/hurricane/src/viewer/CellWidget.cpp
index 7eed8ec0..f46ab916 100644
--- a/hurricane/src/viewer/CellWidget.cpp
+++ b/hurricane/src/viewer/CellWidget.cpp
@@ -18,7 +18,7 @@
 #include "Slot.h"
 #include "Technology.h"
 #include "Transformation.h"
-using namespace H;
+using namespace Hurricane;
 
 #include <QPaintEvent>
 #include <QPainter>
@@ -1775,7 +1775,7 @@ CellWidget::postRedraw(const Box& area)
 }
 
 
-void CellWidget::drawContent(const Cell* cell, const BasicLayer* basicLayer, const H::Box& updateArea, const Transformation& transformation) const {
+void CellWidget::drawContent(const Cell* cell, const BasicLayer* basicLayer, const Hurricane::Box& updateArea, const Transformation& transformation) const {
     for_each_instance(instance, cell->getInstancesUnder(updateArea)) {
         drawContent(instance, basicLayer, updateArea, transformation);
         end_for;
@@ -1788,7 +1788,7 @@ void CellWidget::drawContent(const Cell* cell, const BasicLayer* basicLayer, con
 }
 
 
-void CellWidget::drawContent(const Instance* instance, const BasicLayer* basicLayer, const H::Box& updateArea, const Transformation& transformation) const {
+void CellWidget::drawContent(const Instance* instance, const BasicLayer* basicLayer, const Hurricane::Box& updateArea, const Transformation& transformation) const {
     Box masterArea = updateArea;
     Transformation masterTransformation = instance->getTransformation();
     instance->getTransformation().getInvert().applyOn(masterArea);
@@ -1797,7 +1797,7 @@ void CellWidget::drawContent(const Instance* instance, const BasicLayer* basicLa
 }
 
 
-void CellWidget::drawSlice(const Slice* slice, const BasicLayer* basicLayer, const H::Box& updateArea, const Transformation& transformation) const {
+void CellWidget::drawSlice(const Slice* slice, const BasicLayer* basicLayer, const Hurricane::Box& updateArea, const Transformation& transformation) const {
     if (slice->getLayer()->contains(basicLayer)) {
         if (slice->getBoundingBox().intersect(updateArea)) {
             //if ((basicLayer == _layer->_getSymbolicBasicLayer()) || (3 < view->getScale())) 
@@ -1835,22 +1835,22 @@ void CellWidget::drawContact(const Contact* contact, const BasicLayer* basicLaye
     drawRectangle(transformation.getBox(contact->getBoundingBox(basicLayer)));
 }
 
-void CellWidget::drawPhantoms(const Cell* cell, const H::Box& updateArea, const Transformation& transformation) const {
+void CellWidget::drawPhantoms(const Cell* cell, const Hurricane::Box& updateArea, const Transformation& transformation) const {
     for_each_instance(instance, cell->getInstancesUnder(updateArea)) {
         drawPhantoms(instance, updateArea, transformation);
         end_for;
     }
 }
 
-void CellWidget::drawPhantoms(const Instance* instance, const H::Box& updateArea, const Transformation& transformation) const {
-    H::Box masterArea = updateArea;
+void CellWidget::drawPhantoms(const Instance* instance, const Hurricane::Box& updateArea, const Transformation& transformation) const {
+    Hurricane::Box masterArea = updateArea;
     Transformation masterTransformation = instance->getTransformation();
     instance->getTransformation().getInvert().applyOn(masterArea);
     transformation.applyOn(masterTransformation);
     drawPhantoms(instance->getMasterCell(), masterArea, masterTransformation);
 }
 
-void CellWidget::drawBoundaries(const Cell* cell, const H::Box& updateArea, const Transformation& transformation) const {
+void CellWidget::drawBoundaries(const Cell* cell, const Hurricane::Box& updateArea, const Transformation& transformation) const {
     drawRectangle(transformation.getBox(cell->getAbutmentBox()));
     for_each_instance(instance, cell->getInstances()) {
         drawBoundaries(instance, updateArea, transformation);
@@ -1858,8 +1858,8 @@ void CellWidget::drawBoundaries(const Cell* cell, const H::Box& updateArea, cons
     }
 }
 
-void CellWidget::drawBoundaries(const Instance* instance, const H::Box& updateArea, const Transformation& transformation) const {
-    H::Box masterArea = updateArea;
+void CellWidget::drawBoundaries(const Instance* instance, const Hurricane::Box& updateArea, const Transformation& transformation) const {
+    Hurricane::Box masterArea = updateArea;
     Transformation masterTransformation = instance->getTransformation();
     instance->getTransformation().getInvert().applyOn(masterArea);
     transformation.applyOn(masterTransformation);
diff --git a/hurricane/src/viewer/CellWidget.h b/hurricane/src/viewer/CellWidget.h
index e6a9b4da..d0d5e5e2 100644
--- a/hurricane/src/viewer/CellWidget.h
+++ b/hurricane/src/viewer/CellWidget.h
@@ -18,7 +18,7 @@
 #include "BasicLayer.h"
 #include "Occurrences.h"
 #include "Points.h"
-using namespace H;
+using namespace Hurricane;
 //#include "Selectors.h"
 
 //OPEN_MY_NAMESPACE
@@ -170,9 +170,9 @@ class /* Q_EXPORT */ CellWidget : public QWidget {
 	    void			abortStartedCommand();
 
 
-            void drawContent(const Cell* cell, const BasicLayer* basicLayer, const H::Box& updateArea, const Transformation& transformation) const;
-            void drawContent(const Instance* instance, const BasicLayer* basicLayer, const H::Box& updateArea, const Transformation& transformation) const;
-            void drawSlice(const Slice* slice, const BasicLayer* basicLayer, const H::Box& updateArea, const Transformation& transformation) const;
+            void drawContent(const Cell* cell, const BasicLayer* basicLayer, const Hurricane::Box& updateArea, const Transformation& transformation) const;
+            void drawContent(const Instance* instance, const BasicLayer* basicLayer, const Hurricane::Box& updateArea, const Transformation& transformation) const;
+            void drawSlice(const Slice* slice, const BasicLayer* basicLayer, const Hurricane::Box& updateArea, const Transformation& transformation) const;
             void drawPhantoms(const Cell* cell, const Box& updateArea, const Transformation& transformation) const;
             void drawPhantoms(const Instance* instance, const Box& updateArea, const Transformation& transformation) const;
             void drawBoundaries(const Cell* cell, const Box& updateArea, const Transformation& transformation) const;
diff --git a/hurricane/src/viewer/LayersWidget.cpp b/hurricane/src/viewer/LayersWidget.cpp
index c6413271..8038944a 100644
--- a/hurricane/src/viewer/LayersWidget.cpp
+++ b/hurricane/src/viewer/LayersWidget.cpp
@@ -1,7 +1,7 @@
 #include "DataBase.h"
 #include "Technology.h"
 #include "BasicLayer.h"
-using namespace H;
+using namespace Hurricane;
 
 #include <QCheckBox>
 #include <QLabel>