From 5047b30ff62a4cbd2c931e7168e513aaec65b419 Mon Sep 17 00:00:00 2001
From: Scot Breitenfeld <brtnfld@hdfgroup.org>
Date: Sun, 12 Oct 2025 17:32:23 -0500
Subject: [PATCH] Fortran changes to adhere to the filename/module convention
 (#5914)

Update the documentation table for using H5* API prefixes convention for naming files and modules.

Builds on PR #5912
---
 doxygen/dox/ReferenceManual.dox         | 2 +-
 fortran/src/CMakeLists.txt              | 4 ++--
 fortran/src/{H5VFDff.F90 => H5FDff.F90} | 6 +++---
 fortran/src/HDF5.F90                    | 2 +-
 fortran/src/hdf5_fortrandll.def.in      | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename fortran/src/{H5VFDff.F90 => H5FDff.F90} (99%)

diff --git a/doxygen/dox/ReferenceManual.dox b/doxygen/dox/ReferenceManual.dox
index 63c790e2c8c..b8ae15eeb3d 100644
--- a/doxygen/dox/ReferenceManual.dox
+++ b/doxygen/dox/ReferenceManual.dox
@@ -78,7 +78,7 @@ The functions provided by the HDF5 API are grouped into the following
 </td>
 </tr>
 <tr>
-<th>Virtual File Driver (H5VFD)</th><td>@ref H5VFD "C"</td><td style="white-space: nowrap;">C++</td><td>@ref FH5VFD "Fortran"</td><td>Java</td><td>Manage HDF5 Virtual File Driver.
+<th>Virtual File Driver (H5FD)</th><td>@ref H5VFD "C"</td><td style="white-space: nowrap;">C++</td><td>@ref FH5VFD "Fortran"</td><td>Java</td><td>Manage HDF5 Virtual File Driver.
 </td>
 <tr>
 <th>VOL Connector (H5VL)</th><td>@ref H5VL "C"</td><td style="white-space: nowrap;">C++</td><td>@ref FH5VL "Fortran"</td><td>@ref JH5VL "Java"</td><td>Manage HDF5 VOL connector plugins.
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index 7ab7c21db2e..d84143b00f0 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -411,6 +411,7 @@ set (f90_F_BASE_SOURCES
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Eff.F90
     ${HDF5_F90_SRC_SOURCE_DIR}/H5ESff.F90
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Fff.F90
+    ${HDF5_F90_SRC_SOURCE_DIR}/H5FDff.F90
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Gff.F90
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Iff.F90
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Lff.F90
@@ -419,7 +420,6 @@ set (f90_F_BASE_SOURCES
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Rff.F90
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Sff.F90
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Tff.F90
-    ${HDF5_F90_SRC_SOURCE_DIR}/H5VFDff.F90
     ${HDF5_F90_SRC_SOURCE_DIR}/H5VLff.F90
     ${HDF5_F90_SRC_SOURCE_DIR}/H5Zff.F90
 )
@@ -563,6 +563,7 @@ set (mod_export_files
     h5e.mod
     h5es.mod
     h5f.mod
+    h5fd.mod
     h5g.mod
     h5i.mod
     h5l.mod
@@ -572,7 +573,6 @@ set (mod_export_files
     h5r.mod
     h5s.mod
     h5t.mod
-    h5vfd.mod
     h5vl.mod
     h5z.mod
     h5_gen.mod
diff --git a/fortran/src/H5VFDff.F90 b/fortran/src/H5FDff.F90
similarity index 99%
rename from fortran/src/H5VFDff.F90
rename to fortran/src/H5FDff.F90
index 686310161d8..a3c4fcfc7b8 100644
--- a/fortran/src/H5VFDff.F90
+++ b/fortran/src/H5FDff.F90
@@ -1,6 +1,6 @@
 !> @defgroup FH5VFD Fortran VFD (H5VFD) Interface
 !!
-!! @see H5FD, C-API
+!! @see H5VFD, C-API
 !!
 
 !> @ingroup FH5VFD
@@ -38,7 +38,7 @@
 
 #include <H5config_f.inc>
 
-MODULE H5VFD
+MODULE H5FD
 
   USE H5GLOBAL
   USE H5fortkit
@@ -280,4 +280,4 @@ END SUBROUTINE h5fdsubfiling_get_file_mapping_f
 
 #endif
 
-END MODULE H5VFD
+END MODULE H5FD
diff --git a/fortran/src/HDF5.F90 b/fortran/src/HDF5.F90
index 302705f0721..3d99ea93ef1 100644
--- a/fortran/src/HDF5.F90
+++ b/fortran/src/HDF5.F90
@@ -39,7 +39,7 @@ MODULE HDF5
   USE H5P
   USE H5R
   USE H5VL
-  USE H5VFD
+  USE H5FD
   USE H5Z
   USE H5_gen
   USE H5LIB
diff --git a/fortran/src/hdf5_fortrandll.def.in b/fortran/src/hdf5_fortrandll.def.in
index 8a6ff9cbe0e..9cece35d1c7 100644
--- a/fortran/src/hdf5_fortrandll.def.in
+++ b/fortran/src/hdf5_fortrandll.def.in
@@ -600,8 +600,8 @@ H5VL_mp_H5VLCMP_CONNECTOR_CLS_F
 H5VL_mp_H5VLUNREGISTER_CONNECTOR_F
 H5VL_mp_H5VLNATIVE_ADDR_TO_TOKEN_F
 H5VL_mp_H5VLNATIVE_TOKEN_TO_ADDR_F
-; H5VFD
-@H5_NOSUBFILING@H5VFD_mp_H5FDSUBFILING_GET_FILE_MAPPING_F
+; H5FD
+@H5_NOSUBFILING@H5FD_mp_H5FDSUBFILING_GET_FILE_MAPPING_F
 ; H5Z
 H5Z_mp_H5ZUNREGISTER_F
 H5Z_mp_H5ZFILTER_AVAIL_F