diff --git a/source/trunk/include/CLASSBackEnd.hxx b/source/trunk/include/CLASSBackEnd.hxx
index fb36d17d04999243bb5bd732cddb0d72758d75bd..4241d99c2f4831ec32696f0f0844ab41a97e5be7 100644
--- a/source/trunk/include/CLASSBackEnd.hxx
+++ b/source/trunk/include/CLASSBackEnd.hxx
@@ -1,6 +1,6 @@
 
-#ifndef _CLASSBACKEND_HXX
-#define _CLASSBACKEND_HXX
+#ifndef _CLASSBACKEND_
+#define _CLASSBACKEND_
 
 
 /*!
diff --git a/source/trunk/include/CLASSConstante.hxx b/source/trunk/include/CLASSConstante.hxx
index 316c805c2735411a5fae959e83c8a7121c3b9909..c6d7bb4cac819132e3d31761174c8386681b4f69 100644
--- a/source/trunk/include/CLASSConstante.hxx
+++ b/source/trunk/include/CLASSConstante.hxx
@@ -1,5 +1,5 @@
-#ifndef _CLASSConstante_HXX_
-#define _CLASSConstante_HXX_
+#ifndef _CLASSConstante_
+#define _CLASSConstante_
 
 //CLASS library
 #include "ZAIMass.hxx"
diff --git a/source/trunk/include/CLASSFacility.hxx b/source/trunk/include/CLASSFacility.hxx
index 2ba95437c44a1ac0260393946cbbcd64fa29a523..05807c9864b1d356204a314903486803bc07fafc 100644
--- a/source/trunk/include/CLASSFacility.hxx
+++ b/source/trunk/include/CLASSFacility.hxx
@@ -1,6 +1,6 @@
 
-#ifndef _CLASSFACILITY_HXX
-#define _CLASSFACILITY_HXX
+#ifndef _CLASSFACILITY_
+#define _CLASSFACILITY_
 
 
 /*!
diff --git a/source/trunk/include/CLASSFuel.hxx b/source/trunk/include/CLASSFuel.hxx
index 89c3826e44075453bfe96dcbc5808875e1fdd8df..03d9dbc96757794218d06e7f88ebef13f4382899 100644
--- a/source/trunk/include/CLASSFuel.hxx
+++ b/source/trunk/include/CLASSFuel.hxx
@@ -1,6 +1,6 @@
 
-#ifndef _CLASSFUEL_HXX
-#define _CLASSFUEL_HXX
+#ifndef _CLASSFUEL_
+#define _CLASSFUEL_
 
 
 /*!
diff --git a/source/trunk/include/CLASSHeaders.hxx b/source/trunk/include/CLASSHeaders.hxx
index 2a9e3fe3f17e81ec5320e451092a9a3efacc70b4..5fc0561f9219fc811f2887bc9af200547fa06b3e 100755
--- a/source/trunk/include/CLASSHeaders.hxx
+++ b/source/trunk/include/CLASSHeaders.hxx
@@ -1,5 +1,5 @@
-#ifndef _CLASSHEADERS_HXX_
-#define _CLASSHEADERS_HXX_
+#ifndef _CLASSHEADERS_
+#define _CLASSHEADERS_
 
 
 
diff --git a/source/trunk/include/CLASSLogger.hxx b/source/trunk/include/CLASSLogger.hxx
index e2d6ca0cb8cbb57a39b3374386d738af035f7008..f1282977b5908ccebb4c38552286d44e24be93f4 100755
--- a/source/trunk/include/CLASSLogger.hxx
+++ b/source/trunk/include/CLASSLogger.hxx
@@ -1,5 +1,5 @@
-#ifndef _LOG_CLASS_
-#define _LOG_CLASS_
+#ifndef _LOG_
+#define _LOG_
 
 
 /*!
@@ -43,8 +43,8 @@ using namespace std;
 
 
 
-#ifndef _LOGTYPE_CLASS
-#define _LOGTYPE_CLASS
+#ifndef _LOGTYPE_
+#define _LOGTYPE_
 
 //-----------------------------------------------------------------------------//
 //!handles output stream in CLASS
@@ -124,8 +124,8 @@ public:
 #endif
 
 
-#ifndef _CLASSLogger_CLASS_
-#define _CLASSLogger_CLASS_
+#ifndef _CLASSLogger_
+#define _CLASSLogger_
 
 //-----------------------------------------------------------------------------//
 //! Object to handle output messages
diff --git a/source/trunk/include/CLASSObject.hxx b/source/trunk/include/CLASSObject.hxx
index 907924fec7466d5c6be1e61642146738b47296db..8d2f1d538821aef0c6fcce825f881fc63d5d6553 100644
--- a/source/trunk/include/CLASSObject.hxx
+++ b/source/trunk/include/CLASSObject.hxx
@@ -1,6 +1,6 @@
 
-#ifndef _CLASSOBJECT_HXX
-#define _CLASSOBJECT_HXX
+#ifndef _CLASSOBJECT_
+#define _CLASSOBJECT_
 
 
 /*!
diff --git a/source/trunk/include/DecayDataBank.hxx b/source/trunk/include/DecayDataBank.hxx
index ef0c09d75cbd90f7de7a772cdd4eb865c375ce53..7b2f198761ac580b08126242e78a83fa2626b314 100644
--- a/source/trunk/include/DecayDataBank.hxx
+++ b/source/trunk/include/DecayDataBank.hxx
@@ -1,5 +1,5 @@
-#ifndef __DecayDataBank_HXX__
-#define __DecayDataBank_HXX__
+#ifndef _DecayDataBank_
+#define _DecayDataBank_
 
 /*!
  \file
diff --git a/source/trunk/include/EquivalenceModel.hxx b/source/trunk/include/EquivalenceModel.hxx
index c4e27974f5f2bcfb4d1ac3079a7d4387e26d75a2..4417fc569b49fe4ff02be50cfc45c43b718a33ba 100644
--- a/source/trunk/include/EquivalenceModel.hxx
+++ b/source/trunk/include/EquivalenceModel.hxx
@@ -1,5 +1,5 @@
-#ifndef _EQUIVALENCEMODEL_HXX
-#define _EQUIVALENCEMODEL_HXX
+#ifndef _EQUIVALENCEMODEL_
+#define _EQUIVALENCEMODEL_
 
 
 /*!
diff --git a/source/trunk/include/EvolutionData.hxx b/source/trunk/include/EvolutionData.hxx
index da449a4470e80212eafa8d8446b7fd9b34c17869..7d0a20e9ee4b3be62f75cdb96d25121642d0ee8a 100755
--- a/source/trunk/include/EvolutionData.hxx
+++ b/source/trunk/include/EvolutionData.hxx
@@ -1,5 +1,5 @@
-#ifndef __EvolutionData_HXX__
-#define __EvolutionData_HXX__
+#ifndef _EvolutionData_
+#define _EvolutionData_
 
 /*!
  \file
diff --git a/source/trunk/include/FabricationPlant.hxx b/source/trunk/include/FabricationPlant.hxx
index 742229bab907d11b3cbc3e3fbce20075a582a4b3..072e60dfe03c8425269c653c6b33ee7faae08ce4 100644
--- a/source/trunk/include/FabricationPlant.hxx
+++ b/source/trunk/include/FabricationPlant.hxx
@@ -1,5 +1,5 @@
-#ifndef __FabricationPlant_HXX__
-#define __FabricationPlant_HXX__
+#ifndef _FabricationPlant_
+#define _FabricationPlant_
 
 /*!
  \file
diff --git a/source/trunk/include/IrradiationModel.hxx b/source/trunk/include/IrradiationModel.hxx
index 075e21d357dbb23a14d1e3d783642dcf26604f83..07a7effa07b316831538e83f89d7b0a35cc3d4ee 100644
--- a/source/trunk/include/IrradiationModel.hxx
+++ b/source/trunk/include/IrradiationModel.hxx
@@ -1,5 +1,5 @@
-#ifndef _IRRADIATIONMODEL_HXX
-#define _IRRADIATIONMODEL_HXX
+#ifndef _IRRADIATIONMODEL_
+#define _IRRADIATIONMODEL_
 
 
 /*!
diff --git a/source/trunk/include/IsotopicVector.hxx b/source/trunk/include/IsotopicVector.hxx
index 3d914ac058f2ee2b9e3365ebd8e4c31549818bd2..46bbd4d2a7c97675bfdf5d42e7f23af81d89cb6e 100755
--- a/source/trunk/include/IsotopicVector.hxx
+++ b/source/trunk/include/IsotopicVector.hxx
@@ -1,5 +1,5 @@
-#ifndef __ISOTOPICVECTOR_HXX__
-#define __ISOTOPICVECTOR_HXX__
+#ifndef _ISOTOPICVECTOR_
+#define _ISOTOPICVECTOR_
 
 
 /*!
diff --git a/source/trunk/include/PhysicsModels.hxx b/source/trunk/include/PhysicsModels.hxx
index 6e9f74447f600270e0826ead83c05561a71f4417..43bfb820129f0b4fc8b8f267b2e316ae1c801b3d 100644
--- a/source/trunk/include/PhysicsModels.hxx
+++ b/source/trunk/include/PhysicsModels.hxx
@@ -1,6 +1,6 @@
 
-#ifndef _PhysicsModels_HXX
-#define _PhysicsModels_HXX
+#ifndef _PhysicsModels_
+#define _PhysicsModels_
 
 
 /*!
diff --git a/source/trunk/include/Pool.hxx b/source/trunk/include/Pool.hxx
index 79cf04459ec08b3496278996e521f31c106817fc..c1c8da2a5d267fc7e4f1b1de8ad48762ee99465d 100755
--- a/source/trunk/include/Pool.hxx
+++ b/source/trunk/include/Pool.hxx
@@ -1,5 +1,5 @@
-#ifndef __Pool_HXX__
-#define __Pool_HXX__
+#ifndef _Pool_
+#define _Pool_
 /*!
  \file
  \brief Header file for Pool class.
diff --git a/source/trunk/include/Reactor.hxx b/source/trunk/include/Reactor.hxx
index e29bbc213b658d85aca15571afb79c323fbaffa4..79771e22de8849152e04902a84ed79fd5000619d 100755
--- a/source/trunk/include/Reactor.hxx
+++ b/source/trunk/include/Reactor.hxx
@@ -1,5 +1,5 @@
-#ifndef __Reactor_HXX__
-#define __Reactor_HXX__
+#ifndef _Reactor_
+#define _Reactor_
 
 /*!
  \file
diff --git a/source/trunk/include/Scenario.hxx b/source/trunk/include/Scenario.hxx
index 0e19675e90639eefbdb227b9482dd33e44cb9016..c2d2603d6281270f89da1e1fe82c953b1e42d2f7 100755
--- a/source/trunk/include/Scenario.hxx
+++ b/source/trunk/include/Scenario.hxx
@@ -1,5 +1,5 @@
-#ifndef _SCENARIO_HXX_
-#define _SCENARIO_HXX_
+#ifndef _SCENARIO_
+#define _SCENARIO_
 /*!
  \file
  \brief Header file for CLASS classes.
diff --git a/source/trunk/include/SeparationPlant.hxx b/source/trunk/include/SeparationPlant.hxx
index 697b2b6708fbea15d4b9e77765eeb85474d0e257..cf988d6b9acb01649028683ba7ad5407cf373257 100644
--- a/source/trunk/include/SeparationPlant.hxx
+++ b/source/trunk/include/SeparationPlant.hxx
@@ -1,5 +1,5 @@
-#ifndef __SeparationPlant_HXX__
-#define __SeparationPlant_HXX__
+#ifndef _SeparationPlant_
+#define _SeparationPlant_
 /*!
  \file
  \brief Header file for SeparationPlant class.
diff --git a/source/trunk/include/Storage.hxx b/source/trunk/include/Storage.hxx
index 5a5a4b87398025d0b8835b3ceaf2bfaf7dbc8a48..9c3b5f10835081b788be32bcd97a97640524c56d 100644
--- a/source/trunk/include/Storage.hxx
+++ b/source/trunk/include/Storage.hxx
@@ -1,5 +1,5 @@
-#ifndef __Storage_HXX__
-#define __Storage_HXX__
+#ifndef _Storage_
+#define _Storage_
 
 /*!
  \file 
diff --git a/source/trunk/include/XSModel.hxx b/source/trunk/include/XSModel.hxx
index b3c6ce0599ea8fa51b6cf87f8bd00e4488f001b3..73b32679777af5bc1a84433e1a12b7b9da2834c4 100644
--- a/source/trunk/include/XSModel.hxx
+++ b/source/trunk/include/XSModel.hxx
@@ -1,5 +1,5 @@
-#ifndef _XSMODEL_HXX
-#define _XSMODEL_HXX
+#ifndef _XSMODEL_
+#define _XSMODEL_
 
 
 /*!