diff --git a/AMDiS/src/compositeFEM/CFE_Integration.cc b/AMDiS/src/compositeFEM/CFE_Integration.cc
index 3010ad4819e6e316269c4bca7021d83fe7cee045..5c12ed4898a8bea24c737ece85196ab0bf699110 100644
--- a/AMDiS/src/compositeFEM/CFE_Integration.cc
+++ b/AMDiS/src/compositeFEM/CFE_Integration.cc
@@ -27,7 +27,7 @@
 #include "SubElInfo.h"
 #include "SubPolytope.h"
 
-namespace AMDiS {
+namespace compositeFEM {
 
   double 
   CFE_Integration::integrate_onNegLs(ElementFunction<double> *f, 
diff --git a/AMDiS/src/compositeFEM/CFE_Integration.h b/AMDiS/src/compositeFEM/CFE_Integration.h
index fd64a0b3f3215e55c84ff188af3f97be16714bef..70b9152d8986b8b6aead70ddfa0547586b1b3c57 100644
--- a/AMDiS/src/compositeFEM/CFE_Integration.h
+++ b/AMDiS/src/compositeFEM/CFE_Integration.h
@@ -29,7 +29,10 @@
 #include "Quadrature.h"
 #include "ElementLevelSet.h"
 
-namespace AMDiS {
+
+namespace compositeFEM {
+  
+  using namespace AMDiS;
 
   class CFE_Integration
   {
diff --git a/AMDiS/src/compositeFEM/CFE_NormAndErrorFcts.cc b/AMDiS/src/compositeFEM/CFE_NormAndErrorFcts.cc
index 04aeadab454b56a94b1fa3210273a9b54353053c..fae2cb860a062dd498fd28c0c15a85812e52f596 100644
--- a/AMDiS/src/compositeFEM/CFE_NormAndErrorFcts.cc
+++ b/AMDiS/src/compositeFEM/CFE_NormAndErrorFcts.cc
@@ -25,7 +25,7 @@
 #include "Traverse.h"
 #include "SubElInfo.h"
 
-namespace AMDiS {
+namespace compositeFEM {
 
   double CFE_NormAndErrorFcts::L2_err_abs = 0.0;
   double CFE_NormAndErrorFcts::L2_u_norm = 0.0;
diff --git a/AMDiS/src/compositeFEM/CFE_NormAndErrorFcts.h b/AMDiS/src/compositeFEM/CFE_NormAndErrorFcts.h
index 3f8061ecedf5781e59baf8602424cc599e05bd5a..d8dbf02481268fd8de7ac9a4817fff1f6730e40e 100644
--- a/AMDiS/src/compositeFEM/CFE_NormAndErrorFcts.h
+++ b/AMDiS/src/compositeFEM/CFE_NormAndErrorFcts.h
@@ -34,8 +34,11 @@
 #include "ScalableQuadrature.h"
 #include "SubPolytope.h"
 
-namespace AMDiS {
 
+namespace compositeFEM {
+  
+  using namespace AMDiS;
+  
   class ElementNorm
   {
   public:
diff --git a/AMDiS/src/compositeFEM/ElementLevelSet.h b/AMDiS/src/compositeFEM/ElementLevelSet.h
index dae07cc87ceb9067a13de56095e6534e975b0119..aca1772d04ccd8691ab37e515cad511c9de14836 100644
--- a/AMDiS/src/compositeFEM/ElementLevelSet.h
+++ b/AMDiS/src/compositeFEM/ElementLevelSet.h
@@ -22,8 +22,8 @@
 
 /** \file ElementLevelSet.h */
 
-#ifndef AMDIS_ELEMENTLEVELSET_H
-#define AMDIS_ELEMENTLEVELSET_H
+#ifndef AMDIS_CFEM_ELEMENTLEVELSET_H
+#define AMDIS_CFEM_ELEMENTLEVELSET_H
 
 #include "ElementFunction.h"
 #include "FixVec.h"
@@ -471,6 +471,6 @@ protected:
 
 }
 
-using compositeFEM::ElementLevelSet;
+// using compositeFEM::ElementLevelSet;
 
 #endif  // AMDIS_ELEMENTLEVELSET_H
diff --git a/AMDiS/src/compositeFEM/SubElementAssembler.cc b/AMDiS/src/compositeFEM/SubElementAssembler.cc
index 0744e0f17d3f2c57584590b3806306c91ad0d9b9..91f3fd5ffa6d22c9709e3e61c429a9439fd0ecc8 100644
--- a/AMDiS/src/compositeFEM/SubElementAssembler.cc
+++ b/AMDiS/src/compositeFEM/SubElementAssembler.cc
@@ -25,7 +25,7 @@
 #include "ScalableQuadrature.h"
 #include "SubPolytope.h"
 
-namespace AMDiS {
+namespace compositeFEM {
 
   SubElementAssembler::SubElementAssembler(Operator *op, 
 					   const FiniteElemSpace *rowFeSpace_,
diff --git a/AMDiS/src/compositeFEM/SubElementAssembler.h b/AMDiS/src/compositeFEM/SubElementAssembler.h
index 86d807c1c067239f2151e775b7b30e707ae618c3..0f769cdb450fd32a0ce7ba6dc6ed568529678e38 100644
--- a/AMDiS/src/compositeFEM/SubElementAssembler.h
+++ b/AMDiS/src/compositeFEM/SubElementAssembler.h
@@ -29,7 +29,10 @@
 #include "SubElInfo.h"
 #include "ScalableQuadrature.h"
 
-namespace AMDiS {
+
+namespace compositeFEM {
+  
+  using namespace AMDiS;
 
   class SubPolytope;
 
diff --git a/AMDiS/src/compositeFEM/SubPolytope.cc b/AMDiS/src/compositeFEM/SubPolytope.cc
index c2c3ce492df5e9d1a8013daf73be55f409a6ad02..8debeed56043920e6582b0235e8612b4f3897f08 100644
--- a/AMDiS/src/compositeFEM/SubPolytope.cc
+++ b/AMDiS/src/compositeFEM/SubPolytope.cc
@@ -24,8 +24,9 @@
 #include "SubElInfo.h"
 #include "SubPolytope.h"
 
-namespace AMDiS {
 
+namespace compositeFEM {
+  
   bool SubPolytope::checkIntPoints()
   {
     ////////////////////////////////////////////////////////////////////////////
diff --git a/AMDiS/src/compositeFEM/SubPolytope.h b/AMDiS/src/compositeFEM/SubPolytope.h
index 192f314bf7abe9489caa4c44aca6d4d53c99bd09..6cf2932f0a32e0d697761ac84e5248c9202f9705 100644
--- a/AMDiS/src/compositeFEM/SubPolytope.h
+++ b/AMDiS/src/compositeFEM/SubPolytope.h
@@ -31,7 +31,10 @@
 #include "FixVec.h"
 #include "SubElInfo.h"
 
-namespace AMDiS {
+
+namespace compositeFEM {
+  
+  using namespace AMDiS;
 
   // ===========================================================================
   // === class SubPolytope =====================================================