diff --git a/src/H5Fcore.c b/src/H5Fcore.c
index 4cdd1ecf73..ed5e19c189 100644
--- a/src/H5Fcore.c
+++ b/src/H5Fcore.c
@@ -21,7 +21,7 @@
 
 #define H5F_CORE_DEV	0xffff	/*pseudo dev for core until we fix things */
 
-#define PABLO_MASK	H5F_core
+#define PABLO_MASK	H5F_core_mask
 static intn		interface_initialize_g = 0;
 #define INTERFACE_INIT NULL
 
diff --git a/src/H5Ffamily.c b/src/H5Ffamily.c
index 0a035e2202..6a9e1a2b80 100644
--- a/src/H5Ffamily.c
+++ b/src/H5Ffamily.c
@@ -26,7 +26,7 @@
 #include <H5Fprivate.h>
 #include <H5MMprivate.h>
 
-#define PABLO_MASK H5F_family
+#define PABLO_MASK H5F_family_mask
 static intn		interface_initialize_g = 0;
 #define INTERFACE_INIT NULL
 
diff --git a/src/H5Flow.c b/src/H5Flow.c
index 2ec0897e49..d0b96e27a1 100644
--- a/src/H5Flow.c
+++ b/src/H5Flow.c
@@ -17,7 +17,7 @@
 
 #define addr_defined(X) (((uint64_t)(-1)!=(X)->offset) ? TRUE : FALSE)
 
-#define PABLO_MASK	H5F_low
+#define PABLO_MASK	H5F_low_mask
 static intn		interface_initialize_g = 0;
 #define INTERFACE_INIT NULL
 
diff --git a/src/H5Fmpio.c b/src/H5Fmpio.c
index cbe10ed14e..6a4a1ea5b0 100644
--- a/src/H5Fmpio.c
+++ b/src/H5Fmpio.c
@@ -62,7 +62,7 @@
 #include <mpi.h>
 #include <mpio.h>
 
-#define PABLO_MASK      H5F_mpio
+#define PABLO_MASK      H5F_mpio_mask
 static intn          interface_initialize_g = 0;
 #define INTERFACE_INIT  NULL
 
diff --git a/src/H5Fsec2.c b/src/H5Fsec2.c
index ef54477ca2..823deb3fb4 100644
--- a/src/H5Fsec2.c
+++ b/src/H5Fsec2.c
@@ -19,7 +19,7 @@
 #include <H5Fprivate.h>
 #include <H5MMprivate.h>
 
-#define PABLO_MASK	H5F_sec2
+#define PABLO_MASK	H5F_sec2_mask
 static intn		interface_initialize_g = 0;
 #define INTERFACE_INIT	NULL
 
diff --git a/src/H5Fsplit.c b/src/H5Fsplit.c
index e4298ff272..3a6ee933fe 100644
--- a/src/H5Fsplit.c
+++ b/src/H5Fsplit.c
@@ -21,7 +21,7 @@
 #define H5F_SPLIT_META_EXT	".meta"
 #define H5F_SPLIT_RAW_EXT	".raw"
 
-#define PABLO_MASK H5F_split
+#define PABLO_MASK H5F_split_mask
 static intn interface_initialize_g = 0;
 #define INTERFACE_INIT NULL
 
diff --git a/src/H5Fstdio.c b/src/H5Fstdio.c
index d55fd198d2..bd6a805247 100644
--- a/src/H5Fstdio.c
+++ b/src/H5Fstdio.c
@@ -13,7 +13,7 @@
 #include <H5Fprivate.h>
 #include <H5MMprivate.h>
 
-#define PABLO_MASK	H5F_stdio
+#define PABLO_MASK	H5F_stdio_mask
 static intn		interface_initialize_g = 0;
 #define INTERFACE_INIT	NULL