diff --git a/Inst_eddies/Tests/examine_eddy.f90 b/Inst_eddies/Tests/examine_eddy.f90
index 65feda273c9abe427df674d761fdf26187ee5ed0..f615e4dcdd6d0fdf6c05d9924bbd22b3ada79285 100644
--- a/Inst_eddies/Tests/examine_eddy.f90
+++ b/Inst_eddies/Tests/examine_eddy.f90
@@ -207,7 +207,7 @@ program examine_eddy
        outside_points)
   call close_cont_list
   call shpc_create(hshpc, shpc_dir = "SHPC", cyclone = cyclone, slice = 0, &
-       grid_lon_lat = .true.)
+       with_proj = .false.)
   call write_eddy(e, hshpc, date, 1)
   write(hshpc%unit, fmt = *) 0
   CALL shpc_close(hshpc)
diff --git a/Inst_eddies/Tests/test_get_1_outerm.f90 b/Inst_eddies/Tests/test_get_1_outerm.f90
index 9a9f6f12d62a4f6302ec3385f78c3ff7c72533d3..fae7918b62f2fc2d29a1c7dcaa587c5ec45e7eaf 100644
--- a/Inst_eddies/Tests/test_get_1_outerm.f90
+++ b/Inst_eddies/Tests/test_get_1_outerm.f90
@@ -108,7 +108,7 @@ program test_get_1_outerm
      e%speed_cont = null_ssh_contour()
      e%max_speed = missing_speed
      call shpc_create(hshpc, shpc_dir = "SHPC", cyclone = cyclone, slice = 0, &
-          grid_lon_lat = grid_lon_lat)
+          with_proj = .not. grid_lon_lat)
      call write_eddy(e, hshpc, date, i = 1)
      write(hshpc%unit, fmt = *) 0
      CALL shpc_close(hshpc)
diff --git a/Inst_eddies/Tests/test_set_max_speed.f90 b/Inst_eddies/Tests/test_set_max_speed.f90
index 468723f3c04894be0fdfe7d832d09a78c824c928..9ad94f8843f7507f01e123e6bc96a28dca90da32 100644
--- a/Inst_eddies/Tests/test_set_max_speed.f90
+++ b/Inst_eddies/Tests/test_set_max_speed.f90
@@ -137,7 +137,7 @@ program test_set_max_speed
           v(llc(1):urc(1), llc(2):urc(2)), real(llc))
      call close_cont_list
      call shpc_create(hshpc, shpc_dir = "SHPC", cyclone = cyclone, slice = 0, &
-          grid_lon_lat = .true.)
+          with_proj = .false.)
      call write_eddy(e, hshpc, d, eddy_index)
      write(hshpc%unit, fmt = *) 0
      CALL shpc_close(hshpc)
diff --git a/Inst_eddies/inst_eddies.f90 b/Inst_eddies/inst_eddies.f90
index 23927af0735c6a87524ba316551d95eb2fa885d4..dffcf5f2be070db24f29b538921a209f0fdf1c59 100644
--- a/Inst_eddies/inst_eddies.f90
+++ b/Inst_eddies/inst_eddies.f90
@@ -137,9 +137,9 @@ program inst_eddies
   else
      print *, "inst_eddies: Opening failed so we will create a slice..."
      call shpc_create(hshpc_cyclo, shpc_dir, cyclone = .true., slice = slice, &
-          grid_lon_lat = .true.)
+          with_proj = .false.)
      call shpc_create(hshpc_anti, shpc_dir, cyclone = .false., slice = slice, &
-          grid_lon_lat = .true.)
+          with_proj = .false.)
   end if
 
   call cpu_time(t1)
diff --git a/Inst_eddies/shpc_create.f90 b/Inst_eddies/shpc_create.f90
index 480df2e03d4c31e4fc5fd33f49f5f1bcc075a710..c4d858199e4849e06e0f058ddf8482346d2382c4 100644
--- a/Inst_eddies/shpc_create.f90
+++ b/Inst_eddies/shpc_create.f90
@@ -4,7 +4,7 @@ module shpc_create_m
 
 contains
 
