diff --git a/src/commercialFEM_fileList.f90 b/src/commercialFEM_fileList.f90
index f4eb5d78c..d161b36eb 100644
--- a/src/commercialFEM_fileList.f90
+++ b/src/commercialFEM_fileList.f90
@@ -25,7 +25,7 @@
 #include "material.f90"
 #include "lattice.f90"
 #include "constitutive.f90"
-#include "constitutive_plastic.f90"
+#include "constitutive_mech.f90"
 #include "constitutive_plastic_none.f90"
 #include "constitutive_plastic_isotropic.f90"
 #include "constitutive_plastic_phenopowerlaw.f90"
diff --git a/src/constitutive_plastic.f90 b/src/constitutive_mech.f90
similarity index 99%
rename from src/constitutive_plastic.f90
rename to src/constitutive_mech.f90
index eacd84f09..71169b0ee 100644
--- a/src/constitutive_plastic.f90
+++ b/src/constitutive_mech.f90
@@ -1,7 +1,7 @@
 !----------------------------------------------------------------------------------------------------
 !> @brief internal microstructure state for all plasticity constitutive models
 !----------------------------------------------------------------------------------------------------
-submodule(constitutive) constitutive_plastic
+submodule(constitutive) constitutive_mech
 
   interface
 
@@ -205,7 +205,7 @@ module subroutine mech_init
     elastic, &
     stiffDegradation
 
-  print'(/,a)', ' <<<+-  constitutive_plastic init  -+>>>'
+  print'(/,a)', ' <<<+-  constitutive_mech init  -+>>>'
 
 !-------------------------------------------------------------------------------------------------
 ! initialize elasticity (hooke)                         !ToDO: Maybe move to elastic submodule along with function homogenizedC?
@@ -243,6 +243,7 @@ module subroutine mech_init
   endif
 
 
+! initialize plasticity
   allocate(plasticState(phases%length))
   allocate(phase_plasticity(phases%length),source = PLASTICITY_undefined_ID)
   allocate(phase_plasticityInstance(phases%length),source = 0)
@@ -261,7 +262,6 @@ module subroutine mech_init
     phase_plasticityInstance(p) = count(phase_plasticity(1:p) == phase_plasticity(p))
   enddo
 
-
 end subroutine mech_init
 
 
