diff --git a/src/commercialFEM_fileList.f90 b/src/commercialFEM_fileList.f90
index 301274897..5108fe853 100644
--- a/src/commercialFEM_fileList.f90
+++ b/src/commercialFEM_fileList.f90
@@ -46,9 +46,9 @@
 #include "plastic_nonlocal.f90"
 #include "constitutive.f90"
 #include "crystallite.f90"
-#include "homogenization_none.f90"
-#include "homogenization_isostrain.f90"
-#include "homogenization_RGC.f90"
+#include "homogenization_mech_none.f90"
+#include "homogenization_mech_isostrain.f90"
+#include "homogenization_mech_RGC.f90"
 #include "thermal_isothermal.f90"
 #include "thermal_adiabatic.f90"
 #include "thermal_conduction.f90"
diff --git a/src/homogenization_RGC.f90 b/src/homogenization_mech_RGC.f90
similarity index 99%
rename from src/homogenization_RGC.f90
rename to src/homogenization_mech_RGC.f90
index ea1dd39a6..012ad6086 100644
--- a/src/homogenization_RGC.f90
+++ b/src/homogenization_mech_RGC.f90
@@ -6,7 +6,7 @@
 !> @brief Relaxed grain cluster (RGC) homogenization scheme
 !> Nconstituents is defined as p x q x r (cluster)
 !--------------------------------------------------------------------------------------------------
-module homogenization_RGC
+module homogenization_mech_RGC
  use prec, only: &
    pReal
 
@@ -1309,4 +1309,4 @@ pure function interface1to4(iFace1D, nGDim)
 end function interface1to4
 
 
-end module homogenization_RGC
+end module homogenization_mech_RGC
diff --git a/src/homogenization_isostrain.f90 b/src/homogenization_mech_isostrain.f90
similarity index 98%
rename from src/homogenization_isostrain.f90
rename to src/homogenization_mech_isostrain.f90
index 3ccbbf5ab..071420f6e 100644
--- a/src/homogenization_isostrain.f90
+++ b/src/homogenization_mech_isostrain.f90
@@ -4,7 +4,7 @@
 !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH
 !> @brief Isostrain (full constraint Taylor assuption) homogenization scheme
 !--------------------------------------------------------------------------------------------------
-module homogenization_isostrain
+module homogenization_mech_isostrain
 
   implicit none
   private
@@ -144,4 +144,4 @@ subroutine homogenization_isostrain_averageStressAndItsTangent(avgP,dAvgPdAvgF,P
 
 end subroutine homogenization_isostrain_averageStressAndItsTangent
 
-end module homogenization_isostrain
+end module homogenization_mech_isostrain
diff --git a/src/homogenization_none.f90 b/src/homogenization_mech_none.f90
similarity index 96%
rename from src/homogenization_none.f90
rename to src/homogenization_mech_none.f90
index cbbfa4cac..a528203b1 100644
--- a/src/homogenization_none.f90
+++ b/src/homogenization_mech_none.f90
@@ -4,7 +4,7 @@
 !> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH
 !> @brief dummy homogenization homogenization scheme for 1 constituent per material point
 !--------------------------------------------------------------------------------------------------
-module homogenization_none
+module homogenization_mech_none
 
   implicit none
   private
@@ -57,4 +57,4 @@ subroutine homogenization_none_init()
 
 end subroutine homogenization_none_init
 
-end module homogenization_none
+end module homogenization_mech_none