-  subroutine shpc_create(hshp, shpc_dir, cyclone, slice, grid_lon_lat)
+  subroutine shpc_create(hshp, shpc_dir, cyclone, slice, with_proj)
 
     use, intrinsic:: ISO_FORTRAN_ENV
 
@@ -20,7 +20,7 @@ contains
     character(len = *), intent(in):: shpc_dir
     logical, intent(in):: cyclone
     integer, intent(in):: slice
-    logical, intent(in):: grid_lon_lat
+    logical, intent(in):: with_proj
 
 
     ! Local:
@@ -50,7 +50,7 @@ contains
          nwidth = 13, ndecimals = 6)
 
     ! extr_proj shapefile:
-    if (.not. grid_lon_lat) then
+    if (with_proj) then
        call shp_create_03(hshp%dir // "/extr_proj", shpt_point, hshp%extr_proj)
        call dbf_add_field_03(hshp%extr_proj_date, hshp%extr_proj, 'date', &
             ftinteger, nwidth = 5, ndecimals = 0)
diff --git a/Overlap/Tests/save_snapshot.f90 b/Overlap/Tests/save_snapshot.f90
index 77a5d360d9b5873a2022a2d1533c093be53c796b..17be84b86cf7d94b64821eb64da424c84f5a8fe8 100644
--- a/Overlap/Tests/save_snapshot.f90
+++ b/Overlap/Tests/save_snapshot.f90
@@ -26,9 +26,9 @@ contains
     !-----------------------------------------------------------------
 
     call shpc_create(hshpc_cyclo, shpc_dir = "SHPC", cyclone = .true., &
-         slice = 0, grid_lon_lat = .true.)
+         slice = 0, with_proj = .false.)
     call shpc_create(hshpc_anti, shpc_dir = "SHPC", cyclone = .false., &
-         slice = 0, grid_lon_lat = .true.)
+         slice = 0, with_proj = .false.)
     call write_snapshot(s%list, hshpc_cyclo, hshpc_anti, d)
     CALL shpc_close(hshpc_cyclo)
     CALL shpc_close(hshpc_anti)
diff --git a/Overlap/Tests/test_read_eddy.f90 b/Overlap/Tests/test_read_eddy.f90
index 64a63dbcb6902e5ce4e747067670f5448292dc7b..6b7e4c08842d402d1668e54acfc451d286053a1c 100644
--- a/Overlap/Tests/test_read_eddy.f90
+++ b/Overlap/Tests/test_read_eddy.f90
@@ -29,7 +29,7 @@ program test_read_eddy
        with_proj = .not. grid_lon_lat, pszaccess = "rb")
   call read_eddy(e, k, eddy_i, hshp_in, ishape)
   call shpc_create(hshp_out, shpc_dir = "SHPC", cyclone = hshp_in%cyclone, &
-       slice = 0, grid_lon_lat = grid_lon_lat)
+       slice = 0, with_proj = .not. grid_lon_lat)
   CALL shpc_close(hshp_in)
   call write_eddy(e, hshp_out, k, eddy_i)
   write(hshp_out%unit, fmt = *) 0
diff --git a/test_write_null.f90 b/test_write_null.f90
index c55c39b461ea90342600a3ad418d7108f13aedd7..f4dfaf9299862179434c3770f0c4ed52b970af07 100644
--- a/test_write_null.f90
+++ b/test_write_null.f90
@@ -25,7 +25,7 @@ program test_write_null
   call shpc_open(hshpc, shpc_dir = "SHPC", cyclone = .true., slice = 0, &
        with_proj = .false., pszaccess = "rb+", iostat = iostat)
   if (iostat /= 0) call shpc_create(hshpc, shpc_dir = "SHPC", &
-       cyclone = .true., slice = 0, grid_lon_lat = .true.)
+       cyclone = .true., slice = 0, with_proj = .false.)
   print *, "Enter namelist main_nml."
   read(unit = *, nml = main_nml)