@@ -314,7 +314,6 @@ module subroutine constitutive_SandItsTangents(S, dS_dFe, dS_dFi, Fe, Fi, ipc, i
 
   call constitutive_hooke_SandItsTangents(S, dS_dFe, dS_dFi, Fe, Fi, ipc, ip, el)
 
-
 end subroutine constitutive_SandItsTangents
 
 
@@ -513,6 +512,5 @@ module subroutine plastic_results
 
 end subroutine plastic_results
 
-
-end submodule constitutive_plastic
+end submodule constitutive_mech
 
diff --git a/src/constitutive_plastic_disloTungsten.f90 b/src/constitutive_plastic_disloTungsten.f90
index 2a867bc48..adaa36ee7 100644
--- a/src/constitutive_plastic_disloTungsten.f90
+++ b/src/constitutive_plastic_disloTungsten.f90
@@ -5,7 +5,7 @@
 !> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH
 !> @brief crystal plasticity model for bcc metals, especially Tungsten
 !--------------------------------------------------------------------------------------------------
-submodule(constitutive:constitutive_plastic) plastic_disloTungsten
+submodule(constitutive:constitutive_mech) plastic_disloTungsten
 
   real(pReal), parameter :: &
     kB = 1.38e-23_pReal                                                                             !< Boltzmann constant in J/Kelvin
diff --git a/src/constitutive_plastic_dislotwin.f90 b/src/constitutive_plastic_dislotwin.f90
index a94290b4d..2bc2b1176 100644
--- a/src/constitutive_plastic_dislotwin.f90
+++ b/src/constitutive_plastic_dislotwin.f90
@@ -7,7 +7,7 @@
 !> @brief material subroutine incoprorating dislocation and twinning physics
 !> @details to be done
 !--------------------------------------------------------------------------------------------------
-submodule(constitutive:constitutive_plastic) plastic_dislotwin
+submodule(constitutive:constitutive_mech) plastic_dislotwin
 
   real(pReal), parameter :: &
     kB = 1.38e-23_pReal                                                                             !< Boltzmann constant in J/Kelvin
diff --git a/src/constitutive_plastic_isotropic.f90 b/src/constitutive_plastic_isotropic.f90
index b6b395fb2..4bbd5187e 100644
--- a/src/constitutive_plastic_isotropic.f90
+++ b/src/constitutive_plastic_isotropic.f90
@@ -7,7 +7,7 @@
 !! resolving the stress on the slip systems. Will give the response of phenopowerlaw for an
 !! untextured polycrystal
 !--------------------------------------------------------------------------------------------------
-submodule(constitutive:constitutive_plastic) plastic_isotropic
+submodule(constitutive:constitutive_mech) plastic_isotropic
 
   type :: tParameters
     real(pReal) :: &
diff --git a/src/constitutive_plastic_kinehardening.f90 b/src/constitutive_plastic_kinehardening.f90
index 60338d30e..7dbd51597 100644
--- a/src/constitutive_plastic_kinehardening.f90
+++ b/src/constitutive_plastic_kinehardening.f90
@@ -5,7 +5,7 @@
 !> @brief  Phenomenological crystal plasticity using a power law formulation for the shear rates
 !! and a Voce-type kinematic hardening rule
 !--------------------------------------------------------------------------------------------------
-submodule(constitutive:constitutive_plastic) plastic_kinehardening
+submodule(constitutive:constitutive_mech) plastic_kinehardening
 
   type :: tParameters
     real(pReal) :: &
diff --git a/src/constitutive_plastic_none.f90 b/src/constitutive_plastic_none.f90
index c05446493..6164ab29f 100644
--- a/src/constitutive_plastic_none.f90
+++ b/src/constitutive_plastic_none.f90
@@ -4,7 +4,7 @@
 !> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH
 !> @brief Dummy plasticity for purely elastic material
 !--------------------------------------------------------------------------------------------------
-submodule(constitutive:constitutive_plastic) plastic_none
+submodule(constitutive:constitutive_mech) plastic_none
 
 contains
 
diff --git a/src/constitutive_plastic_nonlocal.f90 b/src/constitutive_plastic_nonlocal.f90
index 459eb60d8..8aab40fc8 100644
--- a/src/constitutive_plastic_nonlocal.f90
+++ b/src/constitutive_plastic_nonlocal.f90
@@ -4,7 +4,7 @@
 !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH
 !> @brief material subroutine for plasticity including dislocation flux
 !--------------------------------------------------------------------------------------------------
-submodule(constitutive:constitutive_plastic) plastic_nonlocal
+submodule(constitutive:constitutive_mech) plastic_nonlocal
   use geometry_plastic_nonlocal, only: &
     nIPneighbors    => geometry_plastic_nonlocal_nIPneighbors, &
     IPneighborhood  => geometry_plastic_nonlocal_IPneighborhood, &
diff --git a/src/constitutive_plastic_phenopowerlaw.f90 b/src/constitutive_plastic_phenopowerlaw.f90
index b1dea0ec2..747dd6615 100644
--- a/src/constitutive_plastic_phenopowerlaw.f90
+++ b/src/constitutive_plastic_phenopowerlaw.f90
@@ -4,7 +4,7 @@
 !> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH
 !> @brief  phenomenological crystal plasticity formulation using a powerlaw fitting
 !--------------------------------------------------------------------------------------------------
-submodule(constitutive:constitutive_plastic) plastic_phenopowerlaw
+submodule(constitutive:constitutive_mech) plastic_phenopowerlaw
 
   type :: tParameters
     real(pReal) :: &