diff --git a/src/homogenization.f90 b/src/homogenization.f90
index cc29ed619..3d96b007f 100644
--- a/src/homogenization.f90
+++ b/src/homogenization.f90
@@ -414,7 +414,7 @@ subroutine homogenization_restartWrite(fileHandle)
 
     groupHandle(2) = HDF5_addGroup(groupHandle(1),material_name_homogenization(ho))
 
-    call HDF5_write(homogState(ho)%state,groupHandle(2),'omega') ! ToDo: should be done by mech
+    call HDF5_write(homogState(ho)%state,groupHandle(2),'omega_mechanical') ! ToDo: should be done by mech
 
     call HDF5_closeGroup(groupHandle(2))
 
@@ -441,7 +441,7 @@ subroutine homogenization_restartRead(fileHandle)
 
     groupHandle(2) = HDF5_openGroup(groupHandle(1),material_name_homogenization(ho))
 
-    call HDF5_read(homogState(ho)%state0,groupHandle(2),'omega') ! ToDo: should be done by mech
+    call HDF5_read(homogState(ho)%state0,groupHandle(2),'omega_mechanical') ! ToDo: should be done by mech
 
     call HDF5_closeGroup(groupHandle(2))
 
diff --git a/src/phase_mechanical.f90 b/src/phase_mechanical.f90
index 1917d81c9..2252b941d 100644
--- a/src/phase_mechanical.f90
+++ b/src/phase_mechanical.f90
@@ -1248,7 +1248,7 @@ module subroutine mechanical_restartWrite(groupHandle,ph)
   integer, intent(in) :: ph
 
 
-  call HDF5_write(plasticState(ph)%state,groupHandle,'omega')
+  call HDF5_write(plasticState(ph)%state,groupHandle,'omega_plastic')
   call HDF5_write(phase_mechanical_Fi(ph)%data,groupHandle,'F_i')
   call HDF5_write(phase_mechanical_Li(ph)%data,groupHandle,'L_i')
   call HDF5_write(phase_mechanical_Lp(ph)%data,groupHandle,'L_p')
@@ -1265,7 +1265,7 @@ module subroutine mechanical_restartRead(groupHandle,ph)
   integer, intent(in) :: ph
 
 
-  call HDF5_read(plasticState(ph)%state0,groupHandle,'omega')
+  call HDF5_read(plasticState(ph)%state0,groupHandle,'omega_plastic')
   call HDF5_read(phase_mechanical_Fi0(ph)%data,groupHandle,'F_i')
   call HDF5_read(phase_mechanical_Li0(ph)%data,groupHandle,'L_i')
   call HDF5_read(phase_mechanical_Lp0(ph)%data,groupHandle,'L_p')
diff --git a/src/phase_thermal.f90 b/src/phase_thermal.f90
index fb98039fd..c7a9ea75a 100644
--- a/src/phase_thermal.f90
+++ b/src/phase_thermal.f90
@@ -263,8 +263,7 @@ module subroutine thermal_restartWrite(groupHandle,ph)
   integer :: so
 
   do so = 1,thermal_Nsources(ph)
-    !new_group = HDF5_addGroup(groupHandle,
-    call HDF5_write(thermalState(ph)%p(so)%state,groupHandle,'omega2')
+    call HDF5_write(thermalState(ph)%p(so)%state,groupHandle,'omega_thermal')
   enddo
 
 end subroutine thermal_restartWrite
@@ -279,8 +278,7 @@ module subroutine thermal_restartRead(groupHandle,ph)
   integer :: so
 
   do so = 1,thermal_Nsources(ph)
-    !new_group = HDF5_addGroup(groupHandle,
-    call HDF5_read(thermalState(ph)%p(so)%state0,groupHandle,'omega2')
+    call HDF5_read(thermalState(ph)%p(so)%state0,groupHandle,'omega_thermal')
   enddo
 
 end subroutine thermal_restartRead