diff --git a/Common/read_field_indices.f90 b/Common/read_field_indices.F90
similarity index 100%
rename from Common/read_field_indices.f90
rename to Common/read_field_indices.F90
diff --git a/Common/shpc_open.f90 b/Common/shpc_open.F90
similarity index 100%
rename from Common/shpc_open.f90
rename to Common/shpc_open.F90
diff --git a/Inst_eddies/Tests/CMakeLists.txt b/Inst_eddies/Tests/CMakeLists.txt
index 53c21a3cbc7c6fc8d5920ace08e7d0c1d08fe92c..c46b2a4b9fdfdcf5f7d64a10908915b91812d002 100644
--- a/Inst_eddies/Tests/CMakeLists.txt
+++ b/Inst_eddies/Tests/CMakeLists.txt
@@ -82,8 +82,8 @@ add_executable(test_nearby_extr nearby_extr.f90
   ${CMAKE_CURRENT_LIST_DIR}/test_nearby_extr.f90
   ${PROJECT_SOURCE_DIR}/Common/read_snapshot.f90
   ${PROJECT_SOURCE_DIR}/Common/read_eddy.f90
-  ${PROJECT_SOURCE_DIR}/Common/read_field_indices.f90
-  ${PROJECT_SOURCE_DIR}/Common/shpc_open.f90
+  ${PROJECT_SOURCE_DIR}/Common/read_field_indices.F90
+  ${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
 
 target_link_libraries(test_nearby_extr shapelib_03 contour_531 jumble
@@ -108,9 +108,9 @@ add_executable(test_set_max_speed
   good_contour.f90 max_speed_contour_ssh.f90 mean_speed.f90
   ${PROJECT_SOURCE_DIR}/Common/spher_polyline_area.f90 inside_4.f90
   ${CMAKE_CURRENT_LIST_DIR}/test_set_max_speed.f90
-  ${PROJECT_SOURCE_DIR}/Common/shpc_open.f90
+  ${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90
-  ${PROJECT_SOURCE_DIR}/Common/read_field_indices.f90
+  ${PROJECT_SOURCE_DIR}/Common/read_field_indices.F90
   ${PROJECT_SOURCE_DIR}/Common/read_eddy.f90
   ${PROJECT_SOURCE_DIR}/Common/shpc_create.f90
   ${PROJECT_SOURCE_DIR}/Common/write_eddy.f90)
diff --git a/Overlap/CMakeLists.txt b/Overlap/CMakeLists.txt
index 6cc7e6e8ec2469819c154b71ae2701040e1dda94..8d21f849d94287986e9fc2212b353e771a606dc9 100644
--- a/Overlap/CMakeLists.txt
+++ b/Overlap/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_executable(eddy_graph eddy_graph.f90
-  ${PROJECT_SOURCE_DIR}/Common/shpc_open.f90 get_snapshot.f90
+  ${PROJECT_SOURCE_DIR}/Common/shpc_open.F90 get_snapshot.f90
   overlap.f90 dispatch_snapshot.f90
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90
-  ${PROJECT_SOURCE_DIR}/Common/read_field_indices.f90
+  ${PROJECT_SOURCE_DIR}/Common/read_field_indices.F90
   ${PROJECT_SOURCE_DIR}/Common/read_snapshot.f90 recv_snapshot.f90
   candidate_overlap.f90 spher_polygon_area.f90
   ${PROJECT_SOURCE_DIR}/Common/spher_polyline_area.f90 weight.f90
diff --git a/Overlap/Tests/CMakeLists.txt b/Overlap/Tests/CMakeLists.txt
index a814d1094d9c3cdb76fb0610bca0d1bacf705a21..fce83707e09b5e93167507f9ea839315bf7ea812 100644
--- a/Overlap/Tests/CMakeLists.txt
+++ b/Overlap/Tests/CMakeLists.txt
@@ -5,10 +5,10 @@ add_executable(test_overlap
   ${PROJECT_SOURCE_DIR}/Common/read_snapshot.f90 spher_polygon_area.f90
   ${PROJECT_SOURCE_DIR}/Common/spher_polyline_area.f90 weight.f90
   ${PROJECT_SOURCE_DIR}/Common/read_eddy.f90
-  ${PROJECT_SOURCE_DIR}/Common/read_field_indices.f90
+  ${PROJECT_SOURCE_DIR}/Common/read_field_indices.F90
   candidate_overlap.f90 ${PROJECT_SOURCE_DIR}/Common/write_eddy.f90
   ${CMAKE_CURRENT_LIST_DIR}/test_overlap.f90
-  ${PROJECT_SOURCE_DIR}/Common/shpc_open.f90
+  ${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90 unit_edge_m.f90)
 
 target_link_libraries(test_overlap shapelib_03 geometry contour_531
@@ -24,11 +24,11 @@ add_executable(test_read_snapshot
   ${PROJECT_SOURCE_DIR}/Common/read_snapshot.f90
   ${PROJECT_SOURCE_DIR}/Common/write_eddy.f90
   ${PROJECT_SOURCE_DIR}/Common/read_eddy.f90
-  ${PROJECT_SOURCE_DIR}/Common/read_field_indices.f90
+  ${PROJECT_SOURCE_DIR}/Common/read_field_indices.F90
   ${CMAKE_CURRENT_LIST_DIR}/test_read_snapshot.f90
   ${PROJECT_SOURCE_DIR}/Tests/write_extr_map.f90
   ${CMAKE_CURRENT_LIST_DIR}/write_snapshot.f90
-  ${PROJECT_SOURCE_DIR}/Common/shpc_open.f90
+  ${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
 
 target_link_libraries(test_read_snapshot NetCDF95::netcdf95
@@ -66,9 +66,9 @@ add_executable(test_read_eddy
   ${PROJECT_SOURCE_DIR}/Common/shpc_create.f90
   ${PROJECT_SOURCE_DIR}/Common/read_eddy.f90
   ${PROJECT_SOURCE_DIR}/Common/write_eddy.f90
-  ${PROJECT_SOURCE_DIR}/Common/read_field_indices.f90
+  ${PROJECT_SOURCE_DIR}/Common/read_field_indices.F90
   ${CMAKE_CURRENT_LIST_DIR}/test_read_eddy.f90
-  ${PROJECT_SOURCE_DIR}/Common/shpc_open.f90
+  ${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
 
 target_link_libraries(test_read_eddy shapelib_03 contour_531 gpc_f
@@ -80,7 +80,7 @@ target_include_directories(test_read_eddy PRIVATE ${fortrangis_INCLUDE_DIR})
 
 add_executable(test_send_recv
   ${CMAKE_CURRENT_LIST_DIR}/test_send_recv.f90 send_snapshot.f90
-  recv_snapshot.f90 ${PROJECT_SOURCE_DIR}/Common/read_field_indices.f90
+  recv_snapshot.f90 ${PROJECT_SOURCE_DIR}/Common/read_field_indices.F90
   ${PROJECT_SOURCE_DIR}/Common/read_snapshot.f90
   ${PROJECT_SOURCE_DIR}/Common/write_eddy.f90
   ${PROJECT_SOURCE_DIR}/Common/shpc_create.f90
@@ -88,7 +88,7 @@ add_executable(test_send_recv
   ${CMAKE_CURRENT_LIST_DIR}/write_snapshot.f90
   ${PROJECT_SOURCE_DIR}/Tests/write_extr_map.f90
   ${PROJECT_SOURCE_DIR}/Common/derived_types.f90
-  ${PROJECT_SOURCE_DIR}/Common/shpc_open.f90
+  ${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
 
 target_link_libraries(test_send_recv PRIVATE MPI::MPI_Fortran
@@ -103,7 +103,7 @@ target_include_directories(test_send_recv PRIVATE
 add_executable(test_get_dispatch_snap
   ${CMAKE_CURRENT_LIST_DIR}/test_get_dispatch_snap.f90
   get_snapshot.f90 dispatch_snapshot.f90
-  ${PROJECT_SOURCE_DIR}/Common/read_field_indices.f90
+  ${PROJECT_SOURCE_DIR}/Common/read_field_indices.F90
   ${CMAKE_CURRENT_LIST_DIR}/write_snapshot.f90
   ${PROJECT_SOURCE_DIR}/Common/read_snapshot.f90 recv_snapshot.f90
   ${PROJECT_SOURCE_DIR}/Common/shpc_create.f90
@@ -111,7 +111,7 @@ add_executable(test_get_dispatch_snap
   ${PROJECT_SOURCE_DIR}/Tests/write_extr_map.f90
   ${PROJECT_SOURCE_DIR}/Common/read_eddy.f90 send_snapshot.f90
   ${PROJECT_SOURCE_DIR}/Common/derived_types.f90
-  ${PROJECT_SOURCE_DIR}/Common/shpc_open.f90
+  ${PROJECT_SOURCE_DIR}/Common/shpc_open.F90
   ${PROJECT_SOURCE_DIR}/Common/shpc_close.f90)
 
 target_link_libraries(test_get_dispatch_snap shapelib_03 jumble