diff --git a/MaterialLib/SolidModels/CreateEhlers.h b/MaterialLib/SolidModels/CreateEhlers.h
index 1f80ef3eac99988a73bc79458e3551e0afb6e870..656599de6ab90e8ee7f049a989e732c79657f57c 100644
--- a/MaterialLib/SolidModels/CreateEhlers.h
+++ b/MaterialLib/SolidModels/CreateEhlers.h
@@ -11,14 +11,17 @@
 
 #include <logog/include/logog.hpp>
 
-#include "MechanicsBase.h"
 #include "ProcessLib/Utils/ProcessUtils.h"  // required for findParameter
+
 #include "Ehlers.h"
+#include "MechanicsBase.h"
 
 namespace MaterialLib
 {
 namespace Solids
 {
+namespace Ehlers
+{
 template <int DisplacementDim>
 std::unique_ptr<MechanicsBase<DisplacementDim>> createEhlers(
     std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const& parameters,
@@ -148,5 +151,6 @@ std::unique_ptr<MechanicsBase<DisplacementDim>> createEhlers(
         new SolidEhlers<DisplacementDim>{mp}};
 }
 
+}  // namespace Ehlers
 }  // namespace Solids
 }  // namespace MaterialLib
diff --git a/MaterialLib/SolidModels/Ehlers-impl.h b/MaterialLib/SolidModels/Ehlers-impl.h
index 92b1a81733aab334786208dde66968f35bbbc631..d5415da9d24fec0872f5acb635f6bce568e9119c 100644
--- a/MaterialLib/SolidModels/Ehlers-impl.h
+++ b/MaterialLib/SolidModels/Ehlers-impl.h
@@ -41,6 +41,8 @@ namespace MaterialLib
 {
 namespace Solids
 {
+namespace Ehlers
+{
 template <int DisplacementDim>
 struct PhysicalStressWithInvariants final
 {
@@ -654,5 +656,6 @@ bool SolidEhlers<DisplacementDim>::computeConstitutiveRelation(
     return true;
 }
 
+}  // namespace Ehlers
 }  // namespace Solids
 }  // namespace MaterialLib
diff --git a/MaterialLib/SolidModels/Ehlers.cpp b/MaterialLib/SolidModels/Ehlers.cpp
index fcf2b1e6f9e850c246007f7f406639c9f44aeb1e..af91297bbd6d64e3b9dacfdc46027dd105d0e87b 100644
--- a/MaterialLib/SolidModels/Ehlers.cpp
+++ b/MaterialLib/SolidModels/Ehlers.cpp
@@ -13,8 +13,11 @@ namespace MaterialLib
 {
 namespace Solids
 {
+namespace Ehlers
+{
 template class SolidEhlers<2>;
 template class SolidEhlers<3>;
 
+}  // namespace Ehlers
 }  // namespace Solids
 }  // namespace MaterialLib
diff --git a/MaterialLib/SolidModels/Ehlers.h b/MaterialLib/SolidModels/Ehlers.h
index 0a858a00c267c53921692e997d6b55eaef077d2f..a9c14cf756f426003eade9f85e1500c2182664b8 100644
--- a/MaterialLib/SolidModels/Ehlers.h
+++ b/MaterialLib/SolidModels/Ehlers.h
@@ -36,6 +36,8 @@ namespace MaterialLib
 {
 namespace Solids
 {
+namespace Ehlers
+{
 
 template <int DisplacementDim>
 class SolidEhlers final : public MechanicsBase<DisplacementDim>
@@ -207,6 +209,7 @@ private:
     MaterialProperties _mp;
 };
 
+}  // namespace Ehlers
 }  // namespace Solids
 }  // namespace MaterialLib
 #include "Ehlers-impl.h"
diff --git a/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp
index 1c19e13ca9926a4c993cd0d8d63deb0644558941..a00758073b60221ea72a925d56a15db406f91eb9 100644
--- a/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp
+++ b/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp
@@ -81,7 +81,7 @@ createSmallDeformationProcess(
         material = nullptr;
     if (type == "Ehlers")
     {
-        material = MaterialLib::Solids::createEhlers<DisplacementDim>(
+        material = MaterialLib::Solids::Ehlers::createEhlers<DisplacementDim>(
             parameters, constitutive_relation_config);
     }
     else if (type == "LinearElasticIsotropic")