diff --git a/src/YAML_parse.f90 b/src/YAML_parse.f90
index 971fc208c..d7cfa016f 100644
--- a/src/YAML_parse.f90
+++ b/src/YAML_parse.f90
@@ -79,7 +79,7 @@ recursive function parse_flow(YAML_flow) result(node)
         class is (tDict)
           call node%set(key,myVal)
       end select
-    end do
+    enddo
   elseif (flow_string(1:1) == '[') then                                                             ! start of a list
     e = 1
     allocate(tList::node)
@@ -92,7 +92,7 @@ recursive function parse_flow(YAML_flow) result(node)
         class is (tList)
           call node%append(myVal)
       end select
-    end do
+    enddo
   else                                                                                              ! scalar value
     allocate(tScalar::node)
       select type (node)
@@ -533,7 +533,7 @@ recursive subroutine lst(blck,flow,s_blck,s_flow,offset)
       s_flow = s_flow + 2
     endif
 
-  end do
+  enddo
 
   s_flow = s_flow - 1
   if (flow(s_flow-1:s_flow-1) == ',') s_flow = s_flow - 1
@@ -620,7 +620,7 @@ recursive subroutine dct(blck,flow,s_blck,s_flow,offset)
     flow(s_flow:s_flow) = ' '
     s_flow = s_flow + 1
     offset = 0
-  end do
+  enddo
 
   s_flow = s_flow - 1
   if (flow(s_flow-1:s_flow-1) == ',') s_flow = s_flow - 1
diff --git a/src/YAML_types.f90 b/src/YAML_types.f90
index 2a6bd64f9..45907fbae 100644
--- a/src/YAML_types.f90
+++ b/src/YAML_types.f90
@@ -1082,7 +1082,7 @@ recursive function tList_asFormattedString(self,indent) result(str)
     if (i /= 1) str = str//repeat(' ',indent_)
     str = str//'- '//item%node%asFormattedString(indent_+2)
     item => item%next
-  end do
+  enddo
 
 end function tList_asFormattedString
 
@@ -1116,7 +1116,7 @@ recursive function tDict_asFormattedString(self,indent) result(str)
         str = str//trim(item%key)//':'//IO_EOL//repeat(' ',indent_+2)//item%node%asFormattedString(indent_+2)
     endselect
     item => item%next
-  end do
+  enddo
 
 end function tDict_asFormattedString
 
@@ -1316,7 +1316,7 @@ subroutine tList_append(self,node)
     item => self%first
     do while (associated(item%next))
       item => item%next
-    end do
+    enddo
     allocate(item%next)
     item => item%next
   end if
@@ -1347,7 +1347,7 @@ subroutine tDict_set(self,key,node)
     searchExisting: do while (associated(item%next))
       if (item%key == key) exit
       item => item%next
-    end do searchExisting
+    enddo searchExisting
     if (item%key /= key) then
       allocate(item%next)
       item => item%next
diff --git a/src/grid/discretization_grid.f90 b/src/grid/discretization_grid.f90
index 8d1d38503..049b3b60d 100644
--- a/src/grid/discretization_grid.f90
+++ b/src/grid/discretization_grid.f90
@@ -239,7 +239,7 @@ subroutine readVTI(grid,geomSize,origin,material)
     if (gotCellData) exit
     startPos = endPos + 2_pI64
 
-  end do
+  enddo
 
   if(.not. allocated(material))       call IO_error(error_ID = 844, ext_msg='material data not found')
   if(size(material) /= product(grid)) call IO_error(error_ID = 844, ext_msg='size(material)')
diff --git a/src/grid/spectral_utilities.f90 b/src/grid/spectral_utilities.f90
index aa7c2f4a7..061cc9d74 100644
--- a/src/grid/spectral_utilities.f90
+++ b/src/grid/spectral_utilities.f90
@@ -840,7 +840,7 @@ subroutine utilities_constitutiveResponse(P,P_av,C_volAvg,C_minmaxAvg,&
       dPdF_min = homogenization_dPdF(1:3,1:3,1:3,1:3,i)
       dPdF_norm_min = sum(homogenization_dPdF(1:3,1:3,1:3,1:3,i)**2.0_pReal)
     endif
-  end do
+  enddo
 
   valueAndRank = [dPdF_norm_max,real(worldrank,pReal)]
   call MPI_Allreduce(MPI_IN_PLACE,valueAndRank,1, MPI_2DOUBLE_PRECISION, MPI_MAXLOC, MPI_COMM_WORLD, ierr)
diff --git a/src/mesh/discretization_mesh.f90 b/src/mesh/discretization_mesh.f90
index 88a19ade9..49eaf0e18 100644
--- a/src/mesh/discretization_mesh.f90
+++ b/src/mesh/discretization_mesh.f90
@@ -161,7 +161,7 @@ subroutine discretization_mesh_init(restart)
   do j = 1, mesh_NcpElems
     call DMGetLabelValue(geomMesh,'Cell Sets',j-1,materialAt(j),ierr)
     CHKERRQ(ierr)
-  end do
+  enddo
   materialAt = materialAt + 1
 
   if (debug_element < 1 .or. debug_element > mesh_NcpElems) call IO_error(602,ext_msg='element')
diff --git a/src/mesh/mesh_mech_FEM.f90 b/src/mesh/mesh_mech_FEM.f90
index 6fa2f668b..761b398fc 100644
--- a/src/mesh/mesh_mech_FEM.f90
+++ b/src/mesh/mesh_mech_FEM.f90
@@ -696,7 +696,7 @@ subroutine FEM_mechanical_updateCoords()
   do p=pStart, pEnd-1
     call DMPlexGetPointLocal(dm_local, p, s, e, ierr); CHKERRQ(ierr)
     nodeCoords(1:dimPlex,p)=nodeCoords_linear(s+1:e)
-  end do
+  enddo
 
   call discretization_setNodeCoords(nodeCoords)
   call VecRestoreArrayF90(x_local,nodeCoords_linear,ierr); CHKERRQ(ierr)
diff --git a/src/rotations.f90 b/src/rotations.f90
index 8d7b842fc..c64169cab 100644
--- a/src/rotations.f90
+++ b/src/rotations.f90
@@ -1131,7 +1131,7 @@ pure function ho2ax(ho) result(ax)
     do i=3,16
       hm = hm*hmag_squared
       s  = s + tfit(i) * hm
-    end do
+    enddo
     ax = [ho/sqrt(hmag_squared), 2.0_pReal*acos(s)]
   end if