diff --git a/Overlap/Tests/save_snapshot.f90 b/Overlap/Tests/save_snapshot.f90
index 3141dfffab58afbbaf47a8842368c91dc92d339f..6144cb2dbe60552bdcdb29278a81184ebcc829c2 100644
--- a/Overlap/Tests/save_snapshot.f90
+++ b/Overlap/Tests/save_snapshot.f90
@@ -1,10 +1,10 @@
-module write_snapshot_m
+module save_snapshot_m
 
   implicit none
 
 contains
 
-  subroutine write_snapshot(s, corner, step, nlon, nlat, copy, d)
+  subroutine save_snapshot(s, corner, step, nlon, nlat, copy, d)
 
     ! Libraries:
     use jumble, only: arth
@@ -55,6 +55,6 @@ contains
          * step(1), step(1), nlon + 2 * copy), latitude = arth(corner(2), &
          step(2), nlat))
 
-  end subroutine write_snapshot
+  end subroutine save_snapshot
 
-end module write_snapshot_m
+end module save_snapshot_m
diff --git a/Overlap/Tests/test_get_dispatch_snap.f90 b/Overlap/Tests/test_get_dispatch_snap.f90
index b1aa7f87ee91ee94a3d3e46308490d7901cd211c..0c5d8d2c5c7088bf91ba506cf0d5fa072ea9daf8 100644
--- a/Overlap/Tests/test_get_dispatch_snap.f90
+++ b/Overlap/Tests/test_get_dispatch_snap.f90
@@ -16,7 +16,7 @@ program test_get_dispatch_snap
   use send_snapshot_m, only: send_snapshot
   use shpc_close_m, only: shpc_close
   use shpc_open_m, only: shpc_open
-  use write_snapshot_m, only: write_snapshot
+  use save_snapshot_m, only: save_snapshot
 
   implicit none
 
@@ -105,7 +105,7 @@ program test_get_dispatch_snap
   call dispatch_snapshot(s, unit_isolated, rank, k_begin, max_delta = 1, k = k)
 
   if (rank == 0) then
-     call write_snapshot(s, corner, step, nlon, nlat, copy, d = k)
+     call save_snapshot(s, corner, step, nlon, nlat, copy, d = k)
      close(unit_isolated)
   end if
 
diff --git a/Overlap/Tests/test_read_snapshot.f90 b/Overlap/Tests/test_read_snapshot.f90
index 6fbd08d0e3268a3285734fa34110d7cf13b293f0..ab0206057e430c2066bec122ce452bfc06d42641 100644
--- a/Overlap/Tests/test_read_snapshot.f90
+++ b/Overlap/Tests/test_read_snapshot.f90
@@ -11,7 +11,7 @@ program test_read_snapshot
   use read_snapshot_m, only: read_snapshot
   use shpc_close_m, only: shpc_close
   use shpc_open_m, only: shpc_open
-  use write_snapshot_m, only: write_snapshot
+  use save_snapshot_m, only: save_snapshot
 
   implicit none
 
@@ -85,6 +85,6 @@ program test_read_snapshot
      CALL shpc_close(hshp(i))
   end do
 
-  call write_snapshot(s, corner_deg, step_deg, nlon, nlat, copy, k)
+  call save_snapshot(s, corner_deg, step_deg, nlon, nlat, copy, k)
 
 end program test_read_snapshot
diff --git a/Overlap/Tests/test_send_recv.f90 b/Overlap/Tests/test_send_recv.f90
index 860beeb600d472992bb713f6bc7da5ede669a58b..7897b5d25990826130fbd78fc4bdfd98fec749a8 100644
--- a/Overlap/Tests/test_send_recv.f90
+++ b/Overlap/Tests/test_send_recv.f90
@@ -14,11 +14,11 @@ program test_send_recv
   use derived_types, only: snapshot, shpc_slice_handler, shpc_slice_meta
   use read_snapshot_m, only: read_snapshot
   use recv_snapshot_m, only: recv_snapshot
+  use save_snapshot_m, only: save_snapshot
   use send_snapshot_m, only: send_snapshot
   use shpc_close_m, only: shpc_close
   use shpc_open_m, only: shpc_open
   use write_eddy_m, only: write_eddy
-  use write_snapshot_m, only: write_snapshot
 
   implicit none
 
@@ -111,7 +111,7 @@ program test_send_recv
      call assert(flag, "test_send_recv MPI_Comm_get_attr MPI_TAG_UB")
      print *, "MPI_TAG_UB = ", attribute_val
      call recv_snapshot(s, nlon, nlat, copy, source = 1, tag = ssm%d0)
-     call write_snapshot(s, corner_deg, step_deg, nlon, nlat, copy, ssm%d0)
+     call save_snapshot(s, corner_deg, step_deg, nlon, nlat, copy, ssm%d0)
   end if
 
   call mpi_finalize