diff --git a/HDF5Examples/C/H5D/16/h5ex_d_shuffle.c b/HDF5Examples/C/H5D/16/h5ex_d_shuffle.c
index e5051261685..ca4872ec578 100644
--- a/HDF5Examples/C/H5D/16/h5ex_d_shuffle.c
+++ b/HDF5Examples/C/H5D/16/h5ex_d_shuffle.c
@@ -17,12 +17,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#define FILE    "h5ex_d_shuffle.h5"
-#define DATASET "DS1"
-#define DIM0    32
-#define DIM1    64
-#define CHUNK0  4
-#define CHUNK1  8
+#define FILENAME "h5ex_d_shuffle.h5"
+#define DATASET  "DS1"
+#define DIM0     32
+#define DIM1     64
+#define CHUNK0   4
+#define CHUNK1   8
 
 int
 main(void)
diff --git a/HDF5Examples/C/H5T/200/h5ex_t_complex.c b/HDF5Examples/C/H5T/200/h5ex_t_complex.c
index 4e59f0a6efc..543c5086f42 100644
--- a/HDF5Examples/C/H5T/200/h5ex_t_complex.c
+++ b/HDF5Examples/C/H5T/200/h5ex_t_complex.c
@@ -16,10 +16,10 @@
 #include <stdlib.h>
 #include <complex.h>
 
-#define FILE    "h5ex_t_complex.h5"
-#define DATASET "DS1"
-#define DIM0    4
-#define DIM1    7
+#define FILENAME "h5ex_t_complex.h5"
+#define DATASET  "DS1"
+#define DIM0     4
+#define DIM1     7
 
 int
 main(void)
@@ -45,7 +45,7 @@ main(void)
     /*
      * Create a new file using the default properties.
      */
-    file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    file = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
      * Create dataspace.  Setting maximum size to NULL sets the maximum
@@ -80,7 +80,7 @@ main(void)
     /*
      * Open file and dataset.
      */
-    file = H5Fopen(FILE, H5F_ACC_RDONLY, H5P_DEFAULT);
+    file = H5Fopen(FILENAME, H5F_ACC_RDONLY, H5P_DEFAULT);
     dset = H5Dopen(file, DATASET, H5P_DEFAULT);
 
     /*
diff --git a/HDF5Examples/C/H5T/200/h5ex_t_complex_custom.c b/HDF5Examples/C/H5T/200/h5ex_t_complex_custom.c
index 6c36a2578d8..1acba0da423 100644
--- a/HDF5Examples/C/H5T/200/h5ex_t_complex_custom.c
+++ b/HDF5Examples/C/H5T/200/h5ex_t_complex_custom.c
@@ -16,10 +16,10 @@
 #include <stdlib.h>
 #include <complex.h>
 
-#define FILE    "h5ex_t_complex_custom.h5"
-#define DATASET "DS1"
-#define DIM0    4
-#define DIM1    7
+#define FILENAME "h5ex_t_complex_custom.h5"
+#define DATASET  "DS1"
+#define DIM0     4
+#define DIM1     7
 
 int
 main(void)
@@ -45,7 +45,7 @@ main(void)
     /*
      * Create a new file using the default properties.
      */
-    file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    file = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
      * Create dataspace.  Setting maximum size to NULL sets the maximum
@@ -87,7 +87,7 @@ main(void)
     /*
      * Open file and dataset.
      */
-    file = H5Fopen(FILE, H5F_ACC_RDONLY, H5P_DEFAULT);
+    file = H5Fopen(FILENAME, H5F_ACC_RDONLY, H5P_DEFAULT);
     dset = H5Dopen(file, DATASET, H5P_DEFAULT);
 
     /*
diff --git a/HDF5Examples/C/H5T/200/h5ex_t_complex_msvc.c b/HDF5Examples/C/H5T/200/h5ex_t_complex_msvc.c
index 2059380a76b..55a7e207a74 100644
--- a/HDF5Examples/C/H5T/200/h5ex_t_complex_msvc.c
+++ b/HDF5Examples/C/H5T/200/h5ex_t_complex_msvc.c
@@ -17,10 +17,10 @@
 #include <stdlib.h>
 #include <complex.h>
 
-#define FILE    "h5ex_t_complex_msvc.h5"
-#define DATASET "DS1"
-#define DIM0    4
-#define DIM1    7
+#define FILENAME "h5ex_t_complex_msvc.h5"
+#define DATASET  "DS1"
+#define DIM0     4
+#define DIM1     7
 
 int
 main(void)
@@ -46,7 +46,7 @@ main(void)
     /*
      * Create a new file using the default properties.
      */
-    file = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+    file = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
     /*
      * Create dataspace.  Setting maximum size to NULL sets the maximum
@@ -81,7 +81,7 @@ main(void)
     /*
      * Open file and dataset.
      */
-    file = H5Fopen(FILE, H5F_ACC_RDONLY, H5P_DEFAULT);
+    file = H5Fopen(FILENAME, H5F_ACC_RDONLY, H5P_DEFAULT);
     dset = H5Dopen(file, DATASET, H5P_DEFAULT);
 
     /*