diff --git a/chamsin/src/analogic/GenTrans.h b/chamsin/src/analogic/GenTrans.h
index 4197988e..bc6c39b6 100644
--- a/chamsin/src/analogic/GenTrans.h
+++ b/chamsin/src/analogic/GenTrans.h
@@ -161,8 +161,7 @@
    ( (long)(getValue(box.getYMax()))%2==0 ) 
    
 
-BEGIN_NAMESPACE_HURRICANE
-
+namespace Hurricane {
 
 class GenTrans {
 // *************
@@ -214,7 +213,6 @@ class GenV1Trans : public GenTrans {
   
 };
 
-
-END_NAMESPACE_HURRICANE
+}
 
 #endif
diff --git a/chamsin/src/analogic/GenV1Trans.cpp b/chamsin/src/analogic/GenV1Trans.cpp
index 765be92e..298d2a9c 100644
--- a/chamsin/src/analogic/GenV1Trans.cpp
+++ b/chamsin/src/analogic/GenV1Trans.cpp
@@ -15,10 +15,7 @@
 
 #include "DataBase.h"
 
-
-
-BEGIN_NAMESPACE_HURRICANE
-
+namespace Hurricane {
 
 
 // ****************************************************************************************************
@@ -535,5 +532,4 @@ END_IF
 
 }  
 
-
-END_NAMESPACE_HURRICANE
+}
diff --git a/chamsin/src/analogic/MetaTransistor.cpp b/chamsin/src/analogic/MetaTransistor.cpp
index 9ffa3d3c..8cc1bd69 100644
--- a/chamsin/src/analogic/MetaTransistor.cpp
+++ b/chamsin/src/analogic/MetaTransistor.cpp
@@ -11,8 +11,7 @@
 #include "UpdateSession.h"
 #include "Vertical.h"
 
-
-BEGIN_NAMESPACE_HURRICANE
+namespace Hurricane {
 
 // ****************************************************************************************************
 // MetaTransistor implementation
@@ -172,6 +171,4 @@ Record* MetaTransistor::_getRecord() const
 	return record;
 }
 
-END_NAMESPACE_HURRICANE
-
-
+}
diff --git a/chamsin/src/analogic/Transistor.cpp b/chamsin/src/analogic/Transistor.cpp
index 59d7ed11..97abaca4 100644
--- a/chamsin/src/analogic/Transistor.cpp
+++ b/chamsin/src/analogic/Transistor.cpp
@@ -13,8 +13,7 @@
 
 #include "UpdateSession.h"
 
-BEGIN_NAMESPACE_HURRICANE
-
+namespace Hurricane {
 
 // ****************************************************************************************************
 // Transistor::MaskVersion implementation
@@ -440,16 +439,16 @@ void Transistor::DuplicateLayout(Transistor* transistor)
 
 }  
 
-END_NAMESPACE_HURRICANE
-
+}
 
 // ****************************************************************************************************
 // Generic functions
 // ****************************************************************************************************
 
-string getString(const H::Transistor::MaskInfo& masqueinfo)
+string getString(const Hurricane::Transistor::MaskInfo& masqueinfo)
 // **********************************************************
 {
   return masqueinfo._getString();
 }  
 
+
diff --git a/chamsin/src/analogic/Transistor.h b/chamsin/src/analogic/Transistor.h
index 19276f5c..73947cdc 100644
--- a/chamsin/src/analogic/Transistor.h
+++ b/chamsin/src/analogic/Transistor.h
@@ -318,18 +318,17 @@ template<>
                               }
 
 
-# endif
+#endif
 
 }
 
-//END_NAMESPACE_HURRICANE
 
 
 // ****************************************************************************************************
 // Generic functions
 // ****************************************************************************************************
 
-string getString(const H::Transistor::MaskInfo&);
+string getString(const Hurricane::Transistor::MaskInfo&);
 
 
 #endif // HURRICANE_TRANSISTOR
diff --git a/chamsin/src/analogic/Transistors.h b/chamsin/src/analogic/Transistors.h
index 72a4d882..a95ae8b9 100644
--- a/chamsin/src/analogic/Transistors.h
+++ b/chamsin/src/analogic/Transistors.h
@@ -10,7 +10,8 @@
 
 #include "Collection.h"
 
