diff --git a/src/commercialFEM_fileList.f90 b/src/commercialFEM_fileList.f90
index 371c85fd3..a27abec79 100644
--- a/src/commercialFEM_fileList.f90
+++ b/src/commercialFEM_fileList.f90
@@ -33,8 +33,8 @@
 #include "constitutive_plastic_disloTungsten.f90"
 #include "constitutive_plastic_nonlocal.f90"
 #include "constitutive_thermal.f90"
-#include "source_thermal_dissipation.f90"
-#include "source_thermal_externalheat.f90"
+#include "constitutive_thermal_dissipation.f90"
+#include "constitutive_thermal_externalheat.f90"
 #include "kinematics_thermal_expansion.f90"
 #include "constitutive_damage.f90"
 #include "source_damage_isoBrittle.f90"
diff --git a/src/source_thermal_dissipation.f90 b/src/constitutive_thermal_dissipation.f90
similarity index 97%
rename from src/source_thermal_dissipation.f90
rename to src/constitutive_thermal_dissipation.f90
index f28567aa7..27653a9ef 100644
--- a/src/source_thermal_dissipation.f90
+++ b/src/constitutive_thermal_dissipation.f90
@@ -4,7 +4,7 @@
 !> @brief material subroutine for thermal source due to plastic dissipation
 !> @details to be done
 !--------------------------------------------------------------------------------------------------
-submodule(constitutive:constitutive_thermal) source_thermal_dissipation
+submodule(constitutive:constitutive_thermal) source_dissipation
 
   integer,           dimension(:),   allocatable :: &
     source_thermal_dissipation_offset, &                                                            !< which source is my current thermal dissipation mechanism?
@@ -96,4 +96,4 @@ module subroutine source_thermal_dissipation_getRateAndItsTangent(TDot, dTDot_dT
 
 end subroutine source_thermal_dissipation_getRateAndItsTangent
 
-end submodule source_thermal_dissipation
+end submodule source_dissipation
diff --git a/src/source_thermal_externalheat.f90 b/src/constitutive_thermal_externalheat.f90
similarity index 98%
rename from src/source_thermal_externalheat.f90
rename to src/constitutive_thermal_externalheat.f90
index 9ba4a051b..3ef96790e 100644
--- a/src/source_thermal_externalheat.f90
+++ b/src/constitutive_thermal_externalheat.f90
@@ -4,7 +4,7 @@
 !> @author Philip Eisenlohr, Michigan State University
 !> @brief material subroutine for variable heat source
 !--------------------------------------------------------------------------------------------------
-submodule(constitutive:constitutive_thermal) source_thermal_externalheat
+submodule(constitutive:constitutive_thermal) source_externalheat
 
 
   integer,           dimension(:),   allocatable :: &
@@ -135,4 +135,4 @@ module subroutine source_thermal_externalheat_getRateAndItsTangent(TDot, dTDot_d
 
 end subroutine source_thermal_externalheat_getRateAndItsTangent
 
-end submodule source_thermal_externalheat
+end submodule source_externalheat