diff --git a/src/constitutive.f90 b/src/constitutive.f90
index 7e380f8cd..bed21cb92 100644
--- a/src/constitutive.f90
+++ b/src/constitutive.f90
@@ -1089,7 +1089,7 @@ function crystallite_stressTangent(co,ip,el) result(dPdF)
     el                                                                                               !< counter in element loop
   integer :: &
     o, &
-    p, pp, m
+    p, ph, me
 
   real(pReal), dimension(3,3)     ::   devNull, &
                                        invSubFp0,invSubFi0,invFp,invFi, &
@@ -1109,19 +1109,19 @@ function crystallite_stressTangent(co,ip,el) result(dPdF)
   real(pReal), dimension(9,9)::        temp_99
   logical :: error
 
-  pp = material_phaseAt(co,el)
-  m = material_phaseMemberAt(co,ip,el)
+  ph = material_phaseAt(co,el)
+  me = material_phaseMemberAt(co,ip,el)
 
   call constitutive_hooke_SandItsTangents(devNull,dSdFe,dSdFi, &
                                    crystallite_Fe(1:3,1:3,co,ip,el), &
-                                   constitutive_mech_Fi(pp)%data(1:3,1:3,m),co,ip,el)
+                                   constitutive_mech_Fi(ph)%data(1:3,1:3,me),co,ip,el)
   call constitutive_LiAndItsTangents(devNull,dLidS,dLidFi, &
                                      crystallite_S (1:3,1:3,co,ip,el), &
-                                     constitutive_mech_Fi(pp)%data(1:3,1:3,m), &
+                                     constitutive_mech_Fi(ph)%data(1:3,1:3,me), &
                                      co,ip,el)
 
-  invFp = math_inv33(constitutive_mech_Fp(pp)%data(1:3,1:3,m))
-  invFi = math_inv33(constitutive_mech_Fi(pp)%data(1:3,1:3,m))
+  invFp = math_inv33(constitutive_mech_Fp(ph)%data(1:3,1:3,me))
+  invFi = math_inv33(constitutive_mech_Fi(ph)%data(1:3,1:3,me))
   invSubFp0 = math_inv33(crystallite_subFp0(1:3,1:3,co,ip,el))
   invSubFi0 = math_inv33(crystallite_subFi0(1:3,1:3,co,ip,el))
 
@@ -1150,7 +1150,7 @@ function crystallite_stressTangent(co,ip,el) result(dPdF)
 
   call constitutive_plastic_LpAndItsTangents(devNull,dLpdS,dLpdFi, &
                                      crystallite_S (1:3,1:3,co,ip,el), &
-                                     constitutive_mech_Fi(pp)%data(1:3,1:3,m),co,ip,el)
+                                     constitutive_mech_Fi(ph)%data(1:3,1:3,me),co,ip,el)
   dLpdS = math_mul3333xx3333(dLpdFi,dFidS) + dLpdS
 
 !--------------------------------------------------------------------------------------------------
diff --git a/src/homogenization_mech.f90 b/src/homogenization_mech.f90
index 56f1e554f..e4499e9b7 100644
--- a/src/homogenization_mech.f90
+++ b/src/homogenization_mech.f90
@@ -128,35 +128,35 @@ module subroutine mech_homogenize(ip,el)
   integer, intent(in) :: &
        ip, &                                                                                        !< integration point
        el                                                                                           !< element number
-  integer :: c,m
+  integer :: co,ce
   real(pReal) :: dPdFs(3,3,3,3,homogenization_Nconstituents(material_homogenizationAt(el)))
 
 
-  m = (el-1)* discretization_nIPs + ip
+  ce = (el-1)* discretization_nIPs + ip
   chosenHomogenization: select case(homogenization_type(material_homogenizationAt(el)))
 
     case (HOMOGENIZATION_NONE_ID) chosenHomogenization
-        homogenization_P(1:3,1:3,m)            = crystallite_P(1:3,1:3,1,ip,el)
-        homogenization_dPdF(1:3,1:3,1:3,1:3,m) = crystallite_stressTangent(1,ip,el)
+        homogenization_P(1:3,1:3,ce)            = crystallite_P(1:3,1:3,1,ip,el)
+        homogenization_dPdF(1:3,1:3,1:3,1:3,ce) = crystallite_stressTangent(1,ip,el)
 
     case (HOMOGENIZATION_ISOSTRAIN_ID) chosenHomogenization
-      do c = 1, homogenization_Nconstituents(material_homogenizationAt(el))
-        dPdFs(:,:,:,:,c) = crystallite_stressTangent(c,ip,el)
+      do co = 1, homogenization_Nconstituents(material_homogenizationAt(el))
+        dPdFs(:,:,:,:,co) = crystallite_stressTangent(co,ip,el)
       enddo
       call mech_isostrain_averageStressAndItsTangent(&
-        homogenization_P(1:3,1:3,m), &
-        homogenization_dPdF(1:3,1:3,1:3,1:3,m),&
+        homogenization_P(1:3,1:3,ce), &
+        homogenization_dPdF(1:3,1:3,1:3,1:3,ce),&
         crystallite_P(1:3,1:3,1:homogenization_Nconstituents(material_homogenizationAt(el)),ip,el), &
         dPdFs, &
         homogenization_typeInstance(material_homogenizationAt(el)))
 
     case (HOMOGENIZATION_RGC_ID) chosenHomogenization
-      do c = 1, homogenization_Nconstituents(material_homogenizationAt(el))
-        dPdFs(:,:,:,:,c) = crystallite_stressTangent(c,ip,el)
+      do co = 1, homogenization_Nconstituents(material_homogenizationAt(el))
+        dPdFs(:,:,:,:,co) = crystallite_stressTangent(co,ip,el)
       enddo
       call mech_RGC_averageStressAndItsTangent(&
-        homogenization_P(1:3,1:3,m), &
-        homogenization_dPdF(1:3,1:3,1:3,1:3,m),&
+        homogenization_P(1:3,1:3,ce), &
+        homogenization_dPdF(1:3,1:3,1:3,1:3,ce),&
         crystallite_P(1:3,1:3,1:homogenization_Nconstituents(material_homogenizationAt(el)),ip,el), &
         dPdFs, &
         homogenization_typeInstance(material_homogenizationAt(el)))