-BEGIN_NAMESPACE_HURRICANE
+namespace Hurricane {
+
 
 class Transistor;
 
@@ -53,7 +54,7 @@ typedef GenericFilter<Transistor*> TransistorFilter;
 
 
 
-END_NAMESPACE_HURRICANE
+}
 
 #endif // HURRICANE_TRANSISTORS
 
diff --git a/chamsin/src/analogic/TwoSpaces.cpp b/chamsin/src/analogic/TwoSpaces.cpp
index 74a81254..72faf487 100644
--- a/chamsin/src/analogic/TwoSpaces.cpp
+++ b/chamsin/src/analogic/TwoSpaces.cpp
@@ -6,8 +6,8 @@
 
 #include "TwoSpaces.h"
 
+namespace Hurricane {
 
-BEGIN_NAMESPACE_HURRICANE
 
 // ****************************************************************************************************
 // Two Spaces definition.
@@ -108,14 +108,13 @@ string TwoSpaces::_GetString() const
 // ****************************************************************************************************
 TwoSpaces ts("  ");
 
-
-END_NAMESPACE_HURRICANE
+}
 
 
 // ****************************************************************************************************
 // Generic functions
 // ****************************************************************************************************
-string GetString(const H::TwoSpaces& ts)
+string GetString(const Hurricane::TwoSpaces& ts)
 // ***********************************
 {
   return ts._GetString();
diff --git a/chamsin/src/analogic/TwoSpaces.h b/chamsin/src/analogic/TwoSpaces.h
index bf62dfba..50123ba4 100644
--- a/chamsin/src/analogic/TwoSpaces.h
+++ b/chamsin/src/analogic/TwoSpaces.h
@@ -5,13 +5,13 @@
 // ***************************************************************
 
 
-# ifndef HURRICANE_TWOSPACES
-# define HURRICANE_TWOSPACES
+#ifndef HURRICANE_TWOSPACES
+#define HURRICANE_TWOSPACES
 
-# include  "Commons.h" 
+#include  "Commons.h" 
 
+namespace Hurricane {
 
-BEGIN_NAMESPACE_HURRICANE
 
 // ****************************************************************************************************
 // TwoSpaces declaration.
@@ -55,18 +55,18 @@ class TwoSpaces {
 // ****************************************************************************************************
 extern TwoSpaces ts;
 
-END_NAMESPACE_HURRICANE
+}
 
 
 // ****************************************************************************************************
 // Generic functions
 // ****************************************************************************************************
-string GetString(const H::TwoSpaces&);
+string GetString(const Hurricane::TwoSpaces&);
 
-inline ostream& operator<<(ostream& stream, const H::TwoSpaces& ts)
+inline ostream& operator<<(ostream& stream, const Hurricane::TwoSpaces& ts)
 // ****************************************************************
 {
   return stream<< GetString(ts);
 }  
 
-# endif    // END HURRICANE_TWOSPACES
+#endif // END HURRICANE_TWOSPACES
diff --git a/chamsin/src/dtr/DtrAccess.cpp b/chamsin/src/dtr/DtrAccess.cpp
index 9c935145..c714b6d1 100644
--- a/chamsin/src/dtr/DtrAccess.cpp
+++ b/chamsin/src/dtr/DtrAccess.cpp
@@ -14,7 +14,7 @@
 extern void ParseDtr(const char*, Hurricane::DtrAccess*);
 
 
-BEGIN_NAMESPACE_HURRICANE
+namespace Hurricane {
 
 
 // ****************************************************************************************************
@@ -286,13 +286,13 @@ Record* DtrAccess::_getRecord() const
   return record;
 }
 
-END_NAMESPACE_HURRICANE
+}
 
 // ****************************************************************************************************
 // Generic functions
 // ****************************************************************************************************
 
-string getString(const H::DtrAccess& access)
+string getString(const Hurricane::DtrAccess& access)
 // **********************************************
 {
   return access._getString();
diff --git a/chamsin/src/dtr/DtrAccess.h b/chamsin/src/dtr/DtrAccess.h
index 58c5c3c4..7e179e24 100644
--- a/chamsin/src/dtr/DtrAccess.h
+++ b/chamsin/src/dtr/DtrAccess.h
@@ -10,9 +10,6 @@
 #include "Layer.h"
 #include "Layers.h"
 
-//BEGIN_NAMESPACE_HURRICANE
-
-
 namespace Hurricane {
 
 class DtrAccess {
@@ -164,21 +161,18 @@ class DtrAccess {
     public: map<string, int>& _getLabel2ModellingMap() { return _label2modellingMap; };
     public: map<string, double>& _getLabel2SimpleCapaMimMap() 
 	     { return _label2simplecapamimMap; };
-# endif
+#endif
 
 };
 
 }
 
 
-//END_NAMESPACE_HURRICANE
-
-
 // ****************************************************************************************************
 // Generic functions
 // ****************************************************************************************************
 
-string getString(const H::DtrAccess&);
+string getString(const Hurricane::DtrAccess&);
 
 
 #endif // HURRICANE_DTRACCESS
diff --git a/chamsin/src/dtr/GenericDtrAccess.cpp b/chamsin/src/dtr/GenericDtrAccess.cpp
index 8730521b..bb77a04f 100644
--- a/chamsin/src/dtr/GenericDtrAccess.cpp
+++ b/chamsin/src/dtr/GenericDtrAccess.cpp
@@ -7,8 +7,7 @@
 #include "DtrAccess.h"
 #include "GenericDtrAccess.h"
 
-BEGIN_NAMESPACE_HURRICANE
-
+namespace Hurricane {
 
 // ****************************************************************************************************
 // GenericDtrAccess implementation
@@ -43,15 +42,13 @@ string GenericDtrAccess::_getString() const
   
 }
 
-END_NAMESPACE_HURRICANE
-
-
+}
 
 // ****************************************************************************************************
 // Generic functions
 // ****************************************************************************************************
 
-string getString(const H::GenericDtrAccess& access)
+string getString(const Hurricane::GenericDtrAccess& access)
 // ************************************************
 {
   return access._getString();
diff --git a/chamsin/src/dtr/GenericDtrAccess.h b/chamsin/src/dtr/GenericDtrAccess.h
index dab491e1..f4bd71ee 100644
--- a/chamsin/src/dtr/GenericDtrAccess.h
+++ b/chamsin/src/dtr/GenericDtrAccess.h
@@ -63,15 +63,13 @@ class GenericDtrAccess {
 };
 
 
-//END_NAMESPACE_HURRICANE
-
 }
 
 // ****************************************************************************************************
 // Generic functions
 // ****************************************************************************************************
 
-string getString(const H::GenericDtrAccess&);
+string getString(const Hurricane::GenericDtrAccess&);
 
 
 #endif // HURRICANE_GENERICDTRACCESS
diff --git a/chamsin/src/dtr/RdsUnit.cpp b/chamsin/src/dtr/RdsUnit.cpp
index b10424b6..f2723c37 100644
--- a/chamsin/src/dtr/RdsUnit.cpp
+++ b/chamsin/src/dtr/RdsUnit.cpp
@@ -221,10 +221,7 @@ static void CalculateRdsUnit() {
 
 }
 
-BEGIN_NAMESPACE_HURRICANE
-
-
-
+namespace Hurricane {
 
 // ****************************************************************************************************
 // Utilitarians 
@@ -255,4 +252,4 @@ const long& getRdsLambda()
 }  
 
 
-END_NAMESPACE_HURRICANE
+}
diff --git a/chamsin/src/tests/AnalogicTest.cpp b/chamsin/src/tests/AnalogicTest.cpp
index e565545d..ac8fe904 100644
--- a/chamsin/src/tests/AnalogicTest.cpp
+++ b/chamsin/src/tests/AnalogicTest.cpp
@@ -2,7 +2,7 @@
 
 #include "Library.h"
 #include "Warning.h"
-using namespace H;
+using namespace Hurricane;
 
 #include "crlcore/CDataBase.h"
 using namespace CRL;