[svn-r18452] Description:

	Finish renaming cache-related files & symbols on metadata journaling
branch.  Metadata cache-related symbols/files with no suffix now have a '1'
suffix and symbols/files with a '2' suffix now have no suffix.

Tested on:
	Mac OS X/32 10.6.2 (amazon) w/debug, prod & parallel
	(h5committest not required on this branch)

107 files changed, 5585 insertions, 5594 deletions

diff --git a/src/H5.c b/src/H5.c
index 0f4c863..3ce0b2e 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -175,7 +175,7 @@ H5_init_library(void)
         HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize dataset interface")
     if(H5AC1_init() < 0)
         HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize metadata caching interface")
-    if(H5AC2_init() < 0)
+    if(H5AC_init() < 0)
         HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize metadata caching interface")
     if(H5L_init() < 0)
         HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "unable to initialize link interface")
@@ -264,7 +264,7 @@ H5_term_library(void)
          */
         if(pending == 0) {
             pending += DOWN(AC1);
-            pending += DOWN(AC2);
+            pending += DOWN(AC);
             pending += DOWN(Z);
             pending += DOWN(FD);
             pending += DOWN(P);
diff --git a/src/H5A.c b/src/H5A.c
index a98a344..77ed0a2 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -29,7 +29,7 @@
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Apkg.h"		/* Attributes				*/
-#include "H5AC2private.h"	/* Metadata cache                       */
+#include "H5ACprivate.h"	/* Metadata cache                       */
 #include "H5Opkg.h"		/* Object headers			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FLprivate.h"	/* Free Lists				*/
@@ -226,7 +226,7 @@ H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id,
     H5S_t		*space;                 /* Dataspace to use for attribute */
     hid_t		ret_value;              /* Return value */
 
-    FUNC_ENTER_API_META(H5Acreate2, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Acreate2, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE6("i", "i*siiii", loc_id, attr_name, type_id, space_id, acpl_id, aapl_id);
 
     /* check arguments */
@@ -244,7 +244,7 @@ H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id,
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
     /* Go do the real work for attaching the attribute to the dataset */
-    if((ret_value = H5A_create(&loc, attr_name, type, space, acpl_id, H5AC2_dxpl_id)) < 0)
+    if((ret_value = H5A_create(&loc, attr_name, type, space, acpl_id, H5AC_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to create attribute")
 
 done:
@@ -297,7 +297,7 @@ H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
     H5S_t		*space;                 /* Dataspace to use for attribute */
     hid_t		ret_value;              /* Return value */
 
-    FUNC_ENTER_API_META(H5Acreate_by_name, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Acreate_by_name, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE8("i", "i*s*siiiii", loc_id, obj_name, attr_name, type_id, space_id,
              acpl_id, aapl_id, lapl_id);
 
@@ -323,12 +323,12 @@ H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found")
     loc_found = TRUE;
 
     /* Go do the real work for attaching the attribute to the dataset */
-    if((ret_value = H5A_create(&obj_loc, attr_name, type, space, acpl_id, H5AC2_dxpl_id)) < 0)
+    if((ret_value = H5A_create(&obj_loc, attr_name, type, space, acpl_id, H5AC_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to create attribute")
 
 done:
@@ -383,7 +383,7 @@ H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type,
      *  name, but it's going to be hard to unwind all the special cases on
      *  failure, so just check first, for now - QAK)
      */
-    if((tri_ret = H5O_attr_exists(loc->oloc, name, H5AC2_ind_dxpl_id)) < 0)
+    if((tri_ret = H5O_attr_exists(loc->oloc, name, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "error checking attributes")
     else if(tri_ret > 0)
         HGOTO_ERROR(H5E_ATTR, H5E_ALREADYEXISTS, FAIL, "attribute already exists")
@@ -548,7 +548,7 @@ H5Aopen(hid_t loc_id, const char *attr_name, hid_t UNUSED aapl_id)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
 
     /* Read in attribute from object header */
-    if(NULL == (attr = H5O_attr_open_by_name(loc.oloc, attr_name, H5AC2_ind_dxpl_id)))
+    if(NULL == (attr = H5O_attr_open_by_name(loc.oloc, attr_name, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to load attribute info from object header")
     attr->shared->initialized = TRUE;
 
@@ -618,7 +618,7 @@ H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Open the attribute on the object header */
-    if(NULL == (attr = H5A_open_by_name(&loc, obj_name, attr_name, lapl_id, H5AC2_ind_dxpl_id)))
+    if(NULL == (attr = H5A_open_by_name(&loc, obj_name, attr_name, lapl_id, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "can't open attribute")
 
     /* Register the attribute and get an ID for it */
@@ -689,7 +689,7 @@ H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Open the attribute in the object header */
-    if(NULL == (attr = H5A_open_by_idx(&loc, obj_name, idx_type, order, n, lapl_id, H5AC2_ind_dxpl_id)))
+    if(NULL == (attr = H5A_open_by_idx(&loc, obj_name, idx_type, order, n, lapl_id, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open attribute")
 
     /* Register the attribute and get an ID for it */
@@ -917,7 +917,7 @@ H5Awrite(hid_t attr_id, hid_t dtype_id, const void *buf)
     const H5T_t    *mem_type = NULL;
     herr_t	    ret_value;
 
-    FUNC_ENTER_API_META(H5Awrite, attr_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Awrite, attr_id, H5AC_dxpl_id, FAIL)
     H5TRACE3("e", "ii*x", attr_id, dtype_id, buf);
 
     /* check arguments */
@@ -929,7 +929,7 @@ H5Awrite(hid_t attr_id, hid_t dtype_id, const void *buf)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "null attribute buffer")
 
     /* Go write the actual data to the attribute */
-    if((ret_value = H5A_write(attr, mem_type, buf, H5AC2_dxpl_id)) < 0)
+    if((ret_value = H5A_write(attr, mem_type, buf, H5AC_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_WRITEERROR, FAIL, "unable to write attribute")
 
 done:
@@ -1087,7 +1087,7 @@ H5Aread(hid_t attr_id, hid_t dtype_id, void *buf)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "null attribute buffer")
 
     /* Go write the actual data to the attribute */
-    if((ret_value = H5A_read(attr, mem_type, buf, H5AC2_dxpl_id)) < 0)
+    if((ret_value = H5A_read(attr, mem_type, buf, H5AC_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_READERROR, FAIL, "unable to read attribute")
 
 done:
@@ -1496,7 +1496,7 @@ H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Open the attribute on the object header */
-    if(NULL == (attr = H5A_open_by_idx(&loc, obj_name, idx_type, order, n, lapl_id, H5AC2_ind_dxpl_id)))
+    if(NULL == (attr = H5A_open_by_idx(&loc, obj_name, idx_type, order, n, lapl_id, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "can't open attribute")
 
     /* Get the length of the name */
@@ -1633,7 +1633,7 @@ H5Aget_info_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Open the attribute on the object header */
-    if(NULL == (attr = H5A_open_by_name(&loc, obj_name, attr_name, lapl_id, H5AC2_ind_dxpl_id)))
+    if(NULL == (attr = H5A_open_by_name(&loc, obj_name, attr_name, lapl_id, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "can't open attribute")
 
     /* Get the attribute information */
@@ -1695,7 +1695,7 @@ H5Aget_info_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Open the attribute on the object header */
-    if(NULL == (attr = H5A_open_by_idx(&loc, obj_name, idx_type, order, n, lapl_id, H5AC2_ind_dxpl_id)))
+    if(NULL == (attr = H5A_open_by_idx(&loc, obj_name, idx_type, order, n, lapl_id, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "can't open attribute")
 
     /* Get the attribute information */
@@ -1771,7 +1771,7 @@ H5Arename(hid_t loc_id, const char *old_name, const char *new_name)
     H5G_loc_t	loc;	                /* Object location */
     herr_t	ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_API_META(H5Arename, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Arename, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE3("e", "i*s*s", loc_id, old_name, new_name);
 
     /* check arguments */
@@ -1785,7 +1785,7 @@ H5Arename(hid_t loc_id, const char *old_name, const char *new_name)
     /* Avoid thrashing things if the names are the same */
     if(HDstrcmp(old_name, new_name))
         /* Call attribute rename routine */
-        if(H5O_attr_rename(loc.oloc, H5AC2_dxpl_id, old_name, new_name) < 0)
+        if(H5O_attr_rename(loc.oloc, H5AC_dxpl_id, old_name, new_name) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTRENAME, FAIL, "can't rename attribute")
 
 done:
@@ -1817,7 +1817,7 @@ H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *old_attr_name,
     hbool_t     loc_found = FALSE;      /* Entry at 'obj_name' found */
     herr_t	ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_API_META(H5Arename_by_name, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Arename_by_name, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE5("e", "i*s*s*si", loc_id, obj_name, old_attr_name, new_attr_name,
              lapl_id);
 
@@ -1846,12 +1846,12 @@ H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *old_attr_name,
         H5G_loc_reset(&obj_loc);
 
         /* Find the object's location */
-        if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC2_ind_dxpl_id) < 0)
+        if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found")
         loc_found = TRUE;
 
         /* Call attribute rename routine */
-        if(H5O_attr_rename(obj_loc.oloc, H5AC2_dxpl_id, old_attr_name, new_attr_name) < 0)
+        if(H5O_attr_rename(obj_loc.oloc, H5AC_dxpl_id, old_attr_name, new_attr_name) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTRENAME, FAIL, "can't rename attribute")
     } /* end if */
 
@@ -1931,7 +1931,7 @@ H5Aiterate2(hid_t loc_id, H5_index_t idx_type, H5_iter_order_t order,
 
     /* Call attribute iteration routine */
     last_attr = start_idx = (idx ? *idx : 0);
-    if((ret_value = H5O_attr_iterate(loc_id, H5AC2_ind_dxpl_id, idx_type, order, start_idx, &last_attr, &attr_op, op_data)) < 0)
+    if((ret_value = H5O_attr_iterate(loc_id, H5AC_ind_dxpl_id, idx_type, order, start_idx, &last_attr, &attr_op, op_data)) < 0)
         HERROR(H5E_ATTR, H5E_BADITER, "error iterating over attributes");
 
     /* Set the last attribute information */
@@ -2029,12 +2029,12 @@ H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found")
     loc_found = TRUE;
 
     /* Open the object */
-    if((obj_loc_id = H5O_open_by_loc(&obj_loc, H5AC2_ind_dxpl_id)) < 0)
+    if((obj_loc_id = H5O_open_by_loc(&obj_loc, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
     /* Build attribute operator info */
@@ -2043,7 +2043,7 @@ H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
 
     /* Call attribute iteration routine */
     last_attr = start_idx = (idx ? *idx : 0);
-    if((ret_value = H5O_attr_iterate(obj_loc_id, H5AC2_ind_dxpl_id, idx_type, order, start_idx, &last_attr, &attr_op, op_data)) < 0)
+    if((ret_value = H5O_attr_iterate(obj_loc_id, H5AC_ind_dxpl_id, idx_type, order, start_idx, &last_attr, &attr_op, op_data)) < 0)
         HERROR(H5E_ATTR, H5E_BADITER, "error iterating over attributes");
 
     /* Set the last attribute information */
@@ -2083,7 +2083,7 @@ H5Adelete(hid_t loc_id, const char *name)
     H5G_loc_t	loc;		        /* Object location */
     herr_t	ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_API_META(H5Adelete, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Adelete, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE2("e", "i*s", loc_id, name);
 
     /* check arguments */
@@ -2095,7 +2095,7 @@ H5Adelete(hid_t loc_id, const char *name)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Delete the attribute from the location */
-    if(H5O_attr_remove(loc.oloc, name, H5AC2_dxpl_id) < 0)
+    if(H5O_attr_remove(loc.oloc, name, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute")
 
 done:
@@ -2130,7 +2130,7 @@ H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
     hbool_t     loc_found = FALSE;      /* Entry at 'obj_name' found */
     herr_t	ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_API_META(H5Adelete_by_name, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Adelete_by_name, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE4("e", "i*s*si", loc_id, obj_name, attr_name, lapl_id);
 
     /* check arguments */
@@ -2154,12 +2154,12 @@ H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found")
     loc_found = TRUE;
 
     /* Delete the attribute from the location */
-    if(H5O_attr_remove(obj_loc.oloc, attr_name, H5AC2_dxpl_id) < 0)
+    if(H5O_attr_remove(obj_loc.oloc, attr_name, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute")
 
 done:
@@ -2206,7 +2206,7 @@ H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
     hbool_t     loc_found = FALSE;      /* Entry at 'obj_name' found */
     herr_t	ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_API_META(H5Adelete_by_idx, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Adelete_by_idx, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE6("e", "i*sIiIohi", loc_id, obj_name, idx_type, order, n, lapl_id);
 
     /* check arguments */
@@ -2232,12 +2232,12 @@ H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC2_dxpl_id) < 0)
+    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found")
     loc_found = TRUE;
 
     /* Delete the attribute from the location */
-    if(H5O_attr_remove_by_idx(obj_loc.oloc, idx_type, order, n, H5AC2_dxpl_id) < 0)
+    if(H5O_attr_remove_by_idx(obj_loc.oloc, idx_type, order, n, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute")
 
 done:
@@ -2269,7 +2269,7 @@ H5Aclose(hid_t attr_id)
 {
     herr_t ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_API_META(H5Aclose, attr_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Aclose, attr_id, H5AC_dxpl_id, FAIL)
     H5TRACE1("e", "i", attr_id);
 
     /* check arguments */
@@ -2551,7 +2551,7 @@ H5Aexists(hid_t obj_id, const char *attr_name)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no attribute name")
 
     /* Check if the attribute exists */
-    if((ret_value = H5O_attr_exists(loc.oloc, attr_name, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5O_attr_exists(loc.oloc, attr_name, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "unable to determine if attribute exists")
 
 done:
@@ -2607,12 +2607,12 @@ H5Aexists_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_loc_find(&loc, obj_name, &obj_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "object not found")
     loc_found = TRUE;
 
     /* Check if the attribute exists */
-    if((ret_value = H5O_attr_exists(obj_loc.oloc, attr_name, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5O_attr_exists(obj_loc.oloc, attr_name, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "unable to determine if attribute exists")
 
 done:
diff --git a/src/H5AC2.c b/src/H5AC.c
index 9a3947e..5b3f0e7 100644
--- a/src/H5AC2.c
+++ b/src/H5AC.c
@@ -15,7 +15,7 @@
 
 /*-------------------------------------------------------------------------
  *
- * Created:             H5AC2.c
+ * Created:             H5AC.c
  *                      Jul  9 1997
  *                      Robb Matzke <matzke@llnl.gov>
  *
@@ -30,40 +30,35 @@
  *      Added calls to H5E.
  *
  *      Quincey Koziol, 22 Apr 2000
- *      Turned on "H5AC2_SORT_BY_ADDR"
+ *      Turned on "H5AC_SORT_BY_ADDR"
  *
  *	John Mainzer, 5/19/04
  * 	Complete redesign and rewrite.  See the header comments for
- *      H5AC2_t for an overview of what is going on.
+ *      H5AC_t for an overview of what is going on.
  *
  *	John Mainzer, 6/4/04
  *	Factored the new cache code into a separate file (H5C.c) to
  *	facilitate re-use.  Re-worked this file again to use H5C.
  *
- *	John Mainzer, 10/18/07
- *	Copied H5AC2.c to H5AC22.c and reworked to use H5C2 instead of H5C.
- *	All this is in support of cache API modifications needed for
- *	journaling.
- *
  *-------------------------------------------------------------------------
  */
 
 #include <aio.h>
 
-#define H5AC2_PACKAGE            /*suppress error about including H5AC2pkg  */
-#define H5C2_PACKAGE            /*suppress error about including H5C2pkg  */
+#define H5AC_PACKAGE            /*suppress error about including H5ACpkg  */
+#define H5C_PACKAGE             /*suppress error about including H5Cpkg  */
 #define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
 
 /* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5AC2_init_interface
+#define H5_INTERFACE_INIT_FUNC	H5AC_init_interface
 
 #ifdef H5_HAVE_PARALLEL
 #include <mpi.h>
 #endif /* H5_HAVE_PARALLEL */
 
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2pkg.h"		/* Metadata cache			*/
-#include "H5C2pkg.h"            /* Cache                                */
+#include "H5ACpkg.h"		/* Metadata cache			*/
+#include "H5Cpkg.h"            /* Cache                                */
 #include "H5Dprivate.h"		/* Dataset functions			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Fpkg.h"		/* Files				*/
@@ -76,25 +71,25 @@
 
 #ifdef H5_HAVE_PARALLEL
 
-/* Declare a free list to manage the H5AC2_aux_t struct */
-H5FL_DEFINE_STATIC(H5AC2_aux_t);
+/* Declare a free list to manage the H5AC_aux_t struct */
+H5FL_DEFINE_STATIC(H5AC_aux_t);
 
 #endif /* H5_HAVE_PARALLEL */
 
 /****************************************************************************
  *
- * structure H5AC2_slist_entry_t
+ * structure H5AC_slist_entry_t
  *
- * The dirty entry list maintained via the d_slist_ptr field of H5AC2_aux_t
+ * The dirty entry list maintained via the d_slist_ptr field of H5AC_aux_t
  * and the cleaned entry list maintained via the c_slist_ptr field of
- * H5AC2_aux_t are just lists of the file offsets of the dirty/cleaned
+ * H5AC_aux_t are just lists of the file offsets of the dirty/cleaned
  * entries.  Unfortunately, the slist code makes us define a dynamically
  * allocated structure to store these offsets in.  This structure serves
  * that purpose.  Its fields are as follows:
  *
  * magic:       Unsigned 32 bit integer always set to
- *		H5AC2__H5AC2_SLIST_ENTRY_T_MAGIC.  This field is used to
- *		validate pointers to instances of H5AC2_slist_entry_t.
+ *		H5AC__H5AC_SLIST_ENTRY_T_MAGIC.  This field is used to
+ *		validate pointers to instances of H5AC_slist_entry_t.
  *
  * addr:	file offset of a metadata entry.  Entries are added to this
  *		list (if they aren't there already) when they are marked
@@ -105,17 +100,17 @@ H5FL_DEFINE_STATIC(H5AC2_aux_t);
 
 #ifdef H5_HAVE_PARALLEL
 
-#define H5AC2__H5AC2_SLIST_ENTRY_T_MAGIC        0x00D0A02
+#define H5AC__H5AC_SLIST_ENTRY_T_MAGIC        0x00D0A02
 
-typedef struct H5AC2_slist_entry_t
+typedef struct H5AC_slist_entry_t
 {
     uint32_t    magic;
 
     haddr_t     addr;
-} H5AC2_slist_entry_t;
+} H5AC_slist_entry_t;
 
-/* Declare a free list to manage the H5AC2_slist_entry_t struct */
-H5FL_DEFINE_STATIC(H5AC2_slist_entry_t);
+/* Declare a free list to manage the H5AC_slist_entry_t struct */
+H5FL_DEFINE_STATIC(H5AC_slist_entry_t);
 
 #endif /* H5_HAVE_PARALLEL */
 
@@ -126,88 +121,88 @@ H5FL_DEFINE_STATIC(H5AC2_slist_entry_t);
 
 /* Default dataset transfer property list for metadata I/O calls */
 /* (Collective set, "block before metadata write" set and "library internal" set) */
-/* (Global variable definition, declaration is in H5AC2private.h also) */
-hid_t H5AC2_dxpl_id=(-1);
+/* (Global variable definition, declaration is in H5ACprivate.h also) */
+hid_t H5AC_dxpl_id=(-1);
 
 /* Private dataset transfer property list for metadata I/O calls */
 /* (Collective set and "library internal" set) */
 /* (Static variable definition) */
-static hid_t H5AC2_noblock_dxpl_id=(-1);
+static hid_t H5AC_noblock_dxpl_id=(-1);
 
 /* Dataset transfer property list for independent metadata I/O calls */
 /* (just "library internal" set - i.e. independent transfer mode) */
-/* (Global variable definition, declaration is in H5AC2private.h also) */
-hid_t H5AC2_ind_dxpl_id=(-1);
+/* (Global variable definition, declaration is in H5ACprivate.h also) */
+hid_t H5AC_ind_dxpl_id=(-1);
 
 
 /*
  * Private file-scope function declarations:
  */
 
-static herr_t H5AC2_check_if_write_permitted(const H5F_t *f,
+static herr_t H5AC_check_if_write_permitted(const H5F_t *f,
                                             hid_t dxpl_id,
                                             hbool_t * write_permitted_ptr);
 
 #ifdef H5_HAVE_PARALLEL
-static herr_t H5AC2_broadcast_clean_list(H5AC2_t * cache_ptr);
+static herr_t H5AC_broadcast_clean_list(H5AC_t * cache_ptr);
 #endif /* JRM */
 
-static herr_t H5AC2_ext_config_2_int_config(
-		                    H5AC2_cache_config_t * ext_conf_ptr,
-                                    H5C2_auto_size_ctl_t * int_conf_ptr);
+static herr_t H5AC_ext_config_2_int_config(
+		                    H5AC_cache_config_t * ext_conf_ptr,
+                                    H5C_auto_size_ctl_t * int_conf_ptr);
 
 #ifdef H5_HAVE_PARALLEL
-static herr_t H5AC2_log_deleted_entry(H5AC2_t * cache_ptr,
-                                     H5AC2_info_t * entry_ptr,
+static herr_t H5AC_log_deleted_entry(H5AC_t * cache_ptr,
+                                     H5AC_info_t * entry_ptr,
                                      haddr_t addr,
                                      unsigned int flags);
 
-static herr_t H5AC2_log_dirtied_entry(const H5AC2_info_t * entry_ptr,
+static herr_t H5AC_log_dirtied_entry(const H5AC_info_t * entry_ptr,
                                      haddr_t addr,
                                      hbool_t size_changed,
                                      size_t new_size);
 
-static herr_t H5AC2_log_flushed_entry(H5C2_t * cache_ptr,
+static herr_t H5AC_log_flushed_entry(H5C_t * cache_ptr,
                                      haddr_t addr,
                                      hbool_t was_dirty,
                                      unsigned flags,
                                      int type_id);
 
 #if 0 /* this is useful debugging code -- JRM */
-static herr_t H5AC2_log_flushed_entry_dummy(H5C2_t * cache_ptr,
+static herr_t H5AC_log_flushed_entry_dummy(H5C_t * cache_ptr,
                                            haddr_t addr,
                                            hbool_t was_dirty,
                                            unsigned flags,
                                            int type_id);
 #endif /* JRM */
 
-static herr_t H5AC2_log_inserted_entry(H5F_t * f,
-                                      H5AC2_t * cache_ptr,
-                                      H5AC2_info_t * entry_ptr,
-                                      const H5AC2_class_t * type,
+static herr_t H5AC_log_inserted_entry(H5F_t * f,
+                                      H5AC_t * cache_ptr,
+                                      H5AC_info_t * entry_ptr,
+                                      const H5AC_class_t * type,
                                       haddr_t addr,
                                       size_t size);
 
-static herr_t H5AC2_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
+static herr_t H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
                                                            hid_t dxpl_id,
-                                                           H5AC2_t * cache_ptr,
+                                                           H5AC_t * cache_ptr,
                                                            hbool_t  do_barrier);
 
-static herr_t H5AC2_receive_and_apply_clean_list(H5F_t  *  f,
+static herr_t H5AC_receive_and_apply_clean_list(H5F_t  *  f,
                                                  hid_t     dxpl_id,
-                                                 H5AC2_t * cache_ptr);
+                                                 H5AC_t * cache_ptr);
 
-static herr_t H5AC2_log_renamed_entry(H5F_t * f,
+static herr_t H5AC_log_renamed_entry(H5F_t * f,
                                      haddr_t old_addr,
                                      haddr_t new_addr);
 #endif /* H5_HAVE_PARALLEL */
 
-static herr_t H5AC2_set_cache_config(H5AC2_t * cache_ptr,
-                                     H5AC2_cache_config_t *config_ptr);
+static herr_t H5AC_set_cache_config(H5AC_t * cache_ptr,
+                                     H5AC_cache_config_t *config_ptr);
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5AC2_init
+ * Function:	H5AC_init
  *
  * Purpose:	Initialize the interface from some other layer.
  *
@@ -223,11 +218,11 @@ static herr_t H5AC2_set_cache_config(H5AC2_t * cache_ptr,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC2_init(void)
+H5AC_init(void)
 {
     herr_t ret_value=SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_init, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_init, FAIL)
     /* FUNC_ENTER() does all the work */
 
 done:
@@ -236,7 +231,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5AC2_init_interface
+ * Function:	H5AC_init_interface
  *
  * Purpose:	Initialize interface-specific information
  *
@@ -250,7 +245,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5AC2_init_interface(void)
+H5AC_init_interface(void)
 {
 #ifdef H5_HAVE_PARALLEL
     H5P_genclass_t  *xfer_pclass;   /* Dataset transfer property list class object */
@@ -260,7 +255,7 @@ H5AC2_init_interface(void)
     H5FD_mpio_xfer_t xfer_mode;     /* I/O transfer mode property value */
     herr_t ret_value=SUCCEED;           /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5AC2_init_interface)
+    FUNC_ENTER_NOAPI_NOINIT(H5AC_init_interface)
 
     /* Sanity check */
     HDassert(H5P_CLS_DATASET_XFER_g!=(-1));
@@ -269,21 +264,21 @@ H5AC2_init_interface(void)
     if (NULL == (xfer_pclass = H5I_object(H5P_CLS_DATASET_XFER_g)))
         HGOTO_ERROR(H5E_CACHE, H5E_BADATOM, FAIL, "can't get property list class")
 
-    /* Get an ID for the blocking, collective H5AC2 dxpl */
-    if ((H5AC2_dxpl_id=H5P_create_id(xfer_pclass)) < 0)
+    /* Get an ID for the blocking, collective H5AC dxpl */
+    if ((H5AC_dxpl_id=H5P_create_id(xfer_pclass)) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, FAIL, "unable to register property list")
 
     /* Get the property list object */
-    if (NULL == (xfer_plist = H5I_object(H5AC2_dxpl_id)))
+    if (NULL == (xfer_plist = H5I_object(H5AC_dxpl_id)))
         HGOTO_ERROR(H5E_CACHE, H5E_BADATOM, FAIL, "can't get new property list object")
 
     /* Insert 'block before metadata write' property */
     block_before_meta_write=1;
-    if(H5P_insert(xfer_plist,H5AC2_BLOCK_BEFORE_META_WRITE_NAME,H5AC2_BLOCK_BEFORE_META_WRITE_SIZE,&block_before_meta_write,NULL,NULL,NULL,NULL,NULL,NULL)<0)
+    if(H5P_insert(xfer_plist,H5AC_BLOCK_BEFORE_META_WRITE_NAME,H5AC_BLOCK_BEFORE_META_WRITE_SIZE,&block_before_meta_write,NULL,NULL,NULL,NULL,NULL,NULL)<0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't insert metadata cache dxpl property")
 
     /* Insert 'library internal' property */
-    if(H5P_insert(xfer_plist,H5AC2_LIBRARY_INTERNAL_NAME,H5AC2_LIBRARY_INTERNAL_SIZE,&library_internal,NULL,NULL,NULL,NULL,NULL,NULL)<0)
+    if(H5P_insert(xfer_plist,H5AC_LIBRARY_INTERNAL_NAME,H5AC_LIBRARY_INTERNAL_SIZE,&library_internal,NULL,NULL,NULL,NULL,NULL,NULL)<0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't insert metadata cache dxpl property")
 
     /* Set the transfer mode */
@@ -291,21 +286,21 @@ H5AC2_init_interface(void)
     if (H5P_set(xfer_plist,H5D_XFER_IO_XFER_MODE_NAME,&xfer_mode)<0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
-    /* Get an ID for the non-blocking, collective H5AC2 dxpl */
-    if ((H5AC2_noblock_dxpl_id=H5P_create_id(xfer_pclass)) < 0)
+    /* Get an ID for the non-blocking, collective H5AC dxpl */
+    if ((H5AC_noblock_dxpl_id=H5P_create_id(xfer_pclass)) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, FAIL, "unable to register property list")
 
     /* Get the property list object */
-    if (NULL == (xfer_plist = H5I_object(H5AC2_noblock_dxpl_id)))
+    if (NULL == (xfer_plist = H5I_object(H5AC_noblock_dxpl_id)))
         HGOTO_ERROR(H5E_CACHE, H5E_BADATOM, FAIL, "can't get new property list object")
 
     /* Insert 'block before metadata write' property */
     block_before_meta_write=0;
-    if(H5P_insert(xfer_plist,H5AC2_BLOCK_BEFORE_META_WRITE_NAME,H5AC2_BLOCK_BEFORE_META_WRITE_SIZE,&block_before_meta_write,NULL,NULL,NULL,NULL,NULL,NULL)<0)
+    if(H5P_insert(xfer_plist,H5AC_BLOCK_BEFORE_META_WRITE_NAME,H5AC_BLOCK_BEFORE_META_WRITE_SIZE,&block_before_meta_write,NULL,NULL,NULL,NULL,NULL,NULL)<0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't insert metadata cache dxpl property")
 
     /* Insert 'library internal' property */
-    if(H5P_insert(xfer_plist,H5AC2_LIBRARY_INTERNAL_NAME,H5AC2_LIBRARY_INTERNAL_SIZE,&library_internal,NULL,NULL,NULL,NULL,NULL,NULL)<0)
+    if(H5P_insert(xfer_plist,H5AC_LIBRARY_INTERNAL_NAME,H5AC_LIBRARY_INTERNAL_SIZE,&library_internal,NULL,NULL,NULL,NULL,NULL,NULL)<0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't insert metadata cache dxpl property")
 
     /* Set the transfer mode */
@@ -313,21 +308,21 @@ H5AC2_init_interface(void)
     if (H5P_set(xfer_plist,H5D_XFER_IO_XFER_MODE_NAME,&xfer_mode)<0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
-    /* Get an ID for the non-blocking, independent H5AC2 dxpl */
-    if ((H5AC2_ind_dxpl_id=H5P_create_id(xfer_pclass)) < 0)
+    /* Get an ID for the non-blocking, independent H5AC dxpl */
+    if ((H5AC_ind_dxpl_id=H5P_create_id(xfer_pclass)) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, FAIL, "unable to register property list")
 
     /* Get the property list object */
-    if (NULL == (xfer_plist = H5I_object(H5AC2_ind_dxpl_id)))
+    if (NULL == (xfer_plist = H5I_object(H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_CACHE, H5E_BADATOM, FAIL, "can't get new property list object")
 
     /* Insert 'block before metadata write' property */
     block_before_meta_write=0;
-    if(H5P_insert(xfer_plist,H5AC2_BLOCK_BEFORE_META_WRITE_NAME,H5AC2_BLOCK_BEFORE_META_WRITE_SIZE,&block_before_meta_write,NULL,NULL,NULL,NULL,NULL,NULL)<0)
+    if(H5P_insert(xfer_plist,H5AC_BLOCK_BEFORE_META_WRITE_NAME,H5AC_BLOCK_BEFORE_META_WRITE_SIZE,&block_before_meta_write,NULL,NULL,NULL,NULL,NULL,NULL)<0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't insert metadata cache dxpl property")
 
     /* Insert 'library internal' property */
-    if(H5P_insert(xfer_plist,H5AC2_LIBRARY_INTERNAL_NAME,H5AC2_LIBRARY_INTERNAL_SIZE,&library_internal,NULL,NULL,NULL,NULL,NULL,NULL)<0)
+    if(H5P_insert(xfer_plist,H5AC_LIBRARY_INTERNAL_NAME,H5AC_LIBRARY_INTERNAL_SIZE,&library_internal,NULL,NULL,NULL,NULL,NULL,NULL)<0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't insert metadata cache dxpl property")
 
     /* Set the transfer mode */
@@ -339,22 +334,22 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 
 #else /* H5_HAVE_PARALLEL */
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC2_init_interface)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_init_interface)
 
     /* Sanity check */
     assert(H5P_LST_DATASET_XFER_g!=(-1));
 
-    H5AC2_dxpl_id=H5P_DATASET_XFER_DEFAULT;
-    H5AC2_noblock_dxpl_id=H5P_DATASET_XFER_DEFAULT;
-    H5AC2_ind_dxpl_id=H5P_DATASET_XFER_DEFAULT;
+    H5AC_dxpl_id=H5P_DATASET_XFER_DEFAULT;
+    H5AC_noblock_dxpl_id=H5P_DATASET_XFER_DEFAULT;
+    H5AC_ind_dxpl_id=H5P_DATASET_XFER_DEFAULT;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 #endif /* H5_HAVE_PARALLEL */
-} /* end H5AC2_init_interface() */
+} /* end H5AC_init_interface() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5AC2_term_interface
+ * Function:	H5AC_term_interface
  *
  * Purpose:	Terminate this interface.
  *
@@ -371,28 +366,28 @@ done:
  *-------------------------------------------------------------------------
  */
 int
-H5AC2_term_interface(void)
+H5AC_term_interface(void)
 {
     int		n=0;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC2_term_interface)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_term_interface)
 
     if (H5_interface_initialize_g) {
 #ifdef H5_HAVE_PARALLEL
-        if(H5AC2_dxpl_id>0 || H5AC2_noblock_dxpl_id>0 || H5AC2_ind_dxpl_id>0) {
+        if(H5AC_dxpl_id>0 || H5AC_noblock_dxpl_id>0 || H5AC_ind_dxpl_id>0) {
             /* Indicate more work to do */
             n = 1; /* H5I */
 
-            /* Close H5AC2 dxpl */
-            if (H5I_dec_ref(H5AC2_dxpl_id) < 0 ||
-                    H5I_dec_ref(H5AC2_noblock_dxpl_id) < 0 ||
-                    H5I_dec_ref(H5AC2_ind_dxpl_id) < 0)
+            /* Close H5AC dxpl */
+            if (H5I_dec_ref(H5AC_dxpl_id) < 0 ||
+                    H5I_dec_ref(H5AC_noblock_dxpl_id) < 0 ||
+                    H5I_dec_ref(H5AC_ind_dxpl_id) < 0)
                 H5E_clear_stack(NULL); /*ignore error*/
             else {
                 /* Reset static IDs */
-                H5AC2_dxpl_id=(-1);
-                H5AC2_noblock_dxpl_id=(-1);
-                H5AC2_ind_dxpl_id=(-1);
+                H5AC_dxpl_id=(-1);
+                H5AC_noblock_dxpl_id=(-1);
+                H5AC_ind_dxpl_id=(-1);
 
                 /* Reset interface initialization flag */
                 H5_interface_initialize_g = 0;
@@ -401,24 +396,24 @@ H5AC2_term_interface(void)
         else
 #else /* H5_HAVE_PARALLEL */
             /* Reset static IDs */
-            H5AC2_dxpl_id=(-1);
-            H5AC2_noblock_dxpl_id=(-1);
-            H5AC2_ind_dxpl_id=(-1);
+            H5AC_dxpl_id=(-1);
+            H5AC_noblock_dxpl_id=(-1);
+            H5AC_ind_dxpl_id=(-1);
 #endif /* H5_HAVE_PARALLEL */
             /* Reset interface initialization flag */
             H5_interface_initialize_g = 0;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(n)
-} /* end H5AC2_term_interface() */
+} /* end H5AC_term_interface() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_create
+ * Function:    H5AC_create
  *
  * Purpose:     Initialize the cache just after a file is opened.  The
  *              SIZE_HINT is the number of cache slots desired.  If you
- *              pass an invalid value then H5AC2_NSLOTS is used.  You can
+ *              pass an invalid value then H5AC_NSLOTS is used.  You can
  *              turn off caching by using 1 for the SIZE_HINT value.
  *
  * Return:      Success:        Number of slots actually used.
@@ -445,8 +440,8 @@ H5AC2_term_interface(void)
  *						JRM - 4/28/04
  *
  *		Reworked the function again after abstracting its guts to
- *		the similar function in H5C2.c.  The function is now a
- *		wrapper for H5C2_create().
+ *		the similar function in H5C.c.  The function is now a
+ *		wrapper for H5C_create().
  *						JRM - 6/4/04
  *
  *		Deleted the old size_hint parameter and added the
@@ -460,14 +455,14 @@ H5AC2_term_interface(void)
  *
  *						JRM - 3/24/05
  *
- *		Changed the type of config_ptr from H5AC2_auto_size_ctl_t *
- *		to H5AC2_cache_config_t *.  Propagated associated changes
+ *		Changed the type of config_ptr from H5AC_auto_size_ctl_t *
+ *		to H5AC_cache_config_t *.  Propagated associated changes
  *		through the function.
  *						JRM - 4/7/05
  *
  *		Added code allocating and initializing the auxilary
- *		structure (an instance of H5AC2_aux_t), and linking it
- *		to the instance of H5C2_t created by H5C2_create().  At
+ *		structure (an instance of H5AC_aux_t), and linking it
+ *		to the instance of H5C_t created by H5C_create().  At
  *		present, the auxilary structure is only used in PHDF5.
  *
  *						JRM - 6/28/05
@@ -485,18 +480,18 @@ H5AC2_term_interface(void)
  *              				JRM - 10/18/07
  *
  *		Added the dxpl_id parameter, and updated for parameter
- *		list changes in H5C2_create().
+ *		list changes in H5C_create().
  *						JRM - 3/26/08
  *
  *		Updated code for the removal of the f, dxpl_id, and
- *		journal_recovered parameters for H5C2_create().
+ *		journal_recovered parameters for H5C_create().
  *
  *						JRM 7/10/08
  *
  *-------------------------------------------------------------------------
  */
 
-static const char * H5AC2_entry_type_names[H5AC2_NTYPES] =
+static const char * H5AC_entry_type_names[H5AC_NTYPES] =
 {
     "B-tree nodes",
     "symbol table nodes",
@@ -519,28 +514,28 @@ static const char * H5AC2_entry_type_names[H5AC2_NTYPES] =
 };
 
 herr_t
-H5AC2_create(H5F_t * f,
-             H5AC2_cache_config_t *config_ptr)
+H5AC_create(H5F_t * f,
+             H5AC_cache_config_t *config_ptr)
 {
     herr_t ret_value = SUCCEED;      /* Return value */
     herr_t result;
 #ifdef H5_HAVE_PARALLEL
-    char 	 prefix[H5C2__PREFIX_LEN] = "";
+    char 	 prefix[H5C__PREFIX_LEN] = "";
     MPI_Comm	 mpi_comm = MPI_COMM_NULL;
     int		 mpi_rank = -1;
     int	 	 mpi_size = -1;
-    H5AC2_aux_t * aux_ptr = NULL;
+    H5AC_aux_t * aux_ptr = NULL;
 #endif /* H5_HAVE_PARALLEL */
 
-    FUNC_ENTER_NOAPI(H5AC2_create, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_create, FAIL)
 
     HDassert(f);
-    HDassert(NULL == f->shared->cache2);
+    HDassert(NULL == f->shared->cache);
     HDassert(config_ptr != NULL);
-    HDcompile_assert(NELMTS(H5AC2_entry_type_names) == H5AC2_NTYPES);
-    HDcompile_assert(H5C2__MAX_NUM_TYPE_IDS == H5AC2_NTYPES);
+    HDcompile_assert(NELMTS(H5AC_entry_type_names) == H5AC_NTYPES);
+    HDcompile_assert(H5C__MAX_NUM_TYPE_IDS == H5AC_NTYPES);
 
-    result = H5AC2_validate_config(config_ptr);
+    result = H5AC_validate_config(config_ptr);
 
     if ( result != SUCCEED ) {
 
@@ -572,22 +567,22 @@ H5AC2_create(H5F_t * f,
          */
         if ( mpi_size > 1 ) {
 
-            if ( NULL == (aux_ptr = H5FL_CALLOC(H5AC2_aux_t)) ) {
+            if ( NULL == (aux_ptr = H5FL_CALLOC(H5AC_aux_t)) ) {
 
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
-                            "Can't allocate H5AC2 auxilary structure.")
+                            "Can't allocate H5AC auxilary structure.")
 
             } else {
 
-                aux_ptr->magic = H5AC2__H5AC2_AUX_T_MAGIC;
+                aux_ptr->magic = H5AC__H5AC_AUX_T_MAGIC;
                 aux_ptr->mpi_comm = mpi_comm;
                 aux_ptr->mpi_rank = mpi_rank;
                 aux_ptr->mpi_size = mpi_size;
                 aux_ptr->write_permitted = FALSE;
                 aux_ptr->dirty_bytes_threshold =
-			H5AC2__DEFAULT_DIRTY_BYTES_THRESHOLD;
+			H5AC__DEFAULT_DIRTY_BYTES_THRESHOLD;
                 aux_ptr->dirty_bytes = 0;
-#if H5AC2_DEBUG_DIRTY_BYTES_CREATION
+#if H5AC_DEBUG_DIRTY_BYTES_CREATION
                 aux_ptr->dirty_bytes_propagations = 0;
                 aux_ptr->unprotect_dirty_bytes = 0;
                 aux_ptr->unprotect_dirty_bytes_updates = 0;
@@ -595,7 +590,7 @@ H5AC2_create(H5F_t * f,
                 aux_ptr->insert_dirty_bytes_updates = 0;
                 aux_ptr->rename_dirty_bytes = 0;
                 aux_ptr->rename_dirty_bytes_updates = 0;
-#endif /* H5AC2_DEBUG_DIRTY_BYTES_CREATION */
+#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
                 aux_ptr->d_slist_ptr = NULL;
                 aux_ptr->d_slist_len = 0;
                 aux_ptr->c_slist_ptr = NULL;
@@ -631,25 +626,25 @@ H5AC2_create(H5F_t * f,
 
             if ( aux_ptr->mpi_rank == 0 ) {
 
-                f->shared->cache2 = H5C2_create(H5AC2__DEFAULT_MAX_CACHE_SIZE,
-                                         H5AC2__DEFAULT_MIN_CLEAN_SIZE,
-                                         (H5AC2_NTYPES - 1),
-                                         (const char **)H5AC2_entry_type_names,
-                                         H5AC2_check_if_write_permitted,
+                f->shared->cache = H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE,
+                                         H5AC__DEFAULT_MIN_CLEAN_SIZE,
+                                         (H5AC_NTYPES - 1),
+                                         (const char **)H5AC_entry_type_names,
+                                         H5AC_check_if_write_permitted,
                                          TRUE,
-                                         H5AC2_log_flushed_entry,
+                                         H5AC_log_flushed_entry,
                                          (void *)aux_ptr);
 
             } else {
 
-                f->shared->cache2 = H5C2_create(H5AC2__DEFAULT_MAX_CACHE_SIZE,
-                                         H5AC2__DEFAULT_MIN_CLEAN_SIZE,
-                                         (H5AC2_NTYPES - 1),
-                                         (const char **)H5AC2_entry_type_names,
+                f->shared->cache = H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE,
+                                         H5AC__DEFAULT_MIN_CLEAN_SIZE,
+                                         (H5AC_NTYPES - 1),
+                                         (const char **)H5AC_entry_type_names,
                                          NULL,
                                          FALSE,
 #if 0 /* this is useful debugging code -- keep it for a while */ /* JRM */
-                                         H5AC2_log_flushed_entry_dummy,
+                                         H5AC_log_flushed_entry_dummy,
 #else /* JRM */
                                          NULL,
 #endif /* JRM */
@@ -658,11 +653,11 @@ H5AC2_create(H5F_t * f,
 
         } else {
 
-            f->shared->cache2 = H5C2_create(H5AC2__DEFAULT_MAX_CACHE_SIZE,
-                                        H5AC2__DEFAULT_MIN_CLEAN_SIZE,
-                                        (H5AC2_NTYPES - 1),
-                                        (const char **)H5AC2_entry_type_names,
-                                        H5AC2_check_if_write_permitted,
+            f->shared->cache = H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE,
+                                        H5AC__DEFAULT_MIN_CLEAN_SIZE,
+                                        (H5AC_NTYPES - 1),
+                                        (const char **)H5AC_entry_type_names,
+                                        H5AC_check_if_write_permitted,
                                         TRUE,
                                         NULL,
                                         NULL);
@@ -674,11 +669,11 @@ H5AC2_create(H5F_t * f,
          *                                             -- JRM
          */
 
-        f->shared->cache2 = H5C2_create(H5AC2__DEFAULT_MAX_CACHE_SIZE,
-                                        H5AC2__DEFAULT_MIN_CLEAN_SIZE,
-                                        (H5AC2_NTYPES - 1),
-                                        (const char **)H5AC2_entry_type_names,
-                                        H5AC2_check_if_write_permitted,
+        f->shared->cache = H5C_create(H5AC__DEFAULT_MAX_CACHE_SIZE,
+                                        H5AC__DEFAULT_MIN_CLEAN_SIZE,
+                                        (H5AC_NTYPES - 1),
+                                        (const char **)H5AC_entry_type_names,
+                                        H5AC_check_if_write_permitted,
                                         TRUE,
                                         NULL,
                                         NULL);
@@ -686,7 +681,7 @@ H5AC2_create(H5F_t * f,
     }
 #endif /* H5_HAVE_PARALLEL */
 
-    if ( NULL == f->shared->cache2 ) {
+    if ( NULL == f->shared->cache ) {
 
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
@@ -694,17 +689,17 @@ H5AC2_create(H5F_t * f,
 #ifdef H5_HAVE_PARALLEL
     else if ( aux_ptr != NULL ) {
 
-        result = H5C2_set_prefix(f->shared->cache2, prefix);
+        result = H5C_set_prefix(f->shared->cache, prefix);
 
         if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
-                        "H5C2_set_prefix() failed")
+                        "H5C_set_prefix() failed")
         }
     }
 #endif /* H5_HAVE_PARALLEL */
 
-    result = H5AC2_set_cache_config(f->shared->cache2, config_ptr);
+    result = H5AC_set_cache_config(f->shared->cache, config_ptr);
 
     if ( result != SUCCEED ) {
 
@@ -733,7 +728,7 @@ done:
             }
 
             aux_ptr->magic = 0;
-            H5FL_FREE(H5AC2_aux_t, aux_ptr);
+            H5FL_FREE(H5AC_aux_t, aux_ptr);
             aux_ptr = NULL;
         }
     }
@@ -741,11 +736,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_create() */
+} /* H5AC_create() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_dest
+ * Function:    H5AC_dest
  *
  * Purpose:     Flushes all data to disk and destroys the cache.
  *              This function fails if any object are protected since the
@@ -763,8 +758,8 @@ done:
  *		metadata cache.
  *                                                 JRM - 5/12/04
  *
- *		Abstracted the guts of the function to H5C2_dest() in H5C.c,
- *		and then re-wrote the function as a wrapper for H5C2_dest().
+ *		Abstracted the guts of the function to H5C_dest() in H5C.c,
+ *		and then re-wrote the function as a wrapper for H5C_dest().
  *
  *                                                 JRM - 6/7/04
  *
@@ -783,42 +778,42 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC2_dest(H5F_t *f, hid_t dxpl_id)
+H5AC_dest(H5F_t *f, hid_t dxpl_id)
 {
-    H5AC2_t *cache = NULL;
+    H5AC_t *cache = NULL;
     herr_t ret_value=SUCCEED;      /* Return value */
 #ifdef H5_HAVE_PARALLEL
-    H5AC2_aux_t * aux_ptr = NULL;
+    H5AC_aux_t * aux_ptr = NULL;
 #endif /* H5_HAVE_PARALLEL */
 
-    FUNC_ENTER_NOAPI(H5AC2_dest, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_dest, FAIL)
 
     assert(f);
-    assert(f->shared->cache2);
-    cache = f->shared->cache2;
+    assert(f->shared->cache);
+    cache = f->shared->cache;
 #ifdef H5_HAVE_PARALLEL
     aux_ptr = cache->aux_ptr;
 
     if ( aux_ptr != NULL ) {
 
-        HDassert ( aux_ptr->magic == H5AC2__H5AC2_AUX_T_MAGIC );
+        HDassert ( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
     }
 #endif /* H5_HAVE_PARALLEL */
 
-#if H5AC2__TRACE_FILE_ENABLED
-    if ( H5AC2_close_trace_file(cache) < 0 ) {
+#if H5AC__TRACE_FILE_ENABLED
+    if ( H5AC_close_trace_file(cache) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5AC2_close_trace_file() failed.")
+                    "H5AC_close_trace_file() failed.")
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    if ( H5C2_dest(f, dxpl_id) < 0 ) {
+    if ( H5C_dest(f, dxpl_id) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFREE, FAIL, "can't destroy cache")
     }
 
-    f->shared->cache2 = NULL;
+    f->shared->cache = NULL;
 
 #ifdef H5_HAVE_PARALLEL
     if ( aux_ptr != NULL ) {
@@ -834,7 +829,7 @@ H5AC2_dest(H5F_t *f, hid_t dxpl_id)
         }
 
         aux_ptr->magic = 0;
-        H5FL_FREE(H5AC2_aux_t, aux_ptr);
+        H5FL_FREE(H5AC_aux_t, aux_ptr);
         aux_ptr = NULL;
     }
 #endif /* H5_HAVE_PARALLEL */
@@ -843,15 +838,15 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_dest() */
+} /* H5AC_dest() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_begin_transaction()
+ * Function:    H5AC_begin_transaction()
  *
  * Purpose:	Mark the beginning of a transaction.
  *
- * 		This function is just a wrapper for H5C2_begin_transaction().
+ * 		This function is just a wrapper for H5C_begin_transaction().
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -866,7 +861,7 @@ done:
  */
 
 herr_t
-H5AC2_begin_transaction(hid_t id,
+H5AC_begin_transaction(hid_t id,
 		        hbool_t * do_transaction_ptr,
 			H5O_loc_t * id_oloc_ptr,
 			hbool_t * id_oloc_open_ptr,
@@ -877,14 +872,14 @@ H5AC2_begin_transaction(hid_t id,
     herr_t 	result;
     H5G_loc_t 	id_loc;
     H5F_t * 	f = NULL;
-    H5AC2_t * 	cache_ptr = NULL;
+    H5AC_t * 	cache_ptr = NULL;
     herr_t    	ret_value = SUCCEED;      /* Return value */
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     char                trace[256] = "";
     FILE *              trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    FUNC_ENTER_NOAPI(H5AC2_begin_transaction, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_begin_transaction, FAIL)
 
     HDassert( do_transaction_ptr != NULL );
     HDassert( id_oloc_ptr != NULL );
@@ -893,17 +888,17 @@ H5AC2_begin_transaction(hid_t id,
     HDassert( trans_num_ptr != NULL );
     HDassert( api_call_name != NULL );
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the begin transaction call, only the transaction number and the
      * api call name.  Write the return value to catch occult errors.
      */
     if ( ( cache_ptr != NULL ) &&
-         ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
+         ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
-        sprintf(trace, "H5AC2_begin_transaction %s", api_call_name);
+        sprintf(trace, "H5AC_begin_transaction %s", api_call_name);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     *id_oloc_open_ptr = FALSE;
     *transaction_begun_ptr = FALSE;
@@ -958,19 +953,19 @@ H5AC2_begin_transaction(hid_t id,
 
 	if ( ( f == NULL ) ||
 	     ( f->shared == NULL ) ||
-	     ( f->shared->cache2 == NULL ) ) {
+	     ( f->shared->cache == NULL ) ) {
 
 	   HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, "can't get cache_ptr.");
 	}
 
-        cache_ptr = f->shared->cache2;
+        cache_ptr = f->shared->cache;
 
-        result = H5C2_begin_transaction(cache_ptr, trans_num_ptr, api_call_name);
+        result = H5C_begin_transaction(cache_ptr, trans_num_ptr, api_call_name);
 
         if ( result < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_begin_transaction() failed.")
+                        "H5C_begin_transaction() failed.")
         }
 
 	*transaction_begun_ptr = TRUE;
@@ -978,28 +973,28 @@ H5AC2_begin_transaction(hid_t id,
 
 done:
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
 	HDfprintf(trace_file_ptr, "%s %llu %d\n", trace,
                   *trans_num_ptr, (int)ret_value);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_begin_transaction() */
+} /* H5AC_begin_transaction() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_check_for_journaling()
+ * Function:    H5AC_check_for_journaling()
  *
  * Purpose:	Check the newly opened file for ongoing journaling.
  *              Fail if it exists and the journal recovered flag is
  *              not set.
  *
  * 		This function is just a wrapper for
- * 		H5C2_check_for_journaling().
+ * 		H5C_check_for_journaling().
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -1014,37 +1009,37 @@ done:
  */
 
 herr_t
-H5AC2_check_for_journaling(H5F_t * f,
+H5AC_check_for_journaling(H5F_t * f,
                            hid_t dxpl_id,
-                           H5C2_t * cache_ptr,
+                           H5C_t * cache_ptr,
 			   hbool_t journal_recovered)
 {
     herr_t result;
     herr_t ret_value = SUCCEED;      /* Return value */
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     char                trace[256] = "";
     FILE *              trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    FUNC_ENTER_NOAPI(H5AC2_check_for_journaling, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_check_for_journaling, FAIL)
 
     HDassert( f );
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the end transaction call, only the journal_recovered
      * parameter is really needed.  Write the return value to catch
      * occult errors.
      */
     if ( ( cache_ptr != NULL ) &&
-         ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
+         ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
-        sprintf(trace, "H5AC2_check_for_journaling %d ",
+        sprintf(trace, "H5AC_check_for_journaling %d ",
 		(int)journal_recovered);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     /* test to see if there is a metadata journal that must be recovered
      * before we can access the file.  Do this at the end of file open,
@@ -1052,31 +1047,31 @@ H5AC2_check_for_journaling(H5F_t * f,
      * time.
      */
 
-    result = H5C2_check_for_journaling(f, dxpl_id, cache_ptr,
+    result = H5C_check_for_journaling(f, dxpl_id, cache_ptr,
 		                       journal_recovered);
 
     if ( result != SUCCEED ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTCREATE, FAIL, \
-                    "H5C2_check_for_journaling() reports failure.")
+                    "H5C_check_for_journaling() reports failure.")
     }
 
 done:
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
 	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_check_for_journaling() */
+} /* H5AC_check_for_journaling() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_deregister_mdjsc_callback()
+ * Function:    H5AC_deregister_mdjsc_callback()
  *
  * Purpose:	Deregister a metadata journaling status change callback.
  *
@@ -1093,69 +1088,69 @@ done:
  */
 
 herr_t
-H5AC2_deregister_mdjsc_callback(H5F_t * file_ptr,
+H5AC_deregister_mdjsc_callback(H5F_t * file_ptr,
                                 int32_t idx)
 {
     herr_t    result;
     herr_t    ret_value = SUCCEED;      /* Return value */
-    H5C2_t *  cache_ptr = NULL;
-#if H5AC2__TRACE_FILE_ENABLED
+    H5C_t *  cache_ptr = NULL;
+#if H5AC__TRACE_FILE_ENABLED
     char      trace[256] = "";
     FILE *    trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    FUNC_ENTER_NOAPI(H5AC2_deregister_mdjsc_callback, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_deregister_mdjsc_callback, FAIL)
 
     if ( ( file_ptr == NULL ) ||
-	 ( ( cache_ptr = file_ptr->shared->cache2 ) == NULL ) ) {
+	 ( ( cache_ptr = file_ptr->shared->cache ) == NULL ) ) {
 
          HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
 		     "Invalid parameter(s) on entry.");
     }
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the deregister metadata journaling status change callback
      * call, only the idx is really needed.  Write the return value to
      * catch occult errors.
      */
     if ( ( cache_ptr != NULL )
          &&
-         ( H5C2_get_trace_file_ptr((H5C2_t *)cache_ptr, &trace_file_ptr) >= 0 )
+         ( H5C_get_trace_file_ptr((H5C_t *)cache_ptr, &trace_file_ptr) >= 0 )
          &&
          ( trace_file_ptr != NULL ) ) {
 
-        sprintf(trace, "H5AC2_deregister_mdjsc_callback %d ", idx);
+        sprintf(trace, "H5AC_deregister_mdjsc_callback %d ", idx);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    result = H5C2_deregister_mdjsc_callback(cache_ptr, idx);
+    result = H5C_deregister_mdjsc_callback(cache_ptr, idx);
 
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_deregister_mdjsc_callback() failed.");
+                    "H5C_deregister_mdjsc_callback() failed.");
     }
 
 done:
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
 	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_deregister_mdjsc_callback() */
+} /* H5AC_deregister_mdjsc_callback() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_end_transaction()
+ * Function:    H5AC_end_transaction()
  *
  * Purpose:	Mark the end of a transaction.
  *
- * 		This function is just a wrapper for H5C2_end_transaction().
+ * 		This function is just a wrapper for H5C_end_transaction().
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -1170,7 +1165,7 @@ done:
  */
 
 herr_t
-H5AC2_end_transaction(hbool_t do_transaction,
+H5AC_end_transaction(hbool_t do_transaction,
                       H5O_loc_t * id_oloc_ptr,
                       hbool_t id_oloc_open,
                       hbool_t transaction_begun,
@@ -1181,30 +1176,30 @@ H5AC2_end_transaction(hbool_t do_transaction,
     herr_t    result;
     herr_t    ret_value=SUCCEED;      /* Return value */
     H5F_t *   f = NULL;
-    H5AC2_t * cache_ptr = NULL;
-#if H5AC2__TRACE_FILE_ENABLED
+    H5AC_t * cache_ptr = NULL;
+#if H5AC__TRACE_FILE_ENABLED
     char      trace[256] = "";
     FILE *    trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    FUNC_ENTER_NOAPI(H5AC2_end_transaction, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_end_transaction, FAIL)
 
     HDassert( id_oloc_ptr != NULL );
     HDassert( api_call_name != NULL );
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the end transaction call, only the transaction number and the
      * api call name are really needed.  Write the return value to catch
      * occult errors.
      */
     if ( ( cache_ptr != NULL ) &&
-         ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
+         ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
-        sprintf(trace, "H5AC2_end_transaction %s %llu",
+        sprintf(trace, "H5AC_end_transaction %s %llu",
                 api_call_name, trans_num);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     if ( do_transaction ) {
 
@@ -1214,21 +1209,21 @@ H5AC2_end_transaction(hbool_t do_transaction,
 
 	    if ( ( f == NULL ) ||
 	         ( f->shared == NULL ) ||
-	         ( f->shared->cache2 == NULL ) ) {
+	         ( f->shared->cache == NULL ) ) {
 
 	       HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
 			   "can't get cache_ptr.");
 	    }
 
-            cache_ptr = f->shared->cache2;
+            cache_ptr = f->shared->cache;
 
-            result = H5C2_end_transaction(f, dxpl_id, cache_ptr,
+            result = H5C_end_transaction(f, dxpl_id, cache_ptr,
 			                  trans_num, api_call_name);
 
             if ( result < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                            "H5C2_end_transaction() failed.")
+                            "H5C_end_transaction() failed.")
             }
 	}
 
@@ -1246,20 +1241,20 @@ H5AC2_end_transaction(hbool_t do_transaction,
 
 done:
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
 	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_end_transaction() */
+} /* H5AC_end_transaction() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_register_mdjsc_callback()
+ * Function:    H5AC_register_mdjsc_callback()
  *
  * Purpose:	Register a metadata journaling status change callback,
  *              and return the index assigned to the callback in *idx_ptr.
@@ -1280,24 +1275,24 @@ done:
  */
 
 herr_t
-H5AC2_register_mdjsc_callback(const H5F_t * file_ptr,
-                              H5C2_mdj_status_change_func_t fcn_ptr,
+H5AC_register_mdjsc_callback(const H5F_t * file_ptr,
+                              H5C_mdj_status_change_func_t fcn_ptr,
                               void * data_ptr,
                               int32_t * idx_ptr,
-                              H5C2_mdj_config_t * config_ptr)
+                              H5C_mdj_config_t * config_ptr)
 {
     herr_t    result;
     herr_t    ret_value=SUCCEED;      /* Return value */
-    H5C2_t *  cache_ptr;
-#if H5AC2__TRACE_FILE_ENABLED
+    H5C_t *  cache_ptr;
+#if H5AC__TRACE_FILE_ENABLED
     char      trace[256] = "";
     FILE *    trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    FUNC_ENTER_NOAPI(H5AC2_register_mdjsc_callback, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_register_mdjsc_callback, FAIL)
 
     if ( ( file_ptr == NULL ) ||
-	 ( ( cache_ptr = file_ptr->shared->cache2 ) == NULL ) ||
+	 ( ( cache_ptr = file_ptr->shared->cache ) == NULL ) ||
 	 ( fcn_ptr == NULL ) ||
 	 ( idx_ptr == NULL ) ) {
 
@@ -1305,21 +1300,21 @@ H5AC2_register_mdjsc_callback(const H5F_t * file_ptr,
 		     "Invalid parameter(s) on entry.");
     }
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the register metadata journaling status change callback
      * call, fnc_ptr, data_ptr, and the returned idx are all that
      * are needed.  Write the return value to catch occult errors.
      */
     if ( ( cache_ptr != NULL ) &&
-         ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
+         ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
-       sprintf(trace, "H5AC2_register_mdjsc_callback 0x%lx 0x%lx ",
+       sprintf(trace, "H5AC_register_mdjsc_callback 0x%lx 0x%lx ",
                (unsigned long)(fcn_ptr), (unsigned long)(data_ptr));
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    result = H5C2_register_mdjsc_callback(cache_ptr,
+    result = H5C_register_mdjsc_callback(cache_ptr,
                                           fcn_ptr,
                                           data_ptr,
                                           idx_ptr);
@@ -1327,37 +1322,37 @@ H5AC2_register_mdjsc_callback(const H5F_t * file_ptr,
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_register_mdjsc_callback() failed.");
+                    "H5C_register_mdjsc_callback() failed.");
     }
 
     if ( config_ptr != NULL ) {
 
-        result = H5C2_get_journal_config((H5C2_t *)cache_ptr, config_ptr);
+        result = H5C_get_journal_config((H5C_t *)cache_ptr, config_ptr);
 
         if ( result < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_get_journal_config() failed.");
+                        "H5C_get_journal_config() failed.");
         }
     }
 
 done:
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
 	HDfprintf(trace_file_ptr, "%s %d %d\n",
                   trace, *idx_ptr, (int)ret_value);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_register_mdjsc_callback() */
+} /* H5AC_register_mdjsc_callback() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_expunge_entry
+ * Function:    H5AC_expunge_entry
  *
  * Purpose:	Expunge the target entry from the cache without writing it
  * 		to disk even if it is dirty.  The entry must not be either
@@ -1377,45 +1372,45 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC2_expunge_entry(H5F_t *f,
+H5AC_expunge_entry(H5F_t *f,
 		   hid_t dxpl_id,
-		   const H5AC2_class_t *type,
+		   const H5AC_class_t *type,
 		   haddr_t addr)
 {
     herr_t    result;
     herr_t    ret_value=SUCCEED;      /* Return value */
-    H5AC2_t * cache_ptr = NULL;
-#if H5AC2__TRACE_FILE_ENABLED
+    H5AC_t * cache_ptr = NULL;
+#if H5AC__TRACE_FILE_ENABLED
     char                trace[128] = "";
     FILE *              trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    FUNC_ENTER_NOAPI(H5AC2_expunge_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_expunge_entry, FAIL)
 
     HDassert(f);
     HDassert(f->shared);
-    HDassert(f->shared->cache2);
+    HDassert(f->shared->cache);
     HDassert(type);
     HDassert(H5F_addr_defined(addr));
 
-    cache_ptr = f->shared->cache2;
+    cache_ptr = f->shared->cache;
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the expunge entry call, only the addr, and type id are really
      * necessary in the trace file.  Write the return value to catch occult
      * errors.
      */
     if ( ( cache_ptr != NULL ) &&
-         ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
+         ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
-        sprintf(trace, "H5AC2_expunge_entry 0x%lx %d",
+        sprintf(trace, "H5AC_expunge_entry 0x%lx %d",
 	        (unsigned long)addr,
 		(int)(type->id));
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    result = H5C2_expunge_entry(f,
+    result = H5C_expunge_entry(f,
 		                dxpl_id,
 				type,
 				addr);
@@ -1423,25 +1418,25 @@ H5AC2_expunge_entry(H5F_t *f,
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, \
-                    "H5C2_expunge_entry() failed.")
+                    "H5C_expunge_entry() failed.")
     }
 
 done:
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
 	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_expunge_entry() */
+} /* H5AC_expunge_entry() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_flush
+ * Function:    H5AC_flush
  *
  * Purpose:	Flush (and possibly destroy) the metadata cache associated
  *		with the specified file.
@@ -1460,7 +1455,7 @@ done:
  *		code changed, but values other than NULL and HADDR_UNDEF
  *		respectively are errors.  If all goes well, they should
  *		be removed, and the function renamed to something more
- *		descriptive -- perhaps H5AC2_flush_cache.
+ *		descriptive -- perhaps H5AC_flush_cache.
  *
  *		If the cache contains protected entries, the function will
  *		fail, as protected entries cannot be flushed.  However
@@ -1496,15 +1491,15 @@ done:
  *
  *		Complete re-write. See above for details.  -- JRM 5/11/04
  *
- *		Abstracted the guts of the function to H5C2_flush_cache()
+ *		Abstracted the guts of the function to H5C_flush_cache()
  *		in H5C.c, and then re-wrote the function as a wrapper for
- *		H5C2_flush_cache().
+ *		H5C_flush_cache().
  *
  *                                                 JRM - 6/7/04
  *
  *		JRM - 7/5/05
  *		Modified function as part of a fix for a cache coherency
- *		bug in PHDF5.  See the header comments on the H5AC2_aux_t
+ *		bug in PHDF5.  See the header comments on the H5AC_aux_t
  *		structure for details.
  *
  *		JRM -- 5/11/06
@@ -1520,48 +1515,48 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC2_flush(H5F_t *f, hid_t dxpl_id, unsigned flags)
+H5AC_flush(H5F_t *f, hid_t dxpl_id, unsigned flags)
 {
     herr_t	  status;
     herr_t	  ret_value = SUCCEED;      /* Return value */
 #ifdef H5_HAVE_PARALLEL
-    H5AC2_aux_t	* aux_ptr = NULL;
+    H5AC_aux_t	* aux_ptr = NULL;
     int		  mpi_code;
 #endif /* H5_HAVE_PARALLEL */
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     char 	  trace[128] = "";
     FILE *	  trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
 
-    FUNC_ENTER_NOAPI(H5AC2_flush, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_flush, FAIL)
 
     HDassert(f);
     HDassert(f->shared);
-    HDassert(f->shared->cache2);
+    HDassert(f->shared->cache);
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the flush, only the flags are really necessary in the trace file.
      * Write the result to catch occult errors.
      */
     if ( ( f != NULL ) &&
          ( f->shared != NULL ) &&
-	 ( f->shared->cache2 != NULL ) &&
-	 ( H5C2_get_trace_file_ptr(f->shared->cache2, &trace_file_ptr) >= 0) &&
+	 ( f->shared->cache != NULL ) &&
+	 ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) &&
 	 ( trace_file_ptr != NULL ) ) {
 
-	sprintf(trace, "H5AC2_flush 0x%x", flags);
+	sprintf(trace, "H5AC_flush 0x%x", flags);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
 #ifdef H5_HAVE_PARALLEL
-    aux_ptr = f->shared->cache2->aux_ptr;
+    aux_ptr = f->shared->cache->aux_ptr;
 
     if ( aux_ptr != NULL ) {
 
-#if H5AC2_DEBUG_DIRTY_BYTES_CREATION
+#if H5AC_DEBUG_DIRTY_BYTES_CREATION
         HDfprintf(stdout,
-                  "%d::H5AC2_flush: (u/uu/i/iu/r/ru) = %d/%d/%d/%d/%d/%d\n",
+                  "%d::H5AC_flush: (u/uu/i/iu/r/ru) = %d/%d/%d/%d/%d/%d\n",
                   (int)(aux_ptr->mpi_rank),
                   (int)(aux_ptr->unprotect_dirty_bytes),
                   (int)(aux_ptr->unprotect_dirty_bytes_updates),
@@ -1569,7 +1564,7 @@ H5AC2_flush(H5F_t *f, hid_t dxpl_id, unsigned flags)
                   (int)(aux_ptr->insert_dirty_bytes_updates),
                   (int)(aux_ptr->rename_dirty_bytes),
                   (int)(aux_ptr->rename_dirty_bytes_updates));
-#endif /* H5AC2_DEBUG_DIRTY_BYTES_CREATION */
+#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
 
         /* to prevent "messages from the future" we must synchronize all
          * processes before we start the flush.  Hence the following
@@ -1585,19 +1580,19 @@ H5AC2_flush(H5F_t *f, hid_t dxpl_id, unsigned flags)
          * flush first.
          */
         if ( ( aux_ptr->mpi_rank == 0 ) &&
-             ( (flags & H5AC2__FLUSH_CLEAR_ONLY_FLAG) == 0 ) ) {
+             ( (flags & H5AC__FLUSH_CLEAR_ONLY_FLAG) == 0 ) ) {
 
-            unsigned init_flush_flags = H5AC2__NO_FLAGS_SET;
+            unsigned init_flush_flags = H5AC__NO_FLAGS_SET;
 
-            if ( ( (flags & H5AC2__FLUSH_MARKED_ENTRIES_FLAG) != 0 ) &&
-                 ( (flags & H5AC2__FLUSH_INVALIDATE_FLAG) == 0 ) ) {
+            if ( ( (flags & H5AC__FLUSH_MARKED_ENTRIES_FLAG) != 0 ) &&
+                 ( (flags & H5AC__FLUSH_INVALIDATE_FLAG) == 0 ) ) {
 
-                init_flush_flags |= H5AC2__FLUSH_MARKED_ENTRIES_FLAG;
+                init_flush_flags |= H5AC__FLUSH_MARKED_ENTRIES_FLAG;
             }
 
 	    aux_ptr->write_permitted = TRUE;
 
-            status = H5C2_flush_cache(f,
+            status = H5C_flush_cache(f,
                                       dxpl_id,
                                       init_flush_flags);
 
@@ -1615,14 +1610,14 @@ H5AC2_flush(H5F_t *f, hid_t dxpl_id, unsigned flags)
 
         } /* end if ( aux_ptr->mpi_rank == 0 ) */
 
-        status = H5AC2_propagate_flushed_and_still_clean_entries_list(f,
-                                                          H5AC2_noblock_dxpl_id,
-                                                          f->shared->cache2,
+        status = H5AC_propagate_flushed_and_still_clean_entries_list(f,
+                                                          H5AC_noblock_dxpl_id,
+                                                          f->shared->cache,
                                                           FALSE);
     } /* end if ( aux_ptr != NULL ) */
 #endif /* H5_HAVE_PARALLEL */
 
-    status = H5C2_flush_cache(f,
+    status = H5C_flush_cache(f,
 		              dxpl_id,
 			      flags);
 
@@ -1633,20 +1628,20 @@ H5AC2_flush(H5F_t *f, hid_t dxpl_id, unsigned flags)
 
 done:
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
         HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_flush() */
+} /* H5AC_flush() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_get_entry_status
+ * Function:    H5AC_get_entry_status
  *
  * Purpose:     Given a file address, determine whether the metadata
  * 		cache contains an entry at that location.  If it does,
@@ -1674,7 +1669,7 @@ done:
  */
 
 herr_t
-H5AC2_get_entry_status(H5F_t *    f,
+H5AC_get_entry_status(H5F_t *    f,
                       haddr_t    addr,
 		      unsigned * status_ptr)
 {
@@ -1687,39 +1682,39 @@ H5AC2_get_entry_status(H5F_t *    f,
     size_t	entry_size;
     unsigned	status = 0;
 
-    FUNC_ENTER_NOAPI(H5AC2_get_entry_status, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_get_entry_status, FAIL)
 
     if ( ( f == NULL ) ||
          ( f->shared == NULL ) ||
-	 ( f->shared->cache2 == NULL ) ||
-         ( f->shared->cache2->magic != H5C2__H5C2_T_MAGIC ) ||
+	 ( f->shared->cache == NULL ) ||
+         ( f->shared->cache->magic != H5C__H5C_T_MAGIC ) ||
 	 ( ! H5F_addr_defined(addr) ) ||
 	 ( status_ptr == NULL ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad param(s) on entry.")
     }
 
-    result = H5C2_get_entry_status(f, addr, &entry_size, &in_cache,
+    result = H5C_get_entry_status(f, addr, &entry_size, &in_cache,
 		                  &is_dirty, &is_protected, &is_pinned);
 
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_get_entry_status() failed.")
+                    "H5C_get_entry_status() failed.")
     }
 
     if ( in_cache ) {
 
-	status |= H5AC2_ES__IN_CACHE;
+	status |= H5AC_ES__IN_CACHE;
 
 	if ( is_dirty )
-	    status |= H5AC2_ES__IS_DIRTY;
+	    status |= H5AC_ES__IS_DIRTY;
 
 	if ( is_protected )
-	    status |= H5AC2_ES__IS_PROTECTED;
+	    status |= H5AC_ES__IS_PROTECTED;
 
 	if ( is_pinned )
-	    status |= H5AC2_ES__IS_PINNED;
+	    status |= H5AC_ES__IS_PINNED;
     }
 
     *status_ptr = status;
@@ -1728,11 +1723,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_get_entry_status() */
+} /* H5AC_get_entry_status() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_set
+ * Function:    H5AC_set
  *
  * Purpose:     Adds the specified thing to the cache.  The thing need not
  *              exist on disk yet, but it must have an address and disk
@@ -1760,9 +1755,9 @@ done:
  *		at the beginning of the function.
  *
  *		JRM - 6/7/04
- *		Abstracted the guts of the function to H5C2_insert_entry()
+ *		Abstracted the guts of the function to H5C_insert_entry()
  *		in H5C.c, and then re-wrote the function as a wrapper for
- *		H5C2_insert_entry().
+ *		H5C_insert_entry().
  *
  *		JRM - 1/6/05
  *		Added the flags parameter.  At present, this parameter is
@@ -1770,7 +1765,7 @@ done:
  *		entry.  Since this doesn't apply to the SAP code, no change
  *		is needed there.  Thus the only change to the body of the
  *		code is to pass the flags parameter through to
- *		H5C2_insert_entry().
+ *		H5C_insert_entry().
  *
  *		JRM - 6/6/05
  *		Added code to force newly inserted entries to be dirty
@@ -1797,31 +1792,31 @@ done:
  */
 
 herr_t
-H5AC2_set(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type, haddr_t addr, size_t len, void *thing, unsigned int flags)
+H5AC_set(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, size_t len, void *thing, unsigned int flags)
 {
     herr_t		result;
-    H5AC2_info_t        *info;
+    H5AC_info_t        *info;
     herr_t ret_value=SUCCEED;      /* Return value */
 #ifdef H5_HAVE_PARALLEL
-    H5AC2_aux_t        * aux_ptr = NULL;
+    H5AC_aux_t        * aux_ptr = NULL;
 #endif /* H5_HAVE_PARALLEL */
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     char          	trace[128] = "";
     size_t              trace_entry_size = 0;
     FILE *        	trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    FUNC_ENTER_NOAPI(H5AC2_set, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_set, FAIL)
 
     HDassert(f);
     HDassert(f->shared);
-    HDassert(f->shared->cache2);
+    HDassert(f->shared->cache);
     HDassert(type);
     HDassert(type->serialize);
     HDassert(H5F_addr_defined(addr));
     HDassert(thing);
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the insert, only the addr, size, type id and flags are really
      * necessary in the trace file.  Write the result to catch occult
      * errors.
@@ -1831,31 +1826,31 @@ H5AC2_set(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type, haddr_t addr, size
      */
     if ( ( f != NULL ) &&
          ( f->shared != NULL ) &&
-         ( f->shared->cache2 != NULL ) &&
-         ( H5C2_get_trace_file_ptr(f->shared->cache2, &trace_file_ptr) >= 0) &&
+         ( f->shared->cache != NULL ) &&
+         ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) &&
          ( trace_file_ptr != NULL ) ) {
 
-        sprintf(trace, "H5AC2_set 0x%lx %ld %d 0x%x",
+        sprintf(trace, "H5AC_set 0x%lx %ld %d 0x%x",
 	        (unsigned long)addr,
 		(long)len,
 		type->id,
 		flags);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     /* Get local copy of this information */
-    info = (H5AC2_info_t *)thing;
+    info = (H5AC_info_t *)thing;
 
     info->addr = addr;
     info->type = type;
     info->is_protected = FALSE;
 
 #ifdef H5_HAVE_PARALLEL
-    if ( NULL != (aux_ptr = f->shared->cache2->aux_ptr) ) {
+    if ( NULL != (aux_ptr = f->shared->cache->aux_ptr) ) {
 
-        result = H5AC2_log_inserted_entry(f,
-                                          f->shared->cache2,
-                                          (H5AC2_info_t *)thing,
+        result = H5AC_log_inserted_entry(f,
+                                          f->shared->cache,
+                                          (H5AC_info_t *)thing,
                                           type,
                                           addr,
                                           len);
@@ -1863,12 +1858,12 @@ H5AC2_set(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type, haddr_t addr, size
         if ( result < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, \
-                    "H5AC2_log_inserted_entry() failed.")
+                    "H5AC_log_inserted_entry() failed.")
         }
     }
 #endif /* H5_HAVE_PARALLEL */
 
-    result = H5C2_insert_entry(f,
+    result = H5C_insert_entry(f,
 		               dxpl_id,
 			       type,
 			       addr,
@@ -1878,24 +1873,24 @@ H5AC2_set(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type, haddr_t addr, size
 
     if ( result < 0 ) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, "H5C2_insert_entry() failed")
+        HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, "H5C_insert_entry() failed")
     }
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
         /* make note of the entry size */
-        trace_entry_size = ((H5C2_cache_entry_t *)thing)->size;
+        trace_entry_size = ((H5C_cache_entry_t *)thing)->size;
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
 #ifdef H5_HAVE_PARALLEL
     if ( ( aux_ptr != NULL ) &&
          ( aux_ptr->dirty_bytes >= aux_ptr->dirty_bytes_threshold ) ) {
 
-        result = H5AC2_propagate_flushed_and_still_clean_entries_list(f,
-                                                          H5AC2_noblock_dxpl_id,
-                                                          f->shared->cache2,
+        result = H5AC_propagate_flushed_and_still_clean_entries_list(f,
+                                                          H5AC_noblock_dxpl_id,
+                                                          f->shared->cache,
                                                           TRUE);
         if ( result < 0 ) {
 
@@ -1907,22 +1902,22 @@ H5AC2_set(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type, haddr_t addr, size
 
 done:
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
 	HDfprintf(trace_file_ptr, "%s %d %d\n", trace,
                   (int)trace_entry_size,
 		  (int)ret_value);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_set() */
+} /* H5AC_set() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_mark_pinned_entry_dirty
+ * Function:    H5AC_mark_pinned_entry_dirty
  *
  * Purpose:	Mark a pinned entry as dirty.  The target entry MUST be
  * 		be pinned, and MUST be unprotected.
@@ -1938,41 +1933,41 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC2_mark_pinned_entry_dirty(void *  thing,
+H5AC_mark_pinned_entry_dirty(void *  thing,
 			      hbool_t size_changed,
                               size_t  new_size)
 {
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     char          	trace[128] = "";
     FILE *        	trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_mark_pinned_entry_dirty, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_mark_pinned_entry_dirty, FAIL)
 
     /* Sanity check */
     HDassert(thing);
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the mark pinned entry dirty call, only the addr, size_changed,
      * and new_size are really necessary in the trace file. Write the result
      * to catch occult errors.
      */
-    if((H5C2_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
+    if((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
          (NULL != trace_file_ptr))
         sprintf(trace, "%s 0x%lx %d %d", FUNC,
-	        (unsigned long)(((H5C2_cache_entry_t *)thing)->addr),
+	        (unsigned long)(((H5C_cache_entry_t *)thing)->addr),
 		(int)size_changed,
 		(int)new_size);
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
 #ifdef H5_HAVE_PARALLEL
 {
-    H5AC2_info_t *entry_ptr = (H5AC2_info_t *)thing;
-    H5C2_t *cache_ptr = entry_ptr->cache_ptr;
+    H5AC_info_t *entry_ptr = (H5AC_info_t *)thing;
+    H5C_t *cache_ptr = entry_ptr->cache_ptr;
 
     HDassert(cache_ptr);
-    HDassert(cache_ptr->magic == H5C2__H5C2_T_MAGIC);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     if((!entry_ptr->is_dirty) && (NULL != cache_ptr->aux_ptr)) {
         /* Check for usage errors */
@@ -1981,32 +1976,32 @@ H5AC2_mark_pinned_entry_dirty(void *  thing,
         if(entry_ptr->is_protected)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTMARKDIRTY, FAIL, "Entry is protected??")
 
-        if(H5AC2_log_dirtied_entry(entry_ptr, entry_ptr->addr, size_changed, new_size) < 0)
+        if(H5AC_log_dirtied_entry(entry_ptr, entry_ptr->addr, size_changed, new_size) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTMARKDIRTY, FAIL, "can't log dirtied entry")
     } /* end if */
 }
 #endif /* H5_HAVE_PARALLEL */
 
-    if(H5C2_mark_pinned_entry_dirty(thing, size_changed, new_size) < 0)
+    if(H5C_mark_pinned_entry_dirty(thing, size_changed, new_size) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTMARKDIRTY, FAIL, "can't mark pinned entry dirty")
 
 done:
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if(trace_file_ptr)
 	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5AC2_mark_pinned_entry_dirty() */
+} /* H5AC_mark_pinned_entry_dirty() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_mark_pinned_or_protected_entry_dirty
+ * Function:    H5AC_mark_pinned_or_protected_entry_dirty
  *
  * Purpose:	Mark a pinned or protected entry as dirty.  The target
  * 		entry MUST be either pinned, protected, or both.
  *
- * 		Unlike H5AC2_mark_pinned_entry_dirty(), this function does
+ * 		Unlike H5AC_mark_pinned_entry_dirty(), this function does
  * 		not support size changes.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -2017,61 +2012,61 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC2_mark_pinned_or_protected_entry_dirty(void *thing)
+H5AC_mark_pinned_or_protected_entry_dirty(void *thing)
 {
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     char          	trace[128] = "";
     FILE *        	trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_mark_pinned_or_protected_entry_dirty, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_mark_pinned_or_protected_entry_dirty, FAIL)
 
     /* Sanity check */
     HDassert(thing);
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the mark pinned or protected entry dirty call, only the addr
      * is really necessary in the trace file.  Write the result to catch
      * occult errors.
      */
-    if((H5C2_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
+    if((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
          (NULL != trace_file_ptr))
         sprintf(trace, "%s 0x%lx", FUNC,
-	        (unsigned long)(((H5C2_cache_entry_t *)thing)->addr));
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+	        (unsigned long)(((H5C_cache_entry_t *)thing)->addr));
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
 #ifdef H5_HAVE_PARALLEL
 {
-    H5AC2_info_t *entry_ptr = (H5AC2_info_t *)thing;
-    H5C2_t *cache_ptr = entry_ptr->cache_ptr;
+    H5AC_info_t *entry_ptr = (H5AC_info_t *)thing;
+    H5C_t *cache_ptr = entry_ptr->cache_ptr;
 
     HDassert(cache_ptr);
-    HDassert(cache_ptr->magic == H5C2__H5C2_T_MAGIC);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     if((!entry_ptr->is_dirty) && (!entry_ptr->is_protected) &&
              (entry_ptr->is_pinned) && (NULL != cache_ptr->aux_ptr)) {
-        if(H5AC2_log_dirtied_entry(entry_ptr, entry_ptr->addr, FALSE, 0) < 0)
+        if(H5AC_log_dirtied_entry(entry_ptr, entry_ptr->addr, FALSE, 0) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTMARKDIRTY, FAIL, "can't log dirtied entry")
     } /* end if */
 }
 #endif /* H5_HAVE_PARALLEL */
 
-    if(H5C2_mark_pinned_or_protected_entry_dirty(thing) < 0)
+    if(H5C_mark_pinned_or_protected_entry_dirty(thing) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTMARKDIRTY, FAIL, "can't mark pinned or protected entry dirty")
 
 done:
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if(trace_file_ptr)
 	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5AC2_mark_pinned_entry_dirty() */
+} /* H5AC_mark_pinned_entry_dirty() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_rename
+ * Function:    H5AC_rename
  *
  * Purpose:     Use this function to notify the cache that an object's
  *              file address changed.
@@ -2090,9 +2085,9 @@ done:
  *		Complete rewrite for the new meta-data cache.
  *
  *		JRM - 6/7/04
- *		Abstracted the guts of the function to H5C2_rename_entry()
+ *		Abstracted the guts of the function to H5C_rename_entry()
  *		in H5C.c, and then re-wrote the function as a wrapper for
- *		H5C2_rename_entry().
+ *		H5C_rename_entry().
  *
  *              JRM - 7/5/05
  *              Added code to track dirty byte generation, and to trigger
@@ -2116,61 +2111,61 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC2_rename(H5F_t *f, const H5AC2_class_t *type, haddr_t old_addr, haddr_t new_addr)
+H5AC_rename(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t new_addr)
 {
     herr_t		result;
     herr_t ret_value=SUCCEED;      /* Return value */
 #ifdef H5_HAVE_PARALLEL
-    H5AC2_aux_t        * aux_ptr = NULL;
+    H5AC_aux_t        * aux_ptr = NULL;
 #endif /* H5_HAVE_PARALLEL */
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     char          	trace[128] = "";
     FILE *        	trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    FUNC_ENTER_NOAPI(H5AC2_rename, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_rename, FAIL)
 
     HDassert(f);
-    HDassert(f->shared->cache2);
+    HDassert(f->shared->cache);
     HDassert(type);
     HDassert(H5F_addr_defined(old_addr));
     HDassert(H5F_addr_defined(new_addr));
     HDassert(H5F_addr_ne(old_addr, new_addr));
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the rename call, only the old addr and new addr are really
      * necessary in the trace file.  Include the type id so we don't have to
      * look it up.  Also write the result to catch occult errors.
      */
     if ( ( f != NULL ) &&
          ( f->shared != NULL ) &&
-         ( f->shared->cache2 != NULL ) &&
-         ( H5C2_get_trace_file_ptr(f->shared->cache2, &trace_file_ptr) >= 0) &&
+         ( f->shared->cache != NULL ) &&
+         ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) &&
          ( trace_file_ptr != NULL ) ) {
 
-        sprintf(trace, "H5AC2_rename 0x%lx 0x%lx %d",
+        sprintf(trace, "H5AC_rename 0x%lx 0x%lx %d",
 	        (unsigned long)old_addr,
 		(unsigned long)new_addr,
 		(int)(type->id));
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
 #ifdef H5_HAVE_PARALLEL
-    if ( NULL != (aux_ptr = f->shared->cache2->aux_ptr) ) {
+    if ( NULL != (aux_ptr = f->shared->cache->aux_ptr) ) {
 
-        result = H5AC2_log_renamed_entry(f,
+        result = H5AC_log_renamed_entry(f,
                                         old_addr,
                                         new_addr);
 
         if ( result < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, \
-                    "H5AC2_log_renamed_entry() failed.")
+                    "H5AC_log_renamed_entry() failed.")
         }
     }
 #endif /* H5_HAVE_PARALLEL */
 
-    result = H5C2_rename_entry(f->shared->cache2,
+    result = H5C_rename_entry(f->shared->cache,
                                type,
                                old_addr,
                                new_addr);
@@ -2178,16 +2173,16 @@ H5AC2_rename(H5F_t *f, const H5AC2_class_t *type, haddr_t old_addr, haddr_t new_
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTRENAME, FAIL, \
-                    "H5C2_rename_entry() failed.")
+                    "H5C_rename_entry() failed.")
     }
 
 #ifdef H5_HAVE_PARALLEL
     if ( ( aux_ptr != NULL ) &&
          ( aux_ptr->dirty_bytes >= aux_ptr->dirty_bytes_threshold ) ) {
 
-        result = H5AC2_propagate_flushed_and_still_clean_entries_list(f,
-                                                          H5AC2_noblock_dxpl_id,
-                                                          f->shared->cache2,
+        result = H5AC_propagate_flushed_and_still_clean_entries_list(f,
+                                                          H5AC_noblock_dxpl_id,
+                                                          f->shared->cache,
                                                           TRUE);
         if ( result < 0 ) {
 
@@ -2199,20 +2194,20 @@ H5AC2_rename(H5F_t *f, const H5AC2_class_t *type, haddr_t old_addr, haddr_t new_
 
 done:
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
 	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_rename() */
+} /* H5AC_rename() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_pin_protected_entry()
+ * Function:    H5AC_pin_protected_entry()
  *
  * Purpose:	Pin a protected cache entry.  The entry must be protected
  *              at the time of call, and must be unpinned.
@@ -2225,53 +2220,53 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC2_pin_protected_entry(void *thing)
+H5AC_pin_protected_entry(void *thing)
 {
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     char        trace[128] = "";
     FILE *      trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_pin_protected_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_pin_protected_entry, FAIL)
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the pin protected entry call, only the addr is really necessary
      * in the trace file.  Also write the result to catch occult errors.
      */
-    if((H5C2_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
+    if((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
             (NULL != trace_file_ptr))
         sprintf(trace, "%s 0x%lx", FUNC,
-	        (unsigned long)(((H5C2_cache_entry_t *)thing)->addr));
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+	        (unsigned long)(((H5C_cache_entry_t *)thing)->addr));
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    if(H5C2_pin_protected_entry(thing) < 0)
+    if(H5C_pin_protected_entry(thing) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTPIN, FAIL, "can't unpin entry")
 
 done:
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if(trace_file_ptr)
 	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5AC2_pin_protected_entry() */
+} /* H5AC_pin_protected_entry() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_protect
+ * Function:    H5AC_protect
  *
  * Purpose:     If the target entry is not in the cache, load it.  If
  *		necessary, attempt to evict one or more entries to keep
  *		the cache within its maximum size.
  *
  *		Mark the target entry as protected, and return its address
- *		to the caller.  The caller must call H5AC2_unprotect() when
+ *		to the caller.  The caller must call H5AC_unprotect() when
  *		finished with the entry.
  *
  *		While it is protected, the entry may not be either evicted
  *		or flushed -- nor may it be accessed by another call to
- *		H5AC2_protect.  Any attempt to do so will result in a failure.
+ *		H5AC_protect.  Any attempt to do so will result in a failure.
  *
  *		This comment is a re-write of the original Purpose: section.
  *		For historical interest, the original version is reproduced
@@ -2279,12 +2274,12 @@ done:
  *
  *		Original Purpose section:
  *
- *              Similar to H5AC2_find() except the object is removed from
+ *              Similar to H5AC_find() except the object is removed from
  *              the cache and given to the caller, preventing other parts
  *              of the program from modifying the protected object or
  *              preempting it from the cache.
  *
- *              The caller must call H5AC2_unprotect() when finished with
+ *              The caller must call H5AC_unprotect() when finished with
  *              the pointer.
  *
  * Return:      Success:        Ptr to the object.
@@ -2308,17 +2303,17 @@ done:
  *		Purpose section above.
  *
  *		JRM - 6/7/04
- *		Abstracted the guts of the function to H5C2_protect()
- *		in H5C2.c, and then re-wrote the function as a wrapper for
- *		H5C2_protect().
+ *		Abstracted the guts of the function to H5C_protect()
+ *		in H5C.c, and then re-wrote the function as a wrapper for
+ *		H5C_protect().
  *
  *		JRM - 6/6/06
  *		Added trace file support.
  *
  *		JRM - 3/18/07
  *		Modified code to support the new flags parameter for
- *		H5C2_protect().  For now, that means passing in the
- *		H5C2_READ_ONLY_FLAG if rw == H5AC2_READ.
+ *		H5C_protect().  For now, that means passing in the
+ *		H5C_READ_ONLY_FLAG if rw == H5AC_READ.
  *
  *		Also updated the trace file output to save the
  *		rw parameter, since we are now doing something with it.
@@ -2330,39 +2325,39 @@ done:
  *-------------------------------------------------------------------------
  */
 void *
-H5AC2_protect(H5F_t *f,
+H5AC_protect(H5F_t *f,
               hid_t dxpl_id,
-              const H5AC2_class_t *type,
+              const H5AC_class_t *type,
               haddr_t addr,
 	      size_t len,
 	      void *udata,
-              H5AC2_protect_t rw)
+              H5AC_protect_t rw)
 {
-    /* char *		fcn_name = "H5AC2_protect"; */
-    unsigned		protect_flags = H5C2__NO_FLAGS_SET;
+    /* char *		fcn_name = "H5AC_protect"; */
+    unsigned		protect_flags = H5C__NO_FLAGS_SET;
     void *		thing = (void *)NULL;
     void *		ret_value;      /* Return value */
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     char                trace[128] = "";
     size_t		trace_entry_size = 0;
     FILE *              trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    FUNC_ENTER_NOAPI(H5AC2_protect, NULL)
+    FUNC_ENTER_NOAPI(H5AC_protect, NULL)
 
     /* check args */
     HDassert(f);
     HDassert(f->shared);
-    HDassert(f->shared->cache2);
+    HDassert(f->shared->cache);
     HDassert(type);
     HDassert(type->serialize);
     HDassert(H5F_addr_defined(addr));
 
     /* Check for invalid access request */
-    if(0 == (f->intent & H5F_ACC_RDWR) && rw == H5AC2_WRITE)
+    if(0 == (f->intent & H5F_ACC_RDWR) && rw == H5AC_WRITE)
 	HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "no write intent on file")
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the protect call, only the addr and type id is really necessary
      * in the trace file.  Include the size of the entry protected as a
      * sanity check.  Also indicate whether the call was successful to
@@ -2370,39 +2365,39 @@ H5AC2_protect(H5F_t *f,
      */
     if ( ( f != NULL ) &&
          ( f->shared != NULL ) &&
-         ( f->shared->cache2 != NULL ) &&
-         ( H5C2_get_trace_file_ptr(f->shared->cache2, &trace_file_ptr) >= 0) &&
+         ( f->shared->cache != NULL ) &&
+         ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) &&
          ( trace_file_ptr != NULL ) ) {
 
 	char * rw_string;
 
-        if ( rw == H5AC2_WRITE ) {
+        if ( rw == H5AC_WRITE ) {
 
-	    rw_string = "H5AC2_WRITE";
+	    rw_string = "H5AC_WRITE";
 
-	} else if ( rw == H5AC2_READ ) {
+	} else if ( rw == H5AC_READ ) {
 
-	    rw_string = "H5AC2_READ";
+	    rw_string = "H5AC_READ";
 
 	} else {
 
 	    rw_string = "???";
 	}
 
-        sprintf(trace, "H5AC2_protect 0x%lx %ld %d %s",
+        sprintf(trace, "H5AC_protect 0x%lx %ld %d %s",
 	        (unsigned long)addr,
 		(long)len,
 		(int)(type->id),
 		rw_string);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    if ( rw == H5AC2_READ ) {
+    if ( rw == H5AC_READ ) {
 
-	protect_flags |= H5C2__READ_ONLY_FLAG;
+	protect_flags |= H5C__READ_ONLY_FLAG;
     }
 
-    thing = H5C2_protect(f,
+    thing = H5C_protect(f,
 		         dxpl_id,
 			 type,
 			 addr,
@@ -2412,38 +2407,38 @@ H5AC2_protect(H5F_t *f,
 
     if ( thing == NULL ) {
 
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, "H5C2_protect() failed.")
+        HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, "H5C_protect() failed.")
     }
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
         /* make note of the entry size */
-        trace_entry_size = ((H5C2_cache_entry_t *)thing)->size;
+        trace_entry_size = ((H5C_cache_entry_t *)thing)->size;
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     /* Set return value */
     ret_value = thing;
 
 done:
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
 	HDfprintf(trace_file_ptr, "%s %d %d\n", trace,
                   (int)trace_entry_size,
                   (int)(ret_value != NULL));
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_protect() */
+} /* H5AC_protect() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_resize_pinned_entry
+ * Function:    H5AC_resize_pinned_entry
  *
  * Purpose:	Resize a pinned entry.  The target entry MUST be
  * 		be pinned, and MUST not be unprotected.
@@ -2456,38 +2451,38 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC2_resize_pinned_entry(void *thing, size_t new_size)
+H5AC_resize_pinned_entry(void *thing, size_t new_size)
 {
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     char          	trace[128] = "";
     FILE *        	trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_resize_pinned_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_resize_pinned_entry, FAIL)
 
     /* Sanity check */
     HDassert(thing);
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the resize pinned entry call, only the addr, and new_size are
      * really necessary in the trace file. Write the result to catch
      * occult errors.
      */
-    if((H5C2_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
+    if((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
          (NULL != trace_file_ptr))
         sprintf(trace, "%s 0x%lx %d", FUNC,
-	        (unsigned long)(((H5C2_cache_entry_t *)thing)->addr),
+	        (unsigned long)(((H5C_cache_entry_t *)thing)->addr),
 		(int)new_size);
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
 #ifdef H5_HAVE_PARALLEL
 {
-    H5AC2_info_t * entry_ptr = (H5AC2_info_t *)thing;
-    H5C2_t *cache_ptr = entry_ptr->cache_ptr;
+    H5AC_info_t * entry_ptr = (H5AC_info_t *)thing;
+    H5C_t *cache_ptr = entry_ptr->cache_ptr;
 
     HDassert(cache_ptr);
-    HDassert(cache_ptr->magic == H5C2__H5C2_T_MAGIC);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     if((!entry_ptr->is_dirty) && (NULL != cache_ptr->aux_ptr)) {
         /* Check for usage errors */
@@ -2496,27 +2491,27 @@ H5AC2_resize_pinned_entry(void *thing, size_t new_size)
         if(entry_ptr->is_protected)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTRESIZE, FAIL, "Entry is protected??")
 
-        if(H5AC2_log_dirtied_entry(entry_ptr, entry_ptr->addr, TRUE, new_size) < 0)
+        if(H5AC_log_dirtied_entry(entry_ptr, entry_ptr->addr, TRUE, new_size) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTMARKDIRTY, FAIL, "can't log entry")
     } /* end if */
 }
 #endif /* H5_HAVE_PARALLEL */
 
-    if(H5C2_resize_pinned_entry(thing, new_size) < 0 )
+    if(H5C_resize_pinned_entry(thing, new_size) < 0 )
         HGOTO_ERROR(H5E_CACHE, H5E_CANTRESIZE, FAIL, "can't resize entry")
 
 done:
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if(trace_file_ptr)
 	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5AC2_resize_pinned_entry() */
+} /* H5AC_resize_pinned_entry() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_unpin_entry()
+ * Function:    H5AC_unpin_entry()
  *
  * Purpose:	Unpin a cache entry.  The entry must be unprotected at
  * 		the time of call, and must be pinned.
@@ -2529,53 +2524,53 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC2_unpin_entry(void *thing)
+H5AC_unpin_entry(void *thing)
 {
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     char                trace[128] = "";
     FILE *              trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_unpin_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_unpin_entry, FAIL)
 
     /* Sanity check */
     HDassert(thing);
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the unpin entry call, only the addr is really necessary
      * in the trace file.  Also write the result to catch occult errors.
      */
-    if((H5C2_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
+    if((H5C_get_trace_file_ptr_from_entry(thing, &trace_file_ptr) >= 0) &&
          (NULL != trace_file_ptr))
         sprintf(trace, "%s 0x%lx", FUNC,
-	        (unsigned long)(((H5C2_cache_entry_t *)thing)->addr));
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+	        (unsigned long)(((H5C_cache_entry_t *)thing)->addr));
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    if(H5C2_unpin_entry(thing) < 0)
+    if(H5C_unpin_entry(thing) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPIN, FAIL, "can't unpin entry")
 
 done:
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if(trace_file_ptr)
 	HDfprintf(trace_file_ptr, "%s %d\n", trace, (int)ret_value);
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5AC2_unpin_entry() */
+} /* H5AC_unpin_entry() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_unprotect
+ * Function:    H5AC_unprotect
  *
- * Purpose:	Undo an H5AC2_protect() call -- specifically, mark the
+ * Purpose:	Undo an H5AC_protect() call -- specifically, mark the
  *		entry as unprotected, remove it from the protected list,
  *		and give it back to the replacement policy.
  *
  *		The TYPE and ADDR arguments must be the same as those in
- *		the corresponding call to H5AC2_protect() and the THING
+ *		the corresponding call to H5AC_protect() and the THING
  *		argument must be the value returned by that call to
- *		H5AC2_protect().
+ *		H5AC_protect().
  *
  *		If the deleted flag is TRUE, simply remove the target entry
  *		from the cache, clear it, and free it without writing it to
@@ -2589,9 +2584,9 @@ done:
  *		Original purpose section:
  *
  *		This function should be called to undo the effect of
- *              H5AC2_protect().  The TYPE and ADDR arguments should be the
- *              same as the corresponding call to H5AC2_protect() and the
- *              THING argument should be the value returned by H5AC2_protect().
+ *              H5AC_protect().  The TYPE and ADDR arguments should be the
+ *              same as the corresponding call to H5AC_protect() and the
+ *              THING argument should be the value returned by H5AC_protect().
  *              If the DELETED flag is set, then this object has been deleted
  *              from the file and should not be returned to the cache.
  *
@@ -2616,16 +2611,16 @@ done:
  *		Complete re-write for the new metadata cache.
  *
  *		JRM - 6/7/04
- *		Abstracted the guts of the function to H5C2_unprotect()
+ *		Abstracted the guts of the function to H5C_unprotect()
  *		in H5C.c, and then re-wrote the function as a wrapper for
- *		H5C2_unprotect().
+ *		H5C_unprotect().
  *
  *		JRM - 1/6/05
  *		Replaced the deleted parameter with the new flags parameter.
  *		Since the deleted parameter is not used by the FPHDF5 code,
  *		the only change in the body is to replace the deleted
  *		parameter with the flags parameter in the call to
- *		H5C2_unprotect().
+ *		H5C_unprotect().
  *
  *		JRM - 6/6/05
  *		Added the dirtied flag and supporting code.  This is
@@ -2646,7 +2641,7 @@ done:
  *
  *		JRM - 5/16/06
  *		Added code to use the new dirtied field in
- *		H5C2_cache_entry_t in the test to see if the entry has
+ *		H5C_cache_entry_t in the test to see if the entry has
  *		been dirtied.
  *
  *		JRM - 6/7/06
@@ -2656,92 +2651,92 @@ done:
  *              Modified code in support of revised cache API needed
  *              to permit journaling.
  *
- *              Note that the H5AC2__SIZE_CHANGED_FLAG must now be set if
+ *              Note that the H5AC__SIZE_CHANGED_FLAG must now be set if
  *              the size of the entry has changed.
  *
  *-------------------------------------------------------------------------
  */
 
 herr_t
-H5AC2_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type,
+H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type,
 		haddr_t addr, size_t new_size, void *thing, unsigned flags)
 {
     herr_t		result;
     hbool_t		size_changed = FALSE;
     hbool_t		dirtied;
 #ifdef H5_HAVE_PARALLEL
-    H5AC2_aux_t        * aux_ptr = NULL;
+    H5AC_aux_t        * aux_ptr = NULL;
 #endif /* H5_HAVE_PARALLEL */
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     char                trace[128] = "";
     unsigned		trace_flags = 0;
     FILE *              trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t              ret_value=SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_unprotect, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_unprotect, FAIL)
 
     HDassert(f);
     HDassert(f->shared);
-    HDassert(f->shared->cache2);
+    HDassert(f->shared->cache);
     HDassert(type);
     HDassert(type->deserialize);
     HDassert(H5F_addr_defined(addr));
     HDassert(thing);
-    HDassert( ((H5AC2_info_t *)thing)->addr == addr );
-    HDassert( ((H5AC2_info_t *)thing)->type == type );
+    HDassert( ((H5AC_info_t *)thing)->addr == addr );
+    HDassert( ((H5AC_info_t *)thing)->type == type );
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the unprotect call, only the addr, type id, flags, and possible
      * new size are really necessary in the trace file.  Write the return
      * value to catch occult errors.
      */
     if ( ( f != NULL ) &&
          ( f->shared != NULL ) &&
-         ( f->shared->cache2 != NULL ) &&
-         ( H5C2_get_trace_file_ptr(f->shared->cache2, &trace_file_ptr) >= 0) &&
+         ( f->shared->cache != NULL ) &&
+         ( H5C_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0) &&
          ( trace_file_ptr != NULL ) ) {
 
-        sprintf(trace, "H5AC2_unprotect 0x%lx %d",
+        sprintf(trace, "H5AC_unprotect 0x%lx %d",
 	        (unsigned long)addr,
 		(int)(type->id));
 
 	trace_flags = flags;
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    dirtied = ( ( (flags & H5AC2__DIRTIED_FLAG) == H5AC2__DIRTIED_FLAG ) ||
-		( ((H5AC2_info_t *)thing)->dirtied ) );
+    dirtied = ( ( (flags & H5AC__DIRTIED_FLAG) == H5AC__DIRTIED_FLAG ) ||
+		( ((H5AC_info_t *)thing)->dirtied ) );
 
-    size_changed = ( (flags & H5AC2__SIZE_CHANGED_FLAG) ==
-		      H5AC2__SIZE_CHANGED_FLAG );
+    size_changed = ( (flags & H5AC__SIZE_CHANGED_FLAG) ==
+		      H5AC__SIZE_CHANGED_FLAG );
 
 #ifdef H5_HAVE_PARALLEL
-    if ( ( dirtied ) && ( ((H5AC2_info_t *)thing)->is_dirty == FALSE ) &&
-         ( NULL != (aux_ptr = f->shared->cache2->aux_ptr) ) ) {
+    if ( ( dirtied ) && ( ((H5AC_info_t *)thing)->is_dirty == FALSE ) &&
+         ( NULL != (aux_ptr = f->shared->cache->aux_ptr) ) ) {
 
-        if(H5AC2_log_dirtied_entry(thing, addr, size_changed, new_size) < 0)
+        if(H5AC_log_dirtied_entry(thing, addr, size_changed, new_size) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "can't log entry")
     }
 
-    if ( ( (flags & H5C2__DELETED_FLAG) != 0 ) &&
-         ( NULL != (aux_ptr = f->shared->cache2->aux_ptr) ) &&
+    if ( ( (flags & H5C__DELETED_FLAG) != 0 ) &&
+         ( NULL != (aux_ptr = f->shared->cache->aux_ptr) ) &&
          ( aux_ptr->mpi_rank == 0 ) ) {
 
-        result = H5AC2_log_deleted_entry(f->shared->cache2,
-                                        (H5AC2_info_t *)thing,
+        result = H5AC_log_deleted_entry(f->shared->cache,
+                                        (H5AC_info_t *)thing,
                                         addr,
                                         flags);
 
         if ( result < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, \
-                    "H5AC2_log_deleted_entry() failed.")
+                    "H5AC_log_deleted_entry() failed.")
         }
     }
 #endif /* H5_HAVE_PARALLEL */
 
-    result = H5C2_unprotect(f,
+    result = H5C_unprotect(f,
 		            dxpl_id,
 			    type,
 			    addr,
@@ -2752,16 +2747,16 @@ H5AC2_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type,
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, \
-                    "H5C2_unprotect() failed.")
+                    "H5C_unprotect() failed.")
     }
 
 #ifdef H5_HAVE_PARALLEL
     if ( ( aux_ptr != NULL ) &&
          ( aux_ptr->dirty_bytes >= aux_ptr->dirty_bytes_threshold ) ) {
 
-        result = H5AC2_propagate_flushed_and_still_clean_entries_list(f,
-                                                          H5AC2_noblock_dxpl_id,
-                                                          f->shared->cache2,
+        result = H5AC_propagate_flushed_and_still_clean_entries_list(f,
+                                                          H5AC_noblock_dxpl_id,
+                                                          f->shared->cache,
                                                           TRUE);
 
         if ( result < 0 ) {
@@ -2774,7 +2769,7 @@ H5AC2_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type,
 
 done:
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     if ( trace_file_ptr != NULL ) {
 
 	HDfprintf(trace_file_ptr, "%s %d %x %d\n",
@@ -2783,11 +2778,11 @@ done:
 		  (unsigned)flags,
 		  (int)ret_value);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_unprotect() */
+} /* H5AC_unprotect() */
 
 
 /*-------------------------------------------------------------------------
@@ -2813,18 +2808,18 @@ done:
 
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC2_set_write_done_callback(H5C2_t * cache_ptr,
+H5AC_set_write_done_callback(H5C_t * cache_ptr,
                              void (* write_done)(void))
 {
     herr_t       ret_value = SUCCEED;   /* Return value */
-    H5AC2_aux_t * aux_ptr = NULL;
+    H5AC_aux_t * aux_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5AC2_set_write_done_callback, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_set_write_done_callback, FAIL)
 
     /* This would normally be an assert, but we need to use an HGOTO_ERROR
      * call to shut up the compiler.
      */
-    if ( ( ! cache_ptr ) || ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) {
+    if ( ( ! cache_ptr ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr")
     }
@@ -2832,19 +2827,19 @@ H5AC2_set_write_done_callback(H5C2_t * cache_ptr,
     aux_ptr = cache_ptr->aux_ptr;
 
     HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC2__H5AC2_AUX_T_MAGIC );
+    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
 
     aux_ptr->write_done = write_done;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_set_write_done_callback() */
+} /* H5AC_set_write_done_callback() */
 #endif /* H5_HAVE_PARALLEL */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_stats
+ * Function:    H5AC_stats
  *
  * Purpose:     Prints statistics about the cache.
  *
@@ -2858,9 +2853,9 @@ done:
  *		Re-write to support the new metadata cache.
  *
  *		JRM - 6/7/04
- *		Abstracted the guts of the function to H5C2_stats()
+ *		Abstracted the guts of the function to H5C_stats()
  *		in H5C.c, and then re-wrote the function as a wrapper for
- *		H5C2_stats().
+ *		H5C_stats().
  *
  * 		JRM - 10/18/07
  *              Modified code in support of revised cache API needed
@@ -2869,29 +2864,29 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC2_stats(const H5F_t *f)
+H5AC_stats(const H5F_t *f)
 {
     herr_t		ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_stats, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_stats, FAIL)
 
     HDassert(f);
     HDassert(f->shared);
-    HDassert(f->shared->cache2);
+    HDassert(f->shared->cache);
 
     /* at present, this can't fail */
-    (void)H5C2_stats(f->shared->cache2, f->name, FALSE);
+    (void)H5C_stats(f->shared->cache, f->name, FALSE);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_stats() */
+} /* H5AC_stats() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_get_cache_auto_resize_config
+ * Function:    H5AC_get_cache_auto_resize_config
  *
- * Purpose:     Wrapper function for H5C2_get_cache_auto_resize_config().
+ * Purpose:     Wrapper function for H5C_get_cache_auto_resize_config().
  *
  * Return:      SUCCEED on success, and FAIL on failure.
  *
@@ -2901,11 +2896,11 @@ done:
  * Modifications:
  *
  *		JRM - 4/6/05
- *              Reworked for the addition of struct H5AC2_cache_config_t.
+ *              Reworked for the addition of struct H5AC_cache_config_t.
  *
  *		JRM - 10/25/05
  *		Added support for the new dirty_bytes_threshold field of
- *		both H5AC2_cache_config_t and H5AC2_aux_t.
+ *		both H5AC_cache_config_t and H5AC_aux_t.
  *
  *		JRM - 6/8/06
  *		Added support for the new trace file related fields.
@@ -2913,8 +2908,8 @@ done:
  *		JRM - 7/28/07
  *		Added support for the new evictions enabled related fields.
  *
- *		Observe that H5AC2_get_cache_auto_resize_config() and
- *		H5AC2_set_cache_auto_resize_config() are becoming generic
+ *		Observe that H5AC_get_cache_auto_resize_config() and
+ *		H5AC_set_cache_auto_resize_config() are becoming generic
  *		metadata cache configuration routines as they gain
  *		switches for functions that are only tenuously related
  *		to auto resize configuration.
@@ -2933,37 +2928,37 @@ done:
  *              JRM - 8/1/08
  *              Removed support for the new journaling control fields.
  *              This functionality is now handled through the
- *              H5AC2_jnl_config_t structure and the related calls.
+ *              H5AC_jnl_config_t structure and the related calls.
  *
  *-------------------------------------------------------------------------
  */
 
 herr_t
-H5AC2_get_cache_auto_resize_config(const H5AC2_t * cache_ptr,
-                                  H5AC2_cache_config_t *config_ptr)
+H5AC_get_cache_auto_resize_config(const H5AC_t * cache_ptr,
+                                  H5AC_cache_config_t *config_ptr)
 {
     herr_t result;
     herr_t ret_value = SUCCEED;      /* Return value */
     hbool_t evictions_enabled;
-    H5C2_auto_size_ctl_t internal_config;
+    H5C_auto_size_ctl_t internal_config;
 
-    FUNC_ENTER_NOAPI(H5AC2_get_cache_auto_resize_config, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_get_cache_auto_resize_config, FAIL)
 
     if ( ( cache_ptr == NULL )
          ||
 #ifdef H5_HAVE_PARALLEL
          ( ( cache_ptr->aux_ptr != NULL )
            &&
-           ( ((H5AC2_aux_t *)(cache_ptr->aux_ptr))->magic
+           ( ((H5AC_aux_t *)(cache_ptr->aux_ptr))->magic
              !=
-             H5AC2__H5AC2_AUX_T_MAGIC
+             H5AC__H5AC_AUX_T_MAGIC
            )
          )
          ||
 #endif /* H5_HAVE_PARALLEL */
          ( config_ptr == NULL )
          ||
-         ( config_ptr->version != H5AC2__CURR_CACHE_CONFIG_VERSION )
+         ( config_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION )
        )
     {
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
@@ -2971,22 +2966,22 @@ H5AC2_get_cache_auto_resize_config(const H5AC2_t * cache_ptr,
 
     }
 
-    result = H5C2_get_cache_auto_resize_config((const H5C2_t *)cache_ptr,
+    result = H5C_get_cache_auto_resize_config((const H5C_t *)cache_ptr,
 					      &internal_config);
 
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_get_cache_auto_resize_config() failed.")
+                    "H5C_get_cache_auto_resize_config() failed.")
     }
 
-    result = H5C2_get_evictions_enabled((const H5C2_t *)cache_ptr,
+    result = H5C_get_evictions_enabled((const H5C_t *)cache_ptr,
 		                         &evictions_enabled);
 
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-		    "H5C2_get_resize_enabled() failed.")
+		    "H5C_get_resize_enabled() failed.")
     }
 
     if ( internal_config.rpt_fcn == NULL ) {
@@ -3030,12 +3025,12 @@ H5AC2_get_cache_auto_resize_config(const H5AC2_t * cache_ptr,
     if ( cache_ptr->aux_ptr != NULL ) {
 
         config_ptr->dirty_bytes_threshold =
-	    ((H5AC2_aux_t *)(cache_ptr->aux_ptr))->dirty_bytes_threshold;
+	    ((H5AC_aux_t *)(cache_ptr->aux_ptr))->dirty_bytes_threshold;
 
     } else {
 #endif /* H5_HAVE_PARALLEL */
 
-        config_ptr->dirty_bytes_threshold = H5AC2__DEFAULT_DIRTY_BYTES_THRESHOLD;
+        config_ptr->dirty_bytes_threshold = H5AC__DEFAULT_DIRTY_BYTES_THRESHOLD;
 
 #ifdef H5_HAVE_PARALLEL
     }
@@ -3045,18 +3040,18 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_get_cache_auto_resize_config() */
+} /* H5AC_get_cache_auto_resize_config() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_get_jnl_config
+ * Function:    H5AC_get_jnl_config
  *
  * Purpose:     Get the current journaling configuration and load it into
- * 		the supplied instance of H5AC2_jnl_config_t.
+ * 		the supplied instance of H5AC_jnl_config_t.
  *
  * 		For the moment, the only journaling we do is metadata
  * 		journaling, so in effect this function is a wrapper
- * 		function for H5C2_get_journal_config().
+ * 		function for H5C_get_journal_config().
  *
  * Return:      SUCCEED on success, and FAIL on failure.
  *
@@ -3067,36 +3062,36 @@ done:
  *
  *		JRM -- 8/14/08
  *		Reworked for change in argument list to
- *		H5C2_get_journal_config().
+ *		H5C_get_journal_config().
  *
  *-------------------------------------------------------------------------
  */
 
 herr_t
-H5AC2_get_jnl_config(H5AC2_t * cache_ptr,
-                     H5AC2_jnl_config_t * config_ptr)
+H5AC_get_jnl_config(H5AC_t * cache_ptr,
+                     H5AC_jnl_config_t * config_ptr)
 {
     herr_t result;
     herr_t ret_value = SUCCEED;      /* Return value */
-    H5C2_mdj_config_t internal_config;
+    H5C_mdj_config_t internal_config;
 
-    FUNC_ENTER_NOAPI(H5AC2_get_jnl_config, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_get_jnl_config, FAIL)
 
     if ( ( cache_ptr == NULL )
          ||
 #ifdef H5_HAVE_PARALLEL
          ( ( cache_ptr->aux_ptr != NULL )
            &&
-           ( ((H5AC2_aux_t *)(cache_ptr->aux_ptr))->magic
+           ( ((H5AC_aux_t *)(cache_ptr->aux_ptr))->magic
              !=
-             H5AC2__H5AC2_AUX_T_MAGIC
+             H5AC__H5AC_AUX_T_MAGIC
            )
          )
          ||
 #endif /* H5_HAVE_PARALLEL */
          ( config_ptr == NULL )
          ||
-         ( config_ptr->version != H5AC2__CURR_CACHE_CONFIG_VERSION )
+         ( config_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION )
        )
     {
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
@@ -3116,12 +3111,12 @@ H5AC2_get_jnl_config(H5AC2_t * cache_ptr,
     config_ptr->jbrb_use_aio         = FALSE;
     config_ptr->jbrb_human_readable  = FALSE;
 
-    result = H5C2_get_journal_config(cache_ptr, &internal_config);
+    result = H5C_get_journal_config(cache_ptr, &internal_config);
 
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_get_journal_config() failed.")
+                    "H5C_get_journal_config() failed.")
     }
 
     if ( internal_config.enable_journaling ) {
@@ -3129,8 +3124,8 @@ H5AC2_get_jnl_config(H5AC2_t * cache_ptr,
         config_ptr->enable_journaling   = internal_config.enable_journaling;
 	HDstrncpy(&(config_ptr->journal_file_path[0]),
 		  internal_config.journal_file_path,
-		  H5AC2__MAX_JOURNAL_FILE_NAME_LEN);
-        config_ptr->journal_file_path[H5AC2__MAX_JOURNAL_FILE_NAME_LEN] = '\0';
+		  H5AC__MAX_JOURNAL_FILE_NAME_LEN);
+        config_ptr->journal_file_path[H5AC__MAX_JOURNAL_FILE_NAME_LEN] = '\0';
 	config_ptr->jbrb_buf_size       = internal_config.jbrb_buf_size;
 	config_ptr->jbrb_num_bufs       = internal_config.jbrb_num_bufs;
 	config_ptr->jbrb_use_aio        = internal_config.jbrb_use_aio;
@@ -3141,13 +3136,13 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_get_jnl_config() */
+} /* H5AC_get_jnl_config() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_get_cache_size
+ * Function:    H5AC_get_cache_size
  *
- * Purpose:     Wrapper function for H5C2_get_cache_size().
+ * Purpose:     Wrapper function for H5C_get_cache_size().
  *
  * Return:      SUCCEED on success, and FAIL on failure.
  *
@@ -3164,7 +3159,7 @@ done:
  */
 
 herr_t
-H5AC2_get_cache_size(H5AC2_t * cache_ptr,
+H5AC_get_cache_size(H5AC_t * cache_ptr,
                      size_t * max_size_ptr,
                      size_t * min_clean_size_ptr,
                      size_t * cur_size_ptr,
@@ -3173,9 +3168,9 @@ H5AC2_get_cache_size(H5AC2_t * cache_ptr,
     herr_t result;
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_get_cache_size, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_get_cache_size, FAIL)
 
-    result = H5C2_get_cache_size((H5C2_t *)cache_ptr,
+    result = H5C_get_cache_size((H5C_t *)cache_ptr,
 				max_size_ptr,
 				min_clean_size_ptr,
 				cur_size_ptr,
@@ -3184,20 +3179,20 @@ H5AC2_get_cache_size(H5AC2_t * cache_ptr,
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_get_cache_size() failed.")
+                    "H5C_get_cache_size() failed.")
     }
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_get_cache_size() */
+} /* H5AC_get_cache_size() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_get_cache_hit_rate
+ * Function:    H5AC_get_cache_hit_rate
  *
- * Purpose:     Wrapper function for H5C2_get_cache_hit_rate().
+ * Purpose:     Wrapper function for H5C_get_cache_hit_rate().
  *
  * Return:      SUCCEED on success, and FAIL on failure.
  *
@@ -3214,35 +3209,35 @@ done:
  */
 
 herr_t
-H5AC2_get_cache_hit_rate(H5AC2_t * cache_ptr,
+H5AC_get_cache_hit_rate(H5AC_t * cache_ptr,
                          double * hit_rate_ptr)
 
 {
     herr_t result;
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_get_cache_hit_rate, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_get_cache_hit_rate, FAIL)
 
-    result = H5C2_get_cache_hit_rate((H5C2_t *)cache_ptr, hit_rate_ptr);
+    result = H5C_get_cache_hit_rate((H5C_t *)cache_ptr, hit_rate_ptr);
 
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_get_cache_hit_rate() failed.")
+                    "H5C_get_cache_hit_rate() failed.")
     }
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_get_cache_hit_rate() */
+} /* H5AC_get_cache_hit_rate() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5AC2_reset_cache_hit_rate_stats()
+ * Function:    H5AC_reset_cache_hit_rate_stats()
  *
- * Purpose:     Wrapper function for H5C2_reset_cache_hit_rate_stats().
+ * Purpose:     Wrapper function for H5C_reset_cache_hit_rate_stats().
  *
  * Return:      SUCCEED on success, and FAIL on failure.
  *
@@ -3258,32 +3253,32 @@ done:
  */
 
 herr_t
-H5AC2_reset_cache_hit_rate_stats(H5AC2_t * cache_ptr)
+H5AC_reset_cache_hit_rate_stats(H5AC_t * cache_ptr)
 {
     herr_t result;
     herr_t      ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_reset_cache_hit_rate_stats, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_reset_cache_hit_rate_stats, FAIL)
 
-    result = H5C2_reset_cache_hit_rate_stats((H5C2_t *)cache_ptr);
+    result = H5C_reset_cache_hit_rate_stats((H5C_t *)cache_ptr);
 
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_reset_cache_hit_rate_stats() failed.")
+                    "H5C_reset_cache_hit_rate_stats() failed.")
     }
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_reset_cache_hit_rate_stats() */
+} /* H5AC_reset_cache_hit_rate_stats() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_set_cache_auto_resize_config
+ * Function:    H5AC_set_cache_auto_resize_config
  *
- * Purpose:     Wrapper function for H5C2_set_cache_auto_resize_config().
+ * Purpose:     Wrapper function for H5C_set_cache_auto_resize_config().
  *
  * Return:      SUCCEED on success, and FAIL on failure.
  *
@@ -3293,11 +3288,11 @@ done:
  * Modifications:
  *
  *              John Mainzer -- 4/6/05
- *              Updated for the addition of H5AC2_cache_config_t.
+ *              Updated for the addition of H5AC_cache_config_t.
  *
  *		John Mainzer -- 10/25/05
  *		Added support for the new dirty_bytes_threshold field of
- *		both H5AC2_cache_config_t and H5AC2_aux_t.
+ *		both H5AC_cache_config_t and H5AC_aux_t.
  *
  *		John Mainzer -- 6/7/06
  *		Added trace file support.
@@ -3305,8 +3300,8 @@ done:
  *		John Mainzer -- 7/28/07
  *		Added support for the new evictions enabled related fields.
  *
- *		Observe that H5AC2_get_cache_auto_resize_config() and
- *		H5AC2_set_cache_auto_resize_config() are becoming generic
+ *		Observe that H5AC_get_cache_auto_resize_config() and
+ *		H5AC_set_cache_auto_resize_config() are becoming generic
  *		metadata cache configuration routines as they gain
  *		switches for functions that are only tenuously related
  *		to auto resize configuration.
@@ -3331,21 +3326,21 @@ done:
  */
 
 herr_t
-H5AC2_set_cache_auto_resize_config(H5AC2_t * cache_ptr,
-                                   H5AC2_cache_config_t *config_ptr)
+H5AC_set_cache_auto_resize_config(H5AC_t * cache_ptr,
+                                   H5AC_cache_config_t *config_ptr)
 {
     herr_t              result;
     herr_t              ret_value = SUCCEED;      /* Return value */
-#if H5AC2__TRACE_FILE_ENABLED
-    H5AC2_cache_config_t trace_config = H5AC2__DEFAULT_CACHE_CONFIG;
+#if H5AC__TRACE_FILE_ENABLED
+    H5AC_cache_config_t trace_config = H5AC__DEFAULT_CACHE_CONFIG;
     FILE *              trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
-    FUNC_ENTER_NOAPI(H5AC2_set_cache_auto_resize_config, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_set_cache_auto_resize_config, FAIL)
 
     HDassert( cache_ptr );
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* Make note of the new configuration.  Don't look up the trace file
      * pointer, as that may change before we use it.
      */
@@ -3354,7 +3349,7 @@ H5AC2_set_cache_auto_resize_config(H5AC2_t * cache_ptr,
         trace_config = *config_ptr;
 
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     if ( ( cache_ptr == NULL )
 #ifdef H5_HAVE_PARALLEL
@@ -3362,9 +3357,9 @@ H5AC2_set_cache_auto_resize_config(H5AC2_t * cache_ptr,
          ( ( cache_ptr->aux_ptr != NULL )
            &&
            (
-             ((H5AC2_aux_t *)(cache_ptr->aux_ptr))->magic
+             ((H5AC_aux_t *)(cache_ptr->aux_ptr))->magic
              !=
-             H5AC2__H5AC2_AUX_T_MAGIC
+             H5AC__H5AC_AUX_T_MAGIC
            )
          )
 #endif /* H5_HAVE_PARALLEL */
@@ -3373,7 +3368,7 @@ H5AC2_set_cache_auto_resize_config(H5AC2_t * cache_ptr,
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "bad cache_ptr on entry.")
     }
 
-    result = H5AC2_validate_config(config_ptr);
+    result = H5AC_validate_config(config_ptr);
 
     if ( result != SUCCEED ) {
 
@@ -3381,28 +3376,28 @@ H5AC2_set_cache_auto_resize_config(H5AC2_t * cache_ptr,
     }
 
 
-    result = H5AC2_set_cache_config(cache_ptr, config_ptr);
+    result = H5AC_set_cache_config(cache_ptr, config_ptr);
 
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5AC2_set_cache_config() failed.")
+                    "H5AC_set_cache_config() failed.")
     }
 
 done:
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the set cache auto resize config call, only the contents
      * of the config is necessary in the trace file. Write the return
      * value to catch occult errors.
      */
     if ( ( cache_ptr != NULL ) &&
-         ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
+         ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
 	HDfprintf(trace_file_ptr,
                   "%s %d %d %d %d \"%s\" %d %d %d %f %d %d %ld %d %f %f %d %d %d %f %f %d %f %f %d %d %d %d %f %d %d\n",
-		  "H5AC2_set_cache_auto_resize_config",
+		  "H5AC_set_cache_auto_resize_config",
 		  trace_config.version,
 		  (int)(trace_config.rpt_fcn_enabled),
 		  (int)(trace_config.open_trace_file),
@@ -3434,21 +3429,21 @@ done:
 		  trace_config.dirty_bytes_threshold,
 		  (int)ret_value);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_set_cache_auto_resize_config() */
+} /* H5AC_set_cache_auto_resize_config() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_set_jnl_config
+ * Function:    H5AC_set_jnl_config
  *
  * Purpose:     Manage changes in journaling configuration.
  *
  * 		At present, metadata journaling is the only journaling we
  * 		do, so this function can be thought of as a wrapper for
- *		H5C2_begin_journaling() and H5C2_end_journaling().
+ *		H5C_begin_journaling() and H5C_end_journaling().
  *
  * Return:      SUCCEED on success, and FAIL on failure.
  *
@@ -3458,9 +3453,9 @@ done:
  * Modifications:
  *
  * 		JRM -- 8/14/08
- * 		Revised code for the use of the H5C2_mdj_config_t
- * 		structure in H5C2_get_journal_config() and
- *		H5C2_begin_journaling().
+ * 		Revised code for the use of the H5C_mdj_config_t
+ * 		structure in H5C_get_journal_config() and
+ *		H5C_begin_journaling().
  *
  *		Per Quincey's request, also added code to
  *		throw an error if journaling is requested when
@@ -3474,34 +3469,34 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC2_set_jnl_config(H5F_t * f,
+H5AC_set_jnl_config(H5F_t * f,
                      hid_t dxpl_id,
-                     const H5AC2_jnl_config_t *config_ptr,
+                     const H5AC_jnl_config_t *config_ptr,
 		     hbool_t initializing)
 {
-    /* const char *        fcn_name = "H5AC2_set_jnl_config"; */
-    H5AC2_t *           cache_ptr;
+    /* const char *        fcn_name = "H5AC_set_jnl_config"; */
+    H5AC_t *           cache_ptr;
     herr_t              result;
-    H5C2_mdj_config_t	internal_config;
-#if H5AC2__TRACE_FILE_ENABLED
-    H5AC2_jnl_config_t  trace_config = H5AC2__DEFAULT_JNL_CONFIG;
+    H5C_mdj_config_t	internal_config;
+#if H5AC__TRACE_FILE_ENABLED
+    H5AC_jnl_config_t  trace_config = H5AC__DEFAULT_JNL_CONFIG;
     FILE *              trace_file_ptr = NULL;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
     herr_t              ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_set_jnl_config, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_set_jnl_config, FAIL)
 
     HDassert( f );
     HDassert( f->shared );
-    HDassert( f->shared->cache2 );
+    HDassert( f->shared->cache );
 
-    cache_ptr = (H5AC2_t *)f->shared->cache2;
+    cache_ptr = (H5AC_t *)f->shared->cache;
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* Make note of the new configuration.
      */
     trace_config = *config_ptr;
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     if ( ( cache_ptr == NULL )
 #ifdef H5_HAVE_PARALLEL
@@ -3509,9 +3504,9 @@ H5AC2_set_jnl_config(H5F_t * f,
          ( ( cache_ptr->aux_ptr != NULL )
            &&
            (
-             ((H5AC2_aux_t *)(cache_ptr->aux_ptr))->magic
+             ((H5AC_aux_t *)(cache_ptr->aux_ptr))->magic
              !=
-             H5AC2__H5AC2_AUX_T_MAGIC
+             H5AC__H5AC_AUX_T_MAGIC
            )
          )
 #endif /* H5_HAVE_PARALLEL */
@@ -3520,7 +3515,7 @@ H5AC2_set_jnl_config(H5F_t * f,
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "bad cache_ptr on entry.")
     }
 
-    result = H5AC2_validate_jnl_config(config_ptr);
+    result = H5AC_validate_jnl_config(config_ptr);
 
     if ( result != SUCCEED ) {
 
@@ -3528,12 +3523,12 @@ H5AC2_set_jnl_config(H5F_t * f,
                     "Bad journaling configuration");
     }
 
-    result = H5C2_get_journal_config((H5C2_t *)cache_ptr, &internal_config);
+    result = H5C_get_journal_config((H5C_t *)cache_ptr, &internal_config);
 
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_get_journal_config() failed.")
+                    "H5C_get_journal_config() failed.")
     }
 
     if ( config_ptr->enable_journaling != internal_config.enable_journaling ) {
@@ -3546,8 +3541,8 @@ H5AC2_set_jnl_config(H5F_t * f,
 
 	    HDstrncpy(internal_config.journal_file_path,
                       &(config_ptr->journal_file_path[0]),
-		      H5C2__MAX_JOURNAL_FILE_NAME_LEN);
-            internal_config.journal_file_path[H5AC2__MAX_JOURNAL_FILE_NAME_LEN]
+		      H5C__MAX_JOURNAL_FILE_NAME_LEN);
+            internal_config.journal_file_path[H5AC__MAX_JOURNAL_FILE_NAME_LEN]
 		    = '\0';
 
 	    internal_config.jbrb_buf_size       = config_ptr->jbrb_buf_size;
@@ -3556,23 +3551,23 @@ H5AC2_set_jnl_config(H5F_t * f,
 	    internal_config.jbrb_human_readable =
 		    config_ptr->jbrb_human_readable;
 
-	    result = H5C2_begin_journaling(f,
+	    result = H5C_begin_journaling(f,
 			                   dxpl_id,
 					   cache_ptr,
 					   &internal_config);
 	    if ( result < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-	                    "H5C2_begin_journaling() failed.")
+	                    "H5C_begin_journaling() failed.")
 	    }
 	} else {
 
-	    result = H5C2_end_journaling(f, dxpl_id, cache_ptr);
+	    result = H5C_end_journaling(f, dxpl_id, cache_ptr);
 
 	    if ( result < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-	                    "H5C2_end_journaling() failed.")
+	                    "H5C_end_journaling() failed.")
 	    }
 	}
     } else if ( ! initializing ) {
@@ -3592,18 +3587,18 @@ H5AC2_set_jnl_config(H5F_t * f,
 
 done:
 
-#if H5AC2__TRACE_FILE_ENABLED
+#if H5AC__TRACE_FILE_ENABLED
     /* For the set cache journaling config call, only the fields
      * of the config that pretain to journaling are necessary in
      * the trace file. Write the return value to catch occult errors.
      */
     if ( ( cache_ptr != NULL ) &&
-         ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
+         ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
 	HDfprintf(trace_file_ptr,
                   "%s %d %d \"%s\" %d %d %d %d %d %d\n",
-		  "H5AC2_set_jnl_config",
+		  "H5AC_set_jnl_config",
 		  trace_config.version,
                   (int)(config_ptr->enable_journaling),
                   config_ptr->journal_file_path,
@@ -3614,18 +3609,18 @@ done:
                   (int)(config_ptr->jbrb_human_readable),
 		  (int)ret_value);
     }
-#endif /* H5AC2__TRACE_FILE_ENABLED */
+#endif /* H5AC__TRACE_FILE_ENABLED */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_set_jnl_config() */
+} /* H5AC_set_jnl_config() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_set_cache_config
+ * Function:    H5AC_set_cache_config
  *
  * Purpose:     Handle all configuration switches in an instance of
- * 		H5AC2_cache_config_t.
+ * 		H5AC_cache_config_t.
  *
  * Return:      SUCCEED on success, and FAIL on failure.
  *
@@ -3640,15 +3635,15 @@ done:
  */
 
 herr_t
-H5AC2_set_cache_config(H5AC2_t * cache_ptr,
-                       H5AC2_cache_config_t *config_ptr)
+H5AC_set_cache_config(H5AC_t * cache_ptr,
+                       H5AC_cache_config_t *config_ptr)
 {
-    /* const char *        fcn_name = "H5AC2_set_cache_config"; */
+    /* const char *        fcn_name = "H5AC_set_cache_config"; */
     herr_t              result;
     herr_t              ret_value = SUCCEED;      /* Return value */
-    H5C2_auto_size_ctl_t internal_config;
+    H5C_auto_size_ctl_t internal_config;
 
-    FUNC_ENTER_NOAPI(H5AC2_set_cache_config, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_set_cache_config, FAIL)
 
     if ( ( cache_ptr == NULL )
 #ifdef H5_HAVE_PARALLEL
@@ -3656,9 +3651,9 @@ H5AC2_set_cache_config(H5AC2_t * cache_ptr,
          ( ( cache_ptr->aux_ptr != NULL )
            &&
            (
-             ((H5AC2_aux_t *)(cache_ptr->aux_ptr))->magic
+             ((H5AC_aux_t *)(cache_ptr->aux_ptr))->magic
              !=
-             H5AC2__H5AC2_AUX_T_MAGIC
+             H5AC__H5AC_AUX_T_MAGIC
            )
          )
 #endif /* H5_HAVE_PARALLEL */
@@ -3667,7 +3662,7 @@ H5AC2_set_cache_config(H5AC2_t * cache_ptr,
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "bad cache_ptr on entry.")
     }
 
-    result = H5AC2_validate_config(config_ptr);
+    result = H5AC_validate_config(config_ptr);
 
     if ( result != SUCCEED ) {
 
@@ -3678,10 +3673,10 @@ H5AC2_set_cache_config(H5AC2_t * cache_ptr,
 
 	FILE * file_ptr = NULL;
 
-	if ( H5C2_get_trace_file_ptr(cache_ptr, &file_ptr) < 0 ) {
+	if ( H5C_get_trace_file_ptr(cache_ptr, &file_ptr) < 0 ) {
 
 	    HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-			"H5C2_get_trace_file_ptr() failed.")
+			"H5C_get_trace_file_ptr() failed.")
 	}
 
 	if ( ( ! ( config_ptr->close_trace_file ) ) &&
@@ -3696,13 +3691,13 @@ H5AC2_set_cache_config(H5AC2_t * cache_ptr,
          (
            config_ptr->dirty_bytes_threshold
            <
-           H5AC2__MIN_DIRTY_BYTES_THRESHOLD
+           H5AC__MIN_DIRTY_BYTES_THRESHOLD
          )
          ||
          (
            config_ptr->dirty_bytes_threshold
            >
-           H5AC2__MAX_DIRTY_BYTES_THRESHOLD
+           H5AC__MAX_DIRTY_BYTES_THRESHOLD
          )
        ) {
 
@@ -3712,52 +3707,52 @@ H5AC2_set_cache_config(H5AC2_t * cache_ptr,
 
     if ( config_ptr->close_trace_file ) {
 
-	if ( H5AC2_close_trace_file(cache_ptr) < 0 ) {
+	if ( H5AC_close_trace_file(cache_ptr) < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5AC2_close_trace_file() failed.")
+                        "H5AC_close_trace_file() failed.")
 	}
     }
 
     if ( config_ptr->open_trace_file ) {
 
-        if ( H5AC2_open_trace_file(cache_ptr, config_ptr->trace_file_name) < 0 )
+        if ( H5AC_open_trace_file(cache_ptr, config_ptr->trace_file_name) < 0 )
 	{
 
 	    HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
-                        "H5AC2_open_trace_file() failed.")
+                        "H5AC_open_trace_file() failed.")
 	}
     }
 
-    if ( H5AC2_ext_config_2_int_config(config_ptr, &internal_config) !=
+    if ( H5AC_ext_config_2_int_config(config_ptr, &internal_config) !=
          SUCCEED ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5AC2_ext_config_2_int_config() failed.")
+                    "H5AC_ext_config_2_int_config() failed.")
     }
 
-    result = H5C2_set_cache_auto_resize_config(cache_ptr,
+    result = H5C_set_cache_auto_resize_config(cache_ptr,
                                               &internal_config);
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_set_cache_auto_resize_config() failed.")
+                    "H5C_set_cache_auto_resize_config() failed.")
     }
 
 
-    result = H5C2_set_evictions_enabled(cache_ptr,
+    result = H5C_set_evictions_enabled(cache_ptr,
                                        config_ptr->evictions_enabled);
 
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_set_evictions_enabled() failed.")
+                    "H5C_set_evictions_enabled() failed.")
     }
 
 #ifdef H5_HAVE_PARALLEL
     if ( cache_ptr->aux_ptr != NULL ) {
 
-        ((H5AC2_aux_t *)(cache_ptr->aux_ptr))->dirty_bytes_threshold =
+        ((H5AC_aux_t *)(cache_ptr->aux_ptr))->dirty_bytes_threshold =
             config_ptr->dirty_bytes_threshold;
     }
 #endif /* H5_HAVE_PARALLEL */
@@ -3766,23 +3761,23 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_set_cache_config() */
+} /* H5AC_set_cache_config() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_validate_config()
+ * Function:    H5AC_validate_config()
  *
  * Purpose:     Run a sanity check on the contents of the supplied
- *		instance of H5AC2_cache_config_t.
+ *		instance of H5AC_cache_config_t.
  *
  *              Do nothing and return SUCCEED if no errors are detected,
  *              and flag an error and return FAIL otherwise.
  *
  *		At present, this function operates by packing the data
- *		from the instance of H5AC2_cache_config_t into an instance
- *		of H5C2_auto_size_ctl_t, and then calling
- *		H5C2_validate_resize_config().  As H5AC2_cache_config_t and
- *		H5C2_auto_size_ctl_t diverge, we may have to change this.
+ *		from the instance of H5AC_cache_config_t into an instance
+ *		of H5C_auto_size_ctl_t, and then calling
+ *		H5C_validate_resize_config().  As H5AC_cache_config_t and
+ *		H5C_auto_size_ctl_t diverge, we may have to change this.
  *
  * Return:      Non-negative on success/Negative on failure
  *
@@ -3815,21 +3810,21 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC2_validate_config(H5AC2_cache_config_t * config_ptr)
+H5AC_validate_config(H5AC_cache_config_t * config_ptr)
 {
     herr_t              result;
     int		        name_len;
-    H5C2_auto_size_ctl_t internal_config;
+    H5C_auto_size_ctl_t internal_config;
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_validate_config, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_validate_config, FAIL)
 
     if ( config_ptr == NULL ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config_ptr on entry.")
     }
 
-    if ( config_ptr->version != H5AC2__CURR_CACHE_CONFIG_VERSION ) {
+    if ( config_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unknown config version.")
     }
@@ -3869,7 +3864,7 @@ H5AC2_validate_config(H5AC2_cache_config_t * config_ptr)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
                         "config_ptr->trace_file_name is empty.")
 
-        } else if ( name_len > H5AC2__MAX_TRACE_FILE_NAME_LEN ) {
+        } else if ( name_len > H5AC__MAX_TRACE_FILE_NAME_LEN ) {
 
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
                         "config_ptr->trace_file_name too long.")
@@ -3884,34 +3879,34 @@ H5AC2_validate_config(H5AC2_cache_config_t * config_ptr)
     }
 
     if ( ( config_ptr->evictions_enabled == FALSE ) &&
-	 ( ( config_ptr->incr_mode != H5C2_incr__off ) ||
-	   ( config_ptr->flash_incr_mode != H5C2_flash_incr__off ) ||
-	   ( config_ptr->decr_mode != H5C2_decr__off ) ) ) {
+	 ( ( config_ptr->incr_mode != H5C_incr__off ) ||
+	   ( config_ptr->flash_incr_mode != H5C_flash_incr__off ) ||
+	   ( config_ptr->decr_mode != H5C_decr__off ) ) ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
                     "Can't disable evictions while auto-resize is enabled.")
     }
 
-    if ( config_ptr->dirty_bytes_threshold < H5AC2__MIN_DIRTY_BYTES_THRESHOLD ) {
+    if ( config_ptr->dirty_bytes_threshold < H5AC__MIN_DIRTY_BYTES_THRESHOLD ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
                     "dirty_bytes_threshold too small.")
     } else
-    if ( config_ptr->dirty_bytes_threshold > H5AC2__MAX_DIRTY_BYTES_THRESHOLD ) {
+    if ( config_ptr->dirty_bytes_threshold > H5AC__MAX_DIRTY_BYTES_THRESHOLD ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
                     "dirty_bytes_threshold too big.")
     }
 
-    if ( H5AC2_ext_config_2_int_config(config_ptr, &internal_config) !=
+    if ( H5AC_ext_config_2_int_config(config_ptr, &internal_config) !=
          SUCCEED ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5AC2_ext_config_2_int_config() failed.")
+                    "H5AC_ext_config_2_int_config() failed.")
     }
 
-    result = H5C2_validate_resize_config(&internal_config,
-                                        H5C2_RESIZE_CFG__VALIDATE_ALL);
+    result = H5C_validate_resize_config(&internal_config,
+                                        H5C_RESIZE_CFG__VALIDATE_ALL);
 
     if ( result != SUCCEED ) {
 
@@ -3922,14 +3917,14 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_validate_config() */
+} /* H5AC_validate_config() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_validate_jnl_config()
+ * Function:    H5AC_validate_jnl_config()
  *
  * Purpose:     Run a sanity check on the contents of the supplied
- * 		instance of H5AC2_jnl_config_t.
+ * 		instance of H5AC_jnl_config_t.
  *
  *              Do nothing and return SUCCEED if no errors are detected,
  *              and flag an error and return FAIL otherwise.
@@ -3946,16 +3941,16 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5AC2_validate_jnl_config(const H5AC2_jnl_config_t *config_ptr)
+H5AC_validate_jnl_config(const H5AC_jnl_config_t *config_ptr)
 {
     herr_t	ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_validate_jnl_config, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_validate_jnl_config, FAIL)
 
     if(config_ptr == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config_ptr on entry.")
 
-    if ( config_ptr->version != H5AC2__CURR_JNL_CONFIG_VER ) {
+    if ( config_ptr->version != H5AC__CURR_JNL_CONFIG_VER ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unknown config version.")
     }
@@ -4000,22 +3995,22 @@ H5AC2_validate_jnl_config(const H5AC2_jnl_config_t *config_ptr)
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
                         "config_ptr->journal_file_path is empty.")
 
-        } else if ( name_len > H5AC2__MAX_JOURNAL_FILE_NAME_LEN ) {
+        } else if ( name_len > H5AC__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
                         "config_ptr->journal_file_path too long.")
 	}
     }
 
-    if ( ( config_ptr->jbrb_buf_size < H5AC2__MIN_JBRB_BUF_SIZE ) ||
-         ( config_ptr->jbrb_buf_size > H5AC2__MAX_JBRB_BUF_SIZE ) ) {
+    if ( ( config_ptr->jbrb_buf_size < H5AC__MIN_JBRB_BUF_SIZE ) ||
+         ( config_ptr->jbrb_buf_size > H5AC__MAX_JBRB_BUF_SIZE ) ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
                     "config_ptr->jbrb_buf_size out of range.")
     }
 
-    if ( ( config_ptr->jbrb_num_bufs < H5AC2__MIN_JBRB_NUM_BUFS ) ||
-         ( config_ptr->jbrb_num_bufs > H5AC2__MAX_JBRB_NUM_BUFS ) ) {
+    if ( ( config_ptr->jbrb_num_bufs < H5AC__MIN_JBRB_NUM_BUFS ) ||
+         ( config_ptr->jbrb_num_bufs > H5AC__MAX_JBRB_NUM_BUFS ) ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
                     "config_ptr->jbrb_num_bufs out of range.")
@@ -4037,13 +4032,13 @@ H5AC2_validate_jnl_config(const H5AC2_jnl_config_t *config_ptr)
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5AC2_validate_jnl_config() */
+} /* H5AC_validate_jnl_config() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_validate_jnl_config_ver()
+ * Function:    H5AC_validate_jnl_config_ver()
  *
- * Purpose:     Return true if the supplied H5AC2_jnl_config_t version
+ * Purpose:     Return true if the supplied H5AC_jnl_config_t version
  *		number is valid, and FALSE otherwise.
  *
  * Return:      TRUE if the version number is valid, and FALSE otherwise.
@@ -4058,18 +4053,18 @@ done:
  *-------------------------------------------------------------------------
  */
 hbool_t
-H5AC2_validate_jnl_config_ver(int version_num)
+H5AC_validate_jnl_config_ver(int version_num)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC2_validate_jnl_config_ver)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_validate_jnl_config_ver)
 
-    FUNC_LEAVE_NOAPI(version_num == H5AC2__CURR_JNL_CONFIG_VER)
-} /* H5AC2_validate_jnl_config_ver() */
+    FUNC_LEAVE_NOAPI(version_num == H5AC__CURR_JNL_CONFIG_VER)
+} /* H5AC_validate_jnl_config_ver() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_validate_cache_config_ver()
+ * Function:    H5AC_validate_cache_config_ver()
  *
- * Purpose:     Return true if the supplied H5AC2_cache_config_t version
+ * Purpose:     Return true if the supplied H5AC_cache_config_t version
  *		number is valid, and FALSE otherwise.
  *
  * Return:      TRUE if the version number is valid, and FALSE otherwise.
@@ -4084,16 +4079,16 @@ H5AC2_validate_jnl_config_ver(int version_num)
  *-------------------------------------------------------------------------
  */
 hbool_t
-H5AC2_validate_cache_config_ver(int version_num)
+H5AC_validate_cache_config_ver(int version_num)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC2_validate_cache_config_ver)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_validate_cache_config_ver)
 
-    FUNC_LEAVE_NOAPI(version_num == H5AC2__CURR_CACHE_CONFIG_VERSION)
-} /* H5AC2_validate_cache_config_ver() */
+    FUNC_LEAVE_NOAPI(version_num == H5AC__CURR_CACHE_CONFIG_VERSION)
+} /* H5AC_validate_cache_config_ver() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_close_trace_file()
+ * Function:    H5AC_close_trace_file()
  *
  * Purpose:     If a trace file is open, stop logging calls to the cache,
  *              and close the file.
@@ -4116,31 +4111,31 @@ H5AC2_validate_cache_config_ver(int version_num)
  */
 
 herr_t
-H5AC2_close_trace_file(H5AC2_t * cache_ptr)
+H5AC_close_trace_file(H5AC_t * cache_ptr)
 
 {
     herr_t   ret_value = SUCCEED;    /* Return value */
     FILE *   trace_file_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5AC2_close_trace_file, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_close_trace_file, FAIL)
 
     if ( cache_ptr == NULL ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL cache_ptr on entry.")
     }
 
-    if ( H5C2_get_trace_file_ptr(cache_ptr, &trace_file_ptr) < 0 ) {
+    if ( H5C_get_trace_file_ptr(cache_ptr, &trace_file_ptr) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-		    "H5C2_get_trace_file_ptr() failed.")
+		    "H5C_get_trace_file_ptr() failed.")
     }
 
     if ( trace_file_ptr != NULL ) {
 
-        if ( H5C2_set_trace_file_ptr(cache_ptr, NULL) < 0 ) {
+        if ( H5C_set_trace_file_ptr(cache_ptr, NULL) < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C2_set_trace_file_ptr() failed.")
+                        "H5C_set_trace_file_ptr() failed.")
          }
 
         if ( HDfclose(trace_file_ptr) != 0 ) {
@@ -4154,16 +4149,16 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_close_trace_file() */
+} /* H5AC_close_trace_file() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_open_trace_file()
+ * Function:    H5AC_open_trace_file()
  *
  * Purpose:     Open a trace file, and start logging calls to the cache.
  *
- * 		This logging is done at the H5C2 level, and will only take
- * 		place if H5C2_TRACE_FILE_ENABLED (defined in H5C2private.h)
+ * 		This logging is done at the H5C level, and will only take
+ * 		place if H5C_TRACE_FILE_ENABLED (defined in H5Cprivate.h)
  * 		is TRUE.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -4181,17 +4176,17 @@ done:
  */
 
 herr_t
-H5AC2_open_trace_file(H5AC2_t * cache_ptr,
+H5AC_open_trace_file(H5AC_t * cache_ptr,
  		      const char * trace_file_name)
 {
     herr_t   ret_value = SUCCEED;    /* Return value */
-    char     file_name[H5AC2__MAX_TRACE_FILE_NAME_LEN + H5C2__PREFIX_LEN + 2];
+    char     file_name[H5AC__MAX_TRACE_FILE_NAME_LEN + H5C__PREFIX_LEN + 2];
     FILE *   file_ptr = NULL;
 #ifdef H5_HAVE_PARALLEL
-    H5AC2_aux_t * aux_ptr = NULL;
+    H5AC_aux_t * aux_ptr = NULL;
 #endif /* H5_HAVE_PARALLEL */
 
-    FUNC_ENTER_NOAPI(H5AC2_open_trace_file, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_open_trace_file, FAIL)
 
     HDassert(cache_ptr);
 
@@ -4206,15 +4201,15 @@ H5AC2_open_trace_file(H5AC2_t * cache_ptr,
 		    "NULL trace_file_name on entry.")
     }
 
-    if ( HDstrlen(trace_file_name) > H5AC2__MAX_TRACE_FILE_NAME_LEN ) {
+    if ( HDstrlen(trace_file_name) > H5AC__MAX_TRACE_FILE_NAME_LEN ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "trace file name too long.")
     }
 
-    if ( H5C2_get_trace_file_ptr(cache_ptr, &file_ptr) < 0 ) {
+    if ( H5C_get_trace_file_ptr(cache_ptr, &file_ptr) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-		    "H5C2_get_trace_file_ptr() failed.")
+		    "H5C_get_trace_file_ptr() failed.")
     }
 
     if ( file_ptr != NULL ) {
@@ -4224,7 +4219,7 @@ H5AC2_open_trace_file(H5AC2_t * cache_ptr,
 
 #ifdef H5_HAVE_PARALLEL
 
-    aux_ptr = (H5AC2_aux_t *)(cache_ptr->aux_ptr);
+    aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
     if ( cache_ptr->aux_ptr == NULL ) {
 
@@ -4232,7 +4227,7 @@ H5AC2_open_trace_file(H5AC2_t * cache_ptr,
 
     } else {
 
-	if ( aux_ptr->magic != H5AC2__H5AC2_AUX_T_MAGIC ) {
+	if ( aux_ptr->magic != H5AC__H5AC_AUX_T_MAGIC ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad aux_ptr->magic.")
 	}
@@ -4242,7 +4237,7 @@ H5AC2_open_trace_file(H5AC2_t * cache_ptr,
     }
 
     if ( HDstrlen(file_name) >
-         H5AC2__MAX_TRACE_FILE_NAME_LEN + H5C2__PREFIX_LEN + 1 ) {
+         H5AC__MAX_TRACE_FILE_NAME_LEN + H5C__PREFIX_LEN + 1 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
 		    "cooked trace file name too long.")
@@ -4262,17 +4257,17 @@ H5AC2_open_trace_file(H5AC2_t * cache_ptr,
 
     HDfprintf(file_ptr, "### HDF5 metadata cache trace file version 2 ###\n");
 
-    if ( H5C2_set_trace_file_ptr(cache_ptr, file_ptr) < 0 ) {
+    if ( H5C_set_trace_file_ptr(cache_ptr, file_ptr) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-		    "H5C2_set_trace_file_ptr() failed.")
+		    "H5C_set_trace_file_ptr() failed.")
     }
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_open_trace_file() */
+} /* H5AC_open_trace_file() */
 
 
 /*************************************************************************/
@@ -4281,7 +4276,7 @@ done:
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5AC2_broadcast_clean_list()
+ * Function:    H5AC_broadcast_clean_list()
  *
  * Purpose:     Broadcast the contents of the process 0 cleaned entry
  *		slist.  In passing, also remove all entries from said
@@ -4304,28 +4299,28 @@ done:
 
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC2_broadcast_clean_list(H5AC2_t * cache_ptr)
+H5AC_broadcast_clean_list(H5AC_t * cache_ptr)
 {
     herr_t               ret_value = SUCCEED;    /* Return value */
     haddr_t		 addr;
-    H5AC2_aux_t         * aux_ptr = NULL;
+    H5AC_aux_t         * aux_ptr = NULL;
     H5SL_node_t        * slist_node_ptr = NULL;
-    H5AC2_slist_entry_t * slist_entry_ptr = NULL;
+    H5AC_slist_entry_t * slist_entry_ptr = NULL;
     MPI_Offset         * buf_ptr = NULL;
     size_t		 buf_size;
     int                  i = 0;
     int                  mpi_result;
     int			 num_entries;
 
-    FUNC_ENTER_NOAPI(H5AC2_broadcast_clean_list, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_broadcast_clean_list, FAIL)
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
-    aux_ptr = (H5AC2_aux_t *)(cache_ptr->aux_ptr);
+    aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
     HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC2__H5AC2_AUX_T_MAGIC );
+    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
     HDassert( aux_ptr->mpi_rank == 0 );
     HDassert( aux_ptr->c_slist_ptr != NULL );
     HDassert( H5SL_count(aux_ptr->c_slist_ptr) ==
@@ -4368,7 +4363,7 @@ H5AC2_broadcast_clean_list(H5AC2_t * cache_ptr)
         {
             slist_entry_ptr = H5SL_item(slist_node_ptr);
 
-            HDassert(slist_entry_ptr->magic == H5AC2__H5AC2_SLIST_ENTRY_T_MAGIC);
+            HDassert(slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
 
             HDassert( i < num_entries );
 
@@ -4391,7 +4386,7 @@ H5AC2_broadcast_clean_list(H5AC2_t * cache_ptr)
             }
 
             slist_entry_ptr->magic = 0;
-            H5FL_FREE(H5AC2_slist_entry_t, slist_entry_ptr);
+            H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
             slist_entry_ptr = NULL;
 
             aux_ptr->c_slist_len -= 1;
@@ -4405,7 +4400,7 @@ H5AC2_broadcast_clean_list(H5AC2_t * cache_ptr)
                                                 (void *)(&addr))) != NULL ) {
 
                 HDassert( slist_entry_ptr->magic ==
-                          H5AC2__H5AC2_SLIST_ENTRY_T_MAGIC );
+                          H5AC__H5AC_SLIST_ENTRY_T_MAGIC );
                 HDassert( slist_entry_ptr->addr == addr );
 
                 if ( H5SL_remove(aux_ptr->d_slist_ptr, (void *)(&addr))
@@ -4416,7 +4411,7 @@ H5AC2_broadcast_clean_list(H5AC2_t * cache_ptr)
                 }
 
                 slist_entry_ptr->magic = 0;
-                H5FL_FREE(H5AC2_slist_entry_t, slist_entry_ptr);
+                H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
                 slist_entry_ptr = NULL;
 
                 aux_ptr->d_slist_len -= 1;
@@ -4453,13 +4448,13 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_broadcast_clean_list() */
+} /* H5AC_broadcast_clean_list() */
 #endif /* H5_HAVE_PARALLEL */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5AC2_check_if_write_permitted
+ * Function:    H5AC_check_if_write_permitted
  *
  * Purpose:     Determine if a write is permitted under the current
  *		circumstances, and set *write_permitted_ptr accordingly.
@@ -4491,12 +4486,12 @@ done:
 
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC2_check_if_write_permitted(const H5F_t *f,
+H5AC_check_if_write_permitted(const H5F_t *f,
                               hid_t UNUSED dxpl_id,
                               hbool_t * write_permitted_ptr)
 #else /* H5_HAVE_PARALLEL */
 static herr_t
-H5AC2_check_if_write_permitted(const H5F_t UNUSED * f,
+H5AC_check_if_write_permitted(const H5F_t UNUSED * f,
                               hid_t UNUSED dxpl_id,
                               hbool_t * write_permitted_ptr)
 #endif /* H5_HAVE_PARALLEL */
@@ -4504,22 +4499,22 @@ H5AC2_check_if_write_permitted(const H5F_t UNUSED * f,
     hbool_t		write_permitted = TRUE;
     herr_t		ret_value = SUCCEED;      /* Return value */
 #ifdef H5_HAVE_PARALLEL
-    H5AC2_aux_t *	aux_ptr = NULL;
+    H5AC_aux_t *	aux_ptr = NULL;
 #endif /* H5_HAVE_PARALLEL */
 
 
-    FUNC_ENTER_NOAPI(H5AC2_check_if_write_permitted, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_check_if_write_permitted, FAIL)
 
 #ifdef H5_HAVE_PARALLEL
     HDassert( f != NULL );
     HDassert( f->shared != NULL );
-    HDassert( f->shared->cache2 != NULL );
+    HDassert( f->shared->cache != NULL );
 
-    aux_ptr = (H5AC2_aux_t *)(f->shared->cache2->aux_ptr);
+    aux_ptr = (H5AC_aux_t *)(f->shared->cache->aux_ptr);
 
     if ( aux_ptr != NULL ) {
 
-        HDassert( aux_ptr->magic == H5AC2__H5AC2_AUX_T_MAGIC );
+        HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
 
         if ( aux_ptr->mpi_rank == 0 ) {
 
@@ -4538,14 +4533,14 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_check_if_write_permitted() */
+} /* H5AC_check_if_write_permitted() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_ext_config_2_int_config()
+ * Function:    H5AC_ext_config_2_int_config()
  *
  * Purpose:     Utility function to translate an instance of
- *		H5AC2_cache_config_t to an instance of H5C2_auto_size_ctl_t.
+ *		H5AC_cache_config_t to an instance of H5C_auto_size_ctl_t.
  *
  *		Places translation in *int_conf_ptr and returns SUCCEED
  *		if successful.  Returns FAIL on failure.
@@ -4568,24 +4563,24 @@ done:
  */
 
 herr_t
-H5AC2_ext_config_2_int_config(H5AC2_cache_config_t * ext_conf_ptr,
-                             H5C2_auto_size_ctl_t * int_conf_ptr)
+H5AC_ext_config_2_int_config(H5AC_cache_config_t * ext_conf_ptr,
+                             H5C_auto_size_ctl_t * int_conf_ptr)
 {
     herr_t               ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_ext_config_2_int_config, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_ext_config_2_int_config, FAIL)
 
     if ( ( ext_conf_ptr == NULL ) ||
-         ( ext_conf_ptr->version != H5AC2__CURR_CACHE_CONFIG_VERSION ) ||
+         ( ext_conf_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION ) ||
          ( int_conf_ptr == NULL ) ) {
 
     }
 
-    int_conf_ptr->version                = H5C2__CURR_AUTO_SIZE_CTL_VER;
+    int_conf_ptr->version                = H5C__CURR_AUTO_SIZE_CTL_VER;
 
     if ( ext_conf_ptr->rpt_fcn_enabled ) {
 
-        int_conf_ptr->rpt_fcn            = H5C2_def_auto_resize_rpt_fcn;
+        int_conf_ptr->rpt_fcn            = H5C_def_auto_resize_rpt_fcn;
 
     } else {
 
@@ -4624,14 +4619,14 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_ext_config_2_int_config() */
+} /* H5AC_ext_config_2_int_config() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5AC2_log_deleted_entry()
+ * Function:    H5AC_log_deleted_entry()
  *
- * Purpose:     Log an entry for which H5C2__DELETED_FLAG has been set.
+ * Purpose:     Log an entry for which H5C__DELETED_FLAG has been set.
  *
  *		If mpi_rank is 0, we must make sure that the entry doesn't
  *		appear in the cleaned or dirty entry lists.  Otherwise,
@@ -4650,29 +4645,29 @@ done:
 
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC2_log_deleted_entry(H5AC2_t * cache_ptr,
-                       H5AC2_info_t * entry_ptr,
+H5AC_log_deleted_entry(H5AC_t * cache_ptr,
+                       H5AC_info_t * entry_ptr,
                        haddr_t addr,
                        unsigned int flags)
 {
     herr_t               ret_value = SUCCEED;    /* Return value */
-    H5AC2_aux_t         * aux_ptr = NULL;
-    H5AC2_slist_entry_t * slist_entry_ptr = NULL;
+    H5AC_aux_t         * aux_ptr = NULL;
+    H5AC_slist_entry_t * slist_entry_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5AC2_log_deleted_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_log_deleted_entry, FAIL)
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     aux_ptr = cache_ptr->aux_ptr;
 
     HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC2__H5AC2_AUX_T_MAGIC );
+    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
 
     HDassert( entry_ptr != NULL );
     HDassert( entry_ptr->addr == addr );
 
-    HDassert( (flags & H5C2__DELETED_FLAG) != 0 );
+    HDassert( (flags & H5C__DELETED_FLAG) != 0 );
 
     if ( aux_ptr->mpi_rank == 0 ) {
 
@@ -4684,7 +4679,7 @@ H5AC2_log_deleted_entry(H5AC2_t * cache_ptr,
                                             (void *)(&addr))) != NULL ) {
 
             HDassert( slist_entry_ptr->magic ==
-                      H5AC2__H5AC2_SLIST_ENTRY_T_MAGIC );
+                      H5AC__H5AC_SLIST_ENTRY_T_MAGIC );
             HDassert( slist_entry_ptr->addr == addr );
 
             if ( H5SL_remove(aux_ptr->d_slist_ptr, (void *)(&addr))
@@ -4695,7 +4690,7 @@ H5AC2_log_deleted_entry(H5AC2_t * cache_ptr,
             }
 
             slist_entry_ptr->magic = 0;
-            H5FL_FREE(H5AC2_slist_entry_t, slist_entry_ptr);
+            H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
             slist_entry_ptr = NULL;
 
             aux_ptr->d_slist_len -= 1;
@@ -4708,7 +4703,7 @@ H5AC2_log_deleted_entry(H5AC2_t * cache_ptr,
                                             (void *)(&addr))) != NULL ) {
 
             HDassert( slist_entry_ptr->magic ==
-                      H5AC2__H5AC2_SLIST_ENTRY_T_MAGIC );
+                      H5AC__H5AC_SLIST_ENTRY_T_MAGIC );
             HDassert( slist_entry_ptr->addr == addr );
 
             if ( H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&addr))
@@ -4719,7 +4714,7 @@ H5AC2_log_deleted_entry(H5AC2_t * cache_ptr,
             }
 
             slist_entry_ptr->magic = 0;
-            H5FL_FREE(H5AC2_slist_entry_t, slist_entry_ptr);
+            H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
             slist_entry_ptr = NULL;
 
             aux_ptr->c_slist_len -= 1;
@@ -4732,13 +4727,13 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_log_deleted_entry() */
+} /* H5AC_log_deleted_entry() */
 #endif /* H5_HAVE_PARALLEL */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5AC2_log_dirtied_entry()
+ * Function:    H5AC_log_dirtied_entry()
  *
  * Purpose:     Update the dirty_bytes count for a newly dirtied entry.
  *
@@ -4762,17 +4757,17 @@ done:
 
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC2_log_dirtied_entry(const H5AC2_info_t * entry_ptr,
+H5AC_log_dirtied_entry(const H5AC_info_t * entry_ptr,
                        haddr_t addr,
                        hbool_t size_changed,
                        size_t new_size)
 {
     size_t		 entry_size;
-    H5AC2_t             * cache_ptr;
-    H5AC2_aux_t         * aux_ptr;
+    H5AC_t             * cache_ptr;
+    H5AC_aux_t         * aux_ptr;
     herr_t               ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5AC2_log_dirtied_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_log_dirtied_entry, FAIL)
 
     HDassert( entry_ptr );
     HDassert( entry_ptr->addr == addr );
@@ -4781,12 +4776,12 @@ H5AC2_log_dirtied_entry(const H5AC2_info_t * entry_ptr,
     cache_ptr = entry_ptr->cache_ptr;
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     aux_ptr = cache_ptr->aux_ptr;
 
     HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC2__H5AC2_AUX_T_MAGIC );
+    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
 
     if ( size_changed ) {
 
@@ -4798,7 +4793,7 @@ H5AC2_log_dirtied_entry(const H5AC2_info_t * entry_ptr,
     }
 
     if ( aux_ptr->mpi_rank == 0 ) {
-        H5AC2_slist_entry_t * slist_entry_ptr;
+        H5AC_slist_entry_t * slist_entry_ptr;
 
         HDassert( aux_ptr->d_slist_ptr != NULL );
         HDassert( aux_ptr->c_slist_ptr != NULL );
@@ -4808,13 +4803,13 @@ H5AC2_log_dirtied_entry(const H5AC2_info_t * entry_ptr,
             /* insert the address of the entry in the dirty entry list, and
              * add its size to the dirty_bytes count.
              */
-            if ( NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC2_slist_entry_t)) ) {
+            if ( NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC_slist_entry_t)) ) {
 
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
                             "Can't allocate dirty slist entry .")
             }
 
-            slist_entry_ptr->magic = H5AC2__H5AC2_SLIST_ENTRY_T_MAGIC;
+            slist_entry_ptr->magic = H5AC__H5AC_SLIST_ENTRY_T_MAGIC;
             slist_entry_ptr->addr  = addr;
 
             if ( H5SL_insert(aux_ptr->d_slist_ptr, slist_entry_ptr,
@@ -4826,10 +4821,10 @@ H5AC2_log_dirtied_entry(const H5AC2_info_t * entry_ptr,
 
             aux_ptr->d_slist_len += 1;
             aux_ptr->dirty_bytes += entry_size;
-#if H5AC2_DEBUG_DIRTY_BYTES_CREATION
+#if H5AC_DEBUG_DIRTY_BYTES_CREATION
 	    aux_ptr->unprotect_dirty_bytes += entry_size;
 	    aux_ptr->unprotect_dirty_bytes_updates += 1;
-#endif /* H5AC2_DEBUG_DIRTY_BYTES_CREATION */
+#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
         }
 
         if ( H5SL_search(aux_ptr->c_slist_ptr, (void *)(&addr)) != NULL ) {
@@ -4841,7 +4836,7 @@ H5AC2_log_dirtied_entry(const H5AC2_info_t * entry_ptr,
                                                 (void *)(&addr))) != NULL ) {
 
                 HDassert( slist_entry_ptr->magic ==
-                          H5AC2__H5AC2_SLIST_ENTRY_T_MAGIC );
+                          H5AC__H5AC_SLIST_ENTRY_T_MAGIC );
                 HDassert( slist_entry_ptr->addr == addr );
 
                 if ( H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&addr))
@@ -4852,7 +4847,7 @@ H5AC2_log_dirtied_entry(const H5AC2_info_t * entry_ptr,
                 }
 
                 slist_entry_ptr->magic = 0;
-                H5FL_FREE(H5AC2_slist_entry_t, slist_entry_ptr);
+                H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
                 slist_entry_ptr = NULL;
 
                 aux_ptr->c_slist_len -= 1;
@@ -4863,23 +4858,23 @@ H5AC2_log_dirtied_entry(const H5AC2_info_t * entry_ptr,
     } else {
 
         aux_ptr->dirty_bytes += entry_size;
-#if H5AC2_DEBUG_DIRTY_BYTES_CREATION
+#if H5AC_DEBUG_DIRTY_BYTES_CREATION
         aux_ptr->unprotect_dirty_bytes += entry_size;
         aux_ptr->unprotect_dirty_bytes_updates += 1;
-#endif /* H5AC2_DEBUG_DIRTY_BYTES_CREATION */
+#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
     }
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_log_dirtied_entry() */
+} /* H5AC_log_dirtied_entry() */
 #endif /* H5_HAVE_PARALLEL */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5AC2_log_flushed_entry()
+ * Function:    H5AC_log_flushed_entry()
  *
  * Purpose:     Update the clean entry slist for the flush of an entry --
  *		specifically, if the entry has been cleared, remove it
@@ -4904,34 +4899,34 @@ done:
 #ifdef H5_HAVE_PARALLEL
 #if 0 /* This is useful debugging code. -- JRM */
 static herr_t
-H5AC2_log_flushed_entry_dummy(H5C2_t * cache_ptr,
+H5AC_log_flushed_entry_dummy(H5C_t * cache_ptr,
                              haddr_t addr,
                              hbool_t was_dirty,
                              unsigned flags,
                              int type_id)
 {
     herr_t               ret_value = SUCCEED;    /* Return value */
-    H5AC2_aux_t         * aux_ptr = NULL;
+    H5AC_aux_t         * aux_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5AC2_log_flushed_entry_dummy, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_log_flushed_entry_dummy, FAIL)
 
     aux_ptr = cache_ptr->aux_ptr;
 
-    if ( ( was_dirty ) && ( (flags & H5C2__FLUSH_CLEAR_ONLY_FLAG) == 0 ) ) {
+    if ( ( was_dirty ) && ( (flags & H5C__FLUSH_CLEAR_ONLY_FLAG) == 0 ) ) {
 
         HDfprintf(stdout,
-         "%d:H5AC2_log_flushed_entry(): addr = %d, flags = %x, was_dirty = %d, type_id = %d\n",
+         "%d:H5AC_log_flushed_entry(): addr = %d, flags = %x, was_dirty = %d, type_id = %d\n",
          (int)(aux_ptr->mpi_rank), (int)addr, flags, (int)was_dirty, type_id);
     }
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_log_flushed_entry_dummy() */
+} /* H5AC_log_flushed_entry_dummy() */
 #endif /* JRM */
 
 static herr_t
-H5AC2_log_flushed_entry(H5C2_t * cache_ptr,
+H5AC_log_flushed_entry(H5C_t * cache_ptr,
                        haddr_t addr,
                        hbool_t was_dirty,
                        unsigned flags,
@@ -4939,23 +4934,23 @@ H5AC2_log_flushed_entry(H5C2_t * cache_ptr,
 {
     herr_t               ret_value = SUCCEED;    /* Return value */
     hbool_t		 cleared;
-    H5AC2_aux_t         * aux_ptr;
-    H5AC2_slist_entry_t * slist_entry_ptr = NULL;
+    H5AC_aux_t         * aux_ptr;
+    H5AC_slist_entry_t * slist_entry_ptr = NULL;
 
 
-    FUNC_ENTER_NOAPI(H5AC2_log_flushed_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_log_flushed_entry, FAIL)
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     aux_ptr = cache_ptr->aux_ptr;
 
     HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC2__H5AC2_AUX_T_MAGIC );
+    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
     HDassert( aux_ptr->mpi_rank == 0 );
     HDassert( aux_ptr->c_slist_ptr != NULL );
 
-    cleared = ( (flags & H5C2__FLUSH_CLEAR_ONLY_FLAG) != 0 );
+    cleared = ( (flags & H5C__FLUSH_CLEAR_ONLY_FLAG) != 0 );
 
     if ( cleared ) {
 
@@ -4966,7 +4961,7 @@ H5AC2_log_flushed_entry(H5C2_t * cache_ptr,
         if ( (slist_entry_ptr = H5SL_search(aux_ptr->c_slist_ptr,
                                             (void *)(&addr))) != NULL ) {
 
-            HDassert( slist_entry_ptr->magic == H5AC2__H5AC2_SLIST_ENTRY_T_MAGIC);
+            HDassert( slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
             HDassert( slist_entry_ptr->addr == addr );
 
             if ( H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&addr))
@@ -4977,7 +4972,7 @@ H5AC2_log_flushed_entry(H5C2_t * cache_ptr,
             }
 
             slist_entry_ptr->magic = 0;
-            H5FL_FREE(H5AC2_slist_entry_t, slist_entry_ptr);
+            H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
             slist_entry_ptr = NULL;
 
             aux_ptr->c_slist_len -= 1;
@@ -4988,7 +4983,7 @@ H5AC2_log_flushed_entry(H5C2_t * cache_ptr,
         if ( (slist_entry_ptr = H5SL_search(aux_ptr->d_slist_ptr,
                                             (void *)(&addr))) != NULL ) {
 
-            HDassert( slist_entry_ptr->magic == H5AC2__H5AC2_SLIST_ENTRY_T_MAGIC);
+            HDassert( slist_entry_ptr->magic == H5AC__H5AC_SLIST_ENTRY_T_MAGIC);
             HDassert( slist_entry_ptr->addr == addr );
 
             if ( H5SL_remove(aux_ptr->d_slist_ptr, (void *)(&addr))
@@ -4999,7 +4994,7 @@ H5AC2_log_flushed_entry(H5C2_t * cache_ptr,
             }
 
             slist_entry_ptr->magic = 0;
-            H5FL_FREE(H5AC2_slist_entry_t, slist_entry_ptr);
+            H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
             slist_entry_ptr = NULL;
 
             aux_ptr->d_slist_len -= 1;
@@ -5012,13 +5007,13 @@ H5AC2_log_flushed_entry(H5C2_t * cache_ptr,
 
             /* insert the address of the entry in the clean entry list. */
 
-            if ( NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC2_slist_entry_t)) ) {
+            if ( NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC_slist_entry_t)) ) {
 
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
                             "Can't allocate clean slist entry .")
             }
 
-            slist_entry_ptr->magic = H5AC2__H5AC2_SLIST_ENTRY_T_MAGIC;
+            slist_entry_ptr->magic = H5AC__H5AC_SLIST_ENTRY_T_MAGIC;
             slist_entry_ptr->addr  = addr;
 
             if ( H5SL_insert(aux_ptr->c_slist_ptr, slist_entry_ptr,
@@ -5036,13 +5031,13 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_log_flushed_entry() */
+} /* H5AC_log_flushed_entry() */
 #endif /* H5_HAVE_PARALLEL */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5AC2_log_inserted_entry()
+ * Function:    H5AC_log_inserted_entry()
  *
  * Purpose:     Update the dirty_bytes count for a newly inserted entry.
  *
@@ -5068,26 +5063,26 @@ done:
 
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC2_log_inserted_entry(H5F_t * f,
-                        H5AC2_t * cache_ptr,
-                        H5AC2_info_t * entry_ptr,
-                        const H5AC2_class_t * type,
+H5AC_log_inserted_entry(H5F_t * f,
+                        H5AC_t * cache_ptr,
+                        H5AC_info_t * entry_ptr,
+                        const H5AC_class_t * type,
                         haddr_t addr,
                         size_t size)
 {
     herr_t               ret_value = SUCCEED;    /* Return value */
-    H5AC2_aux_t         * aux_ptr = NULL;
-    H5AC2_slist_entry_t * slist_entry_ptr = NULL;
+    H5AC_aux_t         * aux_ptr = NULL;
+    H5AC_slist_entry_t * slist_entry_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5AC2_log_inserted_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_log_inserted_entry, FAIL)
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     aux_ptr = cache_ptr->aux_ptr;
 
     HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC2__H5AC2_AUX_T_MAGIC );
+    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
 
     HDassert( entry_ptr != NULL );
     HDassert( entry_ptr->addr == addr );
@@ -5103,13 +5098,13 @@ H5AC2_log_inserted_entry(H5F_t * f,
             /* insert the address of the entry in the dirty entry list, and
              * add its size to the dirty_bytes count.
              */
-            if ( NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC2_slist_entry_t)) ) {
+            if ( NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC_slist_entry_t)) ) {
 
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
                             "Can't allocate dirty slist entry .")
             }
 
-            slist_entry_ptr->magic = H5AC2__H5AC2_SLIST_ENTRY_T_MAGIC;
+            slist_entry_ptr->magic = H5AC__H5AC_SLIST_ENTRY_T_MAGIC;
             slist_entry_ptr->addr  = addr;
 
             if ( H5SL_insert(aux_ptr->d_slist_ptr, slist_entry_ptr,
@@ -5136,22 +5131,22 @@ H5AC2_log_inserted_entry(H5F_t * f,
 
     aux_ptr->dirty_bytes += size;
 
-#if H5AC2_DEBUG_DIRTY_BYTES_CREATION
+#if H5AC_DEBUG_DIRTY_BYTES_CREATION
     aux_ptr->insert_dirty_bytes += size;
     aux_ptr->insert_dirty_bytes_updates += 1;
-#endif /* H5AC2_DEBUG_DIRTY_BYTES_CREATION */
+#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_log_inserted_entry() */
+} /* H5AC_log_inserted_entry() */
 #endif /* H5_HAVE_PARALLEL */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5AC2_log_renamed_entry()
+ * Function:    H5AC_log_renamed_entry()
  *
  * Purpose:     Update the dirty_bytes count for a renamed entry.
  *
@@ -5200,35 +5195,35 @@ done:
 
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC2_log_renamed_entry(H5F_t * f,
+H5AC_log_renamed_entry(H5F_t * f,
                        haddr_t old_addr,
                        haddr_t new_addr)
 {
     herr_t               ret_value = SUCCEED;    /* Return value */
-    H5AC2_t *            cache_ptr;
+    H5AC_t *            cache_ptr;
     hbool_t		 entry_in_cache;
     hbool_t		 entry_dirty;
     size_t               entry_size;
-    H5AC2_aux_t         * aux_ptr = NULL;
-    H5AC2_slist_entry_t * slist_entry_ptr = NULL;
+    H5AC_aux_t         * aux_ptr = NULL;
+    H5AC_slist_entry_t * slist_entry_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5AC2_log_renamed_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_log_renamed_entry, FAIL)
 
     HDassert( f != NULL );
     HDassert( f->shared != NULL );
 
-    cache_ptr = (H5AC2_t *)f->shared->cache2;
+    cache_ptr = (H5AC_t *)f->shared->cache;
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     aux_ptr = cache_ptr->aux_ptr;
 
     HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC2__H5AC2_AUX_T_MAGIC );
+    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
 
     /* get entry status, size, etc here */
-    if ( H5C2_get_entry_status(f, old_addr, &entry_size, &entry_in_cache,
+    if ( H5C_get_entry_status(f, old_addr, &entry_size, &entry_in_cache,
                               &entry_dirty, NULL, NULL) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't get entry status.")
@@ -5251,7 +5246,7 @@ H5AC2_log_renamed_entry(H5F_t * f,
                                             (void *)(&old_addr))) != NULL ) {
 
             HDassert( slist_entry_ptr->magic ==
-                          H5AC2__H5AC2_SLIST_ENTRY_T_MAGIC );
+                          H5AC__H5AC_SLIST_ENTRY_T_MAGIC );
             HDassert( slist_entry_ptr->addr == old_addr );
 
             if ( H5SL_remove(aux_ptr->c_slist_ptr, (void *)(&old_addr))
@@ -5262,7 +5257,7 @@ H5AC2_log_renamed_entry(H5F_t * f,
             }
 
             slist_entry_ptr->magic = 0;
-            H5FL_FREE(H5AC2_slist_entry_t, slist_entry_ptr);
+            H5FL_FREE(H5AC_slist_entry_t, slist_entry_ptr);
             slist_entry_ptr = NULL;
 
             aux_ptr->c_slist_len -= 1;
@@ -5277,7 +5272,7 @@ H5AC2_log_renamed_entry(H5F_t * f,
                                             (void *)(&old_addr))) != NULL ) {
 
             HDassert( slist_entry_ptr->magic ==
-                      H5AC2__H5AC2_SLIST_ENTRY_T_MAGIC );
+                      H5AC__H5AC_SLIST_ENTRY_T_MAGIC );
             HDassert( slist_entry_ptr->addr == old_addr );
 
             if ( H5SL_remove(aux_ptr->d_slist_ptr, (void *)(&old_addr))
@@ -5305,21 +5300,21 @@ H5AC2_log_renamed_entry(H5F_t * f,
 
             HDassert( !entry_dirty );
 
-            if ( NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC2_slist_entry_t)) ) {
+            if ( NULL == (slist_entry_ptr = H5FL_CALLOC(H5AC_slist_entry_t)) ) {
 
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
                             "Can't allocate dirty slist entry .")
             }
 
-            slist_entry_ptr->magic = H5AC2__H5AC2_SLIST_ENTRY_T_MAGIC;
+            slist_entry_ptr->magic = H5AC__H5AC_SLIST_ENTRY_T_MAGIC;
             slist_entry_ptr->addr  = new_addr;
 
             aux_ptr->dirty_bytes += entry_size;
 
-#if H5AC2_DEBUG_DIRTY_BYTES_CREATION
+#if H5AC_DEBUG_DIRTY_BYTES_CREATION
             aux_ptr->rename_dirty_bytes += entry_size;
             aux_ptr->rename_dirty_bytes_updates += 1;
-#endif /* H5AC2_DEBUG_DIRTY_BYTES_CREATION */
+#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
         }
 
         /* verify that there is no entry at new_addr in the dirty slist */
@@ -5343,22 +5338,22 @@ H5AC2_log_renamed_entry(H5F_t * f,
 
         aux_ptr->dirty_bytes += entry_size;
 
-#if H5AC2_DEBUG_DIRTY_BYTES_CREATION
+#if H5AC_DEBUG_DIRTY_BYTES_CREATION
         aux_ptr->rename_dirty_bytes += entry_size;
         aux_ptr->rename_dirty_bytes_updates += 1;
-#endif /* H5AC2_DEBUG_DIRTY_BYTES_CREATION */
+#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
     }
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_log_renamed_entry() */
+} /* H5AC_log_renamed_entry() */
 #endif /* H5_HAVE_PARALLEL */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5AC2_propagate_flushed_and_still_clean_entries_list
+ * Function:    H5AC_propagate_flushed_and_still_clean_entries_list
  *
  * Purpose:     In PHDF5, only the metadata cache with mpi rank 0 is allowed
  *		to write to file.  All other metadata caches on processes
@@ -5432,29 +5427,29 @@ done:
 
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5AC2_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
+H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
                                                     hid_t    dxpl_id,
-                                                    H5AC2_t * cache_ptr,
+                                                    H5AC_t * cache_ptr,
                                                     hbool_t  do_barrier)
 {
     herr_t	 ret_value = SUCCEED;   /* Return value */
     herr_t	 result;
     int		 mpi_code;
-    H5AC2_aux_t * aux_ptr = NULL;
+    H5AC_aux_t * aux_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5AC2_propagate_flushed_and_still_clean_entries_list, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_propagate_flushed_and_still_clean_entries_list, FAIL)
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
-    aux_ptr = (H5AC2_aux_t *)(cache_ptr->aux_ptr);
+    aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
     HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC2__H5AC2_AUX_T_MAGIC );
+    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
 
-#if H5AC2_DEBUG_DIRTY_BYTES_CREATION
+#if H5AC_DEBUG_DIRTY_BYTES_CREATION
     HDfprintf(stdout,
-              "%d:H5AC2_propagate...:%d: (u/uu/i/iu/r/ru) = %d/%d/%d/%d/%d/%d\n",
+              "%d:H5AC_propagate...:%d: (u/uu/i/iu/r/ru) = %d/%d/%d/%d/%d/%d\n",
               (int)(aux_ptr->mpi_rank),
               (int)(aux_ptr->dirty_bytes_propagations),
               (int)(aux_ptr->unprotect_dirty_bytes),
@@ -5463,7 +5458,7 @@ H5AC2_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
               (int)(aux_ptr->insert_dirty_bytes_updates),
               (int)(aux_ptr->rename_dirty_bytes),
               (int)(aux_ptr->rename_dirty_bytes_updates));
-#endif /* H5AC2_DEBUG_DIRTY_BYTES_CREATION */
+#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
 
     if ( do_barrier ) {
 
@@ -5482,14 +5477,14 @@ H5AC2_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
 
 	aux_ptr->write_permitted = TRUE;
 
-	result = H5C2_flush_to_min_clean(f, dxpl_id);
+	result = H5C_flush_to_min_clean(f, dxpl_id);
 
 	aux_ptr->write_permitted = FALSE;
 
         if ( result < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C2_flush_to_min_clean() failed.")
+                        "H5C_flush_to_min_clean() failed.")
         }
 
 	if ( aux_ptr->write_done != NULL ) {
@@ -5497,7 +5492,7 @@ H5AC2_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
 	    (aux_ptr->write_done)();
 	}
 
-        if ( H5AC2_broadcast_clean_list(cache_ptr) < 0 ) {
+        if ( H5AC_broadcast_clean_list(cache_ptr) < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                         "Can't broadcast clean slist.")
@@ -5507,7 +5502,7 @@ H5AC2_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
 
     } else {
 
-        if ( H5AC2_receive_and_apply_clean_list(f, dxpl_id,
+        if ( H5AC_receive_and_apply_clean_list(f, dxpl_id,
                                                 cache_ptr) < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
@@ -5516,7 +5511,7 @@ H5AC2_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
     }
 
     aux_ptr->dirty_bytes = 0;
-#if H5AC2_DEBUG_DIRTY_BYTES_CREATION
+#if H5AC_DEBUG_DIRTY_BYTES_CREATION
     aux_ptr->dirty_bytes_propagations     += 1;
     aux_ptr->unprotect_dirty_bytes         = 0;
     aux_ptr->unprotect_dirty_bytes_updates = 0;
@@ -5524,19 +5519,19 @@ H5AC2_propagate_flushed_and_still_clean_entries_list(H5F_t  * f,
     aux_ptr->insert_dirty_bytes_updates    = 0;
     aux_ptr->rename_dirty_bytes            = 0;
     aux_ptr->rename_dirty_bytes_updates    = 0;
-#endif /* H5AC2_DEBUG_DIRTY_BYTES_CREATION */
+#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_propagate_flushed_and_still_clean_entries_list() */
+} /* H5AC_propagate_flushed_and_still_clean_entries_list() */
 #endif /* H5_HAVE_PARALLEL */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5AC2_receive_and_apply_clean_list()
+ * Function:    H5AC_receive_and_apply_clean_list()
  *
  * Purpose:     Receive the list of cleaned entries from process 0,
  *		and mark the specified entries as clean.
@@ -5561,12 +5556,12 @@ done:
 
 #ifdef H5_HAVE_PARALLEL
 static herr_t
-H5AC2_receive_and_apply_clean_list(H5F_t *   f,
+H5AC_receive_and_apply_clean_list(H5F_t *   f,
                                    hid_t     dxpl_id,
-                                   H5AC2_t * cache_ptr)
+                                   H5AC_t * cache_ptr)
 {
     herr_t               ret_value = SUCCEED;    /* Return value */
-    H5AC2_aux_t         * aux_ptr = NULL;
+    H5AC_aux_t         * aux_ptr = NULL;
     haddr_t	       * haddr_buf_ptr = NULL;
     MPI_Offset         * MPI_Offset_buf_ptr = NULL;
     size_t		 buf_size;
@@ -5574,15 +5569,15 @@ H5AC2_receive_and_apply_clean_list(H5F_t *   f,
     int                  mpi_result;
     int			 num_entries;
 
-    FUNC_ENTER_NOAPI(H5AC2_receive_and_apply_clean_list, FAIL)
+    FUNC_ENTER_NOAPI(H5AC_receive_and_apply_clean_list, FAIL)
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
-    aux_ptr = (H5AC2_aux_t *)(cache_ptr->aux_ptr);
+    aux_ptr = (H5AC_aux_t *)(cache_ptr->aux_ptr);
 
     HDassert( aux_ptr != NULL );
-    HDassert( aux_ptr->magic == H5AC2__H5AC2_AUX_T_MAGIC );
+    HDassert( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC );
     HDassert( aux_ptr->mpi_rank != 0 );
 
     /* First receive the number of entries in the list so that we
@@ -5654,7 +5649,7 @@ H5AC2_receive_and_apply_clean_list(H5F_t *   f,
 
 
         /* mark the indicated entries as clean */
-        if ( H5C2_mark_entries_as_clean(f, dxpl_id,
+        if ( H5C_mark_entries_as_clean(f, dxpl_id,
                                         (int32_t)num_entries,
                                         &(haddr_buf_ptr[0])) < 0 ) {
 
@@ -5679,7 +5674,7 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5AC2_receive_and_apply_clean_list() */
+} /* H5AC_receive_and_apply_clean_list() */
 
 #endif /* H5_HAVE_PARALLEL */
 
diff --git a/src/H5AC1.c b/src/H5AC1.c
index e9ea106..99dffd6 100644
--- a/src/H5AC1.c
+++ b/src/H5AC1.c
@@ -511,7 +511,7 @@ H5AC1_create(const H5F_t *f,
     FUNC_ENTER_NOAPI(H5AC1_create, FAIL)
 
     HDassert(f);
-    HDassert(NULL == f->shared->cache);
+    HDassert(NULL == f->shared->cache1);
     HDassert(config_ptr != NULL);
     HDcompile_assert(NELMTS(H5AC1_entry_type_names) == H5AC1_NTYPES);
     HDcompile_assert(H5C1__MAX_NUM_TYPE_IDS == H5AC1_NTYPES);
@@ -607,7 +607,7 @@ H5AC1_create(const H5F_t *f,
 
             if ( aux_ptr->mpi_rank == 0 ) {
 
-                f->shared->cache = H5C1_create(H5AC1__DEFAULT_MAX_CACHE_SIZE,
+                f->shared->cache1 = H5C1_create(H5AC1__DEFAULT_MAX_CACHE_SIZE,
                                            H5AC1__DEFAULT_MIN_CLEAN_SIZE,
                                            (H5AC1_NTYPES - 1),
                                            (const char **)H5AC1_entry_type_names,
@@ -618,7 +618,7 @@ H5AC1_create(const H5F_t *f,
 
             } else {
 
-                f->shared->cache = H5C1_create(H5AC1__DEFAULT_MAX_CACHE_SIZE,
+                f->shared->cache1 = H5C1_create(H5AC1__DEFAULT_MAX_CACHE_SIZE,
                                            H5AC1__DEFAULT_MIN_CLEAN_SIZE,
                                            (H5AC1_NTYPES - 1),
                                            (const char **)H5AC1_entry_type_names,
@@ -634,7 +634,7 @@ H5AC1_create(const H5F_t *f,
 
         } else {
 
-            f->shared->cache = H5C1_create(H5AC1__DEFAULT_MAX_CACHE_SIZE,
+            f->shared->cache1 = H5C1_create(H5AC1__DEFAULT_MAX_CACHE_SIZE,
                                           H5AC1__DEFAULT_MIN_CLEAN_SIZE,
                                           (H5AC1_NTYPES - 1),
                                           (const char **)H5AC1_entry_type_names,
@@ -649,7 +649,7 @@ H5AC1_create(const H5F_t *f,
          * overwritten shortly by the subsequent set resize config call.
          *                                             -- JRM
          */
-        f->shared->cache = H5C1_create(H5AC1__DEFAULT_MAX_CACHE_SIZE,
+        f->shared->cache1 = H5C1_create(H5AC1__DEFAULT_MAX_CACHE_SIZE,
                                       H5AC1__DEFAULT_MIN_CLEAN_SIZE,
                                       (H5AC1_NTYPES - 1),
                                       (const char **)H5AC1_entry_type_names,
@@ -661,7 +661,7 @@ H5AC1_create(const H5F_t *f,
     }
 #endif /* H5_HAVE_PARALLEL */
 
-    if ( NULL == f->shared->cache ) {
+    if ( NULL == f->shared->cache1 ) {
 
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
@@ -669,7 +669,7 @@ H5AC1_create(const H5F_t *f,
 #ifdef H5_HAVE_PARALLEL
     else if ( aux_ptr != NULL ) {
 
-        result = H5C1_set_prefix(f->shared->cache, prefix);
+        result = H5C1_set_prefix(f->shared->cache1, prefix);
 
         if ( result != SUCCEED ) {
 
@@ -679,7 +679,7 @@ H5AC1_create(const H5F_t *f,
     }
 #endif /* H5_HAVE_PARALLEL */
 
-    result = H5AC1_set_cache_auto_resize_config(f->shared->cache, config_ptr);
+    result = H5AC1_set_cache_auto_resize_config(f->shared->cache1, config_ptr);
 
     if ( result != SUCCEED ) {
 
@@ -765,8 +765,8 @@ H5AC1_dest(H5F_t *f, hid_t dxpl_id)
     FUNC_ENTER_NOAPI(H5AC1_dest, FAIL)
 
     assert(f);
-    assert(f->shared->cache);
-    cache = f->shared->cache;
+    assert(f->shared->cache1);
+    cache = f->shared->cache1;
 #ifdef H5_HAVE_PARALLEL
     aux_ptr = cache->aux_ptr;
 
@@ -789,7 +789,7 @@ H5AC1_dest(H5F_t *f, hid_t dxpl_id)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFREE, FAIL, "can't destroy cache")
     }
 
-    f->shared->cache = NULL;
+    f->shared->cache1 = NULL;
 
 #ifdef H5_HAVE_PARALLEL
     if ( aux_ptr != NULL ) {
@@ -853,13 +853,13 @@ H5AC1_expunge_entry(H5F_t *f,
 
     HDassert(f);
     HDassert(f->shared);
-    HDassert(f->shared->cache);
+    HDassert(f->shared->cache1);
     HDassert(type);
     HDassert(type->clear);
     HDassert(type->dest);
     HDassert(H5F_addr_defined(addr));
 
-    cache_ptr = f->shared->cache;
+    cache_ptr = f->shared->cache1;
 
 #if H5AC1__TRACE_FILE_ENABLED
     /* For the expunge entry call, only the addr, and type id are really
@@ -996,7 +996,7 @@ H5AC1_flush(H5F_t *f, hid_t dxpl_id, unsigned flags)
     FUNC_ENTER_NOAPI(H5AC1_flush, FAIL)
 
     HDassert(f);
-    HDassert(f->shared->cache);
+    HDassert(f->shared->cache1);
 
 #if H5AC1__TRACE_FILE_ENABLED
     /* For the flush, only the flags are really necessary in the trace file.
@@ -1004,8 +1004,8 @@ H5AC1_flush(H5F_t *f, hid_t dxpl_id, unsigned flags)
      */
     if ( ( f != NULL ) &&
          ( f->shared != NULL ) &&
-	 ( f->shared->cache != NULL ) &&
-	 ( H5C1_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0 ) &&
+	 ( f->shared->cache1 != NULL ) &&
+	 ( H5C1_get_trace_file_ptr(f->shared->cache1, &trace_file_ptr) >= 0 ) &&
 	 ( trace_file_ptr != NULL ) ) {
 
 	sprintf(trace, "H5AC1_flush 0x%x", flags);
@@ -1013,7 +1013,7 @@ H5AC1_flush(H5F_t *f, hid_t dxpl_id, unsigned flags)
 #endif /* H5AC1__TRACE_FILE_ENABLED */
 
 #ifdef H5_HAVE_PARALLEL
-    aux_ptr = f->shared->cache->aux_ptr;
+    aux_ptr = f->shared->cache1->aux_ptr;
 
     if ( aux_ptr != NULL ) {
 
@@ -1058,7 +1058,7 @@ H5AC1_flush(H5F_t *f, hid_t dxpl_id, unsigned flags)
             status = H5C1_flush_cache(f,
                                      H5AC1_noblock_dxpl_id,
                                      H5AC1_noblock_dxpl_id,
-                                     f->shared->cache,
+                                     f->shared->cache1,
                                      init_flush_flags);
 
 	    aux_ptr->write_permitted = FALSE;
@@ -1077,7 +1077,7 @@ H5AC1_flush(H5F_t *f, hid_t dxpl_id, unsigned flags)
 
         status = H5AC1_propagate_flushed_and_still_clean_entries_list(f,
                                                           H5AC1_noblock_dxpl_id,
-                                                          f->shared->cache,
+                                                          f->shared->cache1,
                                                           FALSE);
     } /* end if ( aux_ptr != NULL ) */
 #endif /* H5_HAVE_PARALLEL */
@@ -1085,7 +1085,7 @@ H5AC1_flush(H5F_t *f, hid_t dxpl_id, unsigned flags)
     status = H5C1_flush_cache(f,
                              dxpl_id,
                              H5AC1_noblock_dxpl_id,
-                             f->shared->cache,
+                             f->shared->cache1,
                              flags);
 
     if ( status < 0 ) {
@@ -1138,7 +1138,7 @@ H5AC1_get_entry_status(H5F_t *    f,
                       haddr_t    addr,
 		      unsigned * status_ptr)
 {
-    H5C1_t      *cache_ptr = f->shared->cache;
+    H5C1_t      *cache_ptr = f->shared->cache1;
     herr_t      ret_value = SUCCEED;      /* Return value */
     herr_t	result;
     hbool_t	in_cache;
@@ -1270,7 +1270,7 @@ H5AC1_set(H5F_t *f, hid_t dxpl_id, const H5AC1_class_t *type, haddr_t addr, void
     FUNC_ENTER_NOAPI(H5AC1_set, FAIL)
 
     HDassert(f);
-    HDassert(f->shared->cache);
+    HDassert(f->shared->cache1);
     HDassert(type);
     HDassert(type->flush);
     HDassert(type->size);
@@ -1287,8 +1287,8 @@ H5AC1_set(H5F_t *f, hid_t dxpl_id, const H5AC1_class_t *type, haddr_t addr, void
      */
     if ( ( f != NULL ) &&
          ( f->shared != NULL ) &&
-         ( f->shared->cache != NULL ) &&
-         ( H5C1_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0 ) &&
+         ( f->shared->cache1 != NULL ) &&
+         ( H5C1_get_trace_file_ptr(f->shared->cache1, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
         sprintf(trace, "H5AC1_set 0x%lx %d 0x%x",
@@ -1299,7 +1299,7 @@ H5AC1_set(H5F_t *f, hid_t dxpl_id, const H5AC1_class_t *type, haddr_t addr, void
 #endif /* H5AC1__TRACE_FILE_ENABLED */
 
     /* Get local copy of this information */
-    cache = f->shared->cache;
+    cache = f->shared->cache1;
     info = (H5AC1_info_t *)thing;
 
     info->addr = addr;
@@ -1307,10 +1307,10 @@ H5AC1_set(H5F_t *f, hid_t dxpl_id, const H5AC1_class_t *type, haddr_t addr, void
     info->is_protected = FALSE;
 
 #ifdef H5_HAVE_PARALLEL
-    if ( NULL != (aux_ptr = f->shared->cache->aux_ptr) ) {
+    if ( NULL != (aux_ptr = f->shared->cache1->aux_ptr) ) {
 
         result = H5AC1_log_inserted_entry(f,
-                                         f->shared->cache,
+                                         f->shared->cache1,
                                          (H5AC1_info_t *)thing,
                                          type,
                                          addr);
@@ -1351,7 +1351,7 @@ H5AC1_set(H5F_t *f, hid_t dxpl_id, const H5AC1_class_t *type, haddr_t addr, void
 
         result = H5AC1_propagate_flushed_and_still_clean_entries_list(f,
                                                           H5AC1_noblock_dxpl_id,
-                                                          f->shared->cache,
+                                                          f->shared->cache1,
                                                           TRUE);
         if ( result < 0 ) {
 
@@ -1403,7 +1403,7 @@ H5AC1_mark_pinned_entry_dirty(H5F_t * f,
 			     hbool_t size_changed,
                              size_t  new_size)
 {
-    H5C1_t              *cache_ptr = f->shared->cache;
+    H5C1_t              *cache_ptr = f->shared->cache1;
     herr_t		result;
     herr_t              ret_value = SUCCEED;    /* Return value */
 #if H5AC1__TRACE_FILE_ENABLED
@@ -1420,8 +1420,8 @@ H5AC1_mark_pinned_entry_dirty(H5F_t * f,
      */
     if ( ( f != NULL ) &&
          ( f->shared != NULL ) &&
-         ( f->shared->cache != NULL ) &&
-         ( H5C1_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0 ) &&
+         ( f->shared->cache1 != NULL ) &&
+         ( H5C1_get_trace_file_ptr(f->shared->cache1, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
         sprintf(trace, "H5AC1_mark_pinned_entry_dirty 0x%lx %d %d",
@@ -1521,7 +1521,7 @@ herr_t
 H5AC1_mark_pinned_or_protected_entry_dirty(H5F_t * f,
                                           void *  thing)
 {
-    H5C1_t *		cache_ptr = f->shared->cache;
+    H5C1_t *		cache_ptr = f->shared->cache1;
 #ifdef H5_HAVE_PARALLEL
     H5AC1_info_t *	info_ptr;
 #endif /* H5_HAVE_PARALLEL */
@@ -1541,8 +1541,8 @@ H5AC1_mark_pinned_or_protected_entry_dirty(H5F_t * f,
      */
     if ( ( f != NULL ) &&
          ( f->shared != NULL ) &&
-         ( f->shared->cache != NULL ) &&
-         ( H5C1_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0 ) &&
+         ( f->shared->cache1 != NULL ) &&
+         ( H5C1_get_trace_file_ptr(f->shared->cache1, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
         sprintf(trace, "H5AC1_mark_pinned_or_protected_entry_dirty %lx",
@@ -1657,7 +1657,7 @@ H5AC1_rename(H5F_t *f, const H5AC1_class_t *type, haddr_t old_addr, haddr_t new_
     FUNC_ENTER_NOAPI(H5AC1_rename, FAIL)
 
     HDassert(f);
-    HDassert(f->shared->cache);
+    HDassert(f->shared->cache1);
     HDassert(type);
     HDassert(H5F_addr_defined(old_addr));
     HDassert(H5F_addr_defined(new_addr));
@@ -1670,8 +1670,8 @@ H5AC1_rename(H5F_t *f, const H5AC1_class_t *type, haddr_t old_addr, haddr_t new_
      */
     if ( ( f != NULL ) &&
          ( f->shared != NULL ) &&
-         ( f->shared->cache != NULL ) &&
-         ( H5C1_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0 ) &&
+         ( f->shared->cache1 != NULL ) &&
+         ( H5C1_get_trace_file_ptr(f->shared->cache1, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
         sprintf(trace, "H5AC1_rename %lx %lx %d",
@@ -1682,9 +1682,9 @@ H5AC1_rename(H5F_t *f, const H5AC1_class_t *type, haddr_t old_addr, haddr_t new_
 #endif /* H5AC1__TRACE_FILE_ENABLED */
 
 #ifdef H5_HAVE_PARALLEL
-    if ( NULL != (aux_ptr = f->shared->cache->aux_ptr) ) {
+    if ( NULL != (aux_ptr = f->shared->cache1->aux_ptr) ) {
 
-        result = H5AC1_log_renamed_entry(f->shared->cache,
+        result = H5AC1_log_renamed_entry(f->shared->cache1,
                                         old_addr,
                                         new_addr);
 
@@ -1696,7 +1696,7 @@ H5AC1_rename(H5F_t *f, const H5AC1_class_t *type, haddr_t old_addr, haddr_t new_
     }
 #endif /* H5_HAVE_PARALLEL */
 
-    result = H5C1_rename_entry(f->shared->cache,
+    result = H5C1_rename_entry(f->shared->cache1,
                               type,
                               old_addr,
                               new_addr);
@@ -1713,7 +1713,7 @@ H5AC1_rename(H5F_t *f, const H5AC1_class_t *type, haddr_t old_addr, haddr_t new_
 
         result = H5AC1_propagate_flushed_and_still_clean_entries_list(f,
                                                           H5AC1_noblock_dxpl_id,
-                                                          f->shared->cache,
+                                                          f->shared->cache1,
                                                           TRUE);
         if ( result < 0 ) {
 
@@ -1758,7 +1758,7 @@ herr_t
 H5AC1_pin_protected_entry(H5F_t * f,
                          void *	 thing)
 {
-    H5C1_t      *cache_ptr = f->shared->cache;
+    H5C1_t      *cache_ptr = f->shared->cache1;
     herr_t	result;
     herr_t      ret_value = SUCCEED;    /* Return value */
 #if H5AC1__TRACE_FILE_ENABLED
@@ -1774,8 +1774,8 @@ H5AC1_pin_protected_entry(H5F_t * f,
      */
     if ( ( f != NULL ) &&
          ( f->shared != NULL ) &&
-         ( f->shared->cache != NULL ) &&
-         ( H5C1_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0 ) &&
+         ( f->shared->cache1 != NULL ) &&
+         ( H5C1_get_trace_file_ptr(f->shared->cache1, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
         sprintf(trace, "H5AC1_pin_protected_entry %lx",
@@ -1896,7 +1896,7 @@ H5AC1_protect(H5F_t *f,
     /* check args */
     HDassert(f);
     HDassert(f->shared);
-    HDassert(f->shared->cache);
+    HDassert(f->shared->cache1);
     HDassert(type);
     HDassert(type->flush);
     HDassert(type->load);
@@ -1914,8 +1914,8 @@ H5AC1_protect(H5F_t *f,
      */
     if ( ( f != NULL ) &&
          ( f->shared != NULL ) &&
-         ( f->shared->cache != NULL ) &&
-         ( H5C1_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0 ) &&
+         ( f->shared->cache1 != NULL ) &&
+         ( H5C1_get_trace_file_ptr(f->shared->cache1, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
 	char * rw_string;
@@ -1948,7 +1948,7 @@ H5AC1_protect(H5F_t *f,
     thing = H5C1_protect(f,
                         dxpl_id,
                         H5AC1_noblock_dxpl_id,
-                        f->shared->cache,
+                        f->shared->cache1,
                         type,
                         addr,
                         udata1,
@@ -2009,7 +2009,7 @@ H5AC1_resize_pinned_entry(H5F_t * f,
                          void *  thing,
                          size_t  new_size)
 {
-    H5C1_t              *cache_ptr = f->shared->cache;
+    H5C1_t              *cache_ptr = f->shared->cache1;
     herr_t		result;
     herr_t              ret_value = SUCCEED;    /* Return value */
 #if H5AC1__TRACE_FILE_ENABLED
@@ -2026,8 +2026,8 @@ H5AC1_resize_pinned_entry(H5F_t * f,
      */
     if ( ( f != NULL ) &&
          ( f->shared != NULL ) &&
-         ( f->shared->cache != NULL ) &&
-         ( H5C1_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0 ) &&
+         ( f->shared->cache1 != NULL ) &&
+         ( H5C1_get_trace_file_ptr(f->shared->cache1, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
         sprintf(trace, "H5AC1_resize_pinned_entry 0x%lx %d",
@@ -2120,7 +2120,7 @@ herr_t
 H5AC1_unpin_entry(H5F_t * f,
                  void *	 thing)
 {
-    H5C1_t      *cache_ptr = f->shared->cache;
+    H5C1_t      *cache_ptr = f->shared->cache1;
     herr_t	result;
     herr_t      ret_value = SUCCEED;    /* Return value */
 #if H5AC1__TRACE_FILE_ENABLED
@@ -2136,8 +2136,8 @@ H5AC1_unpin_entry(H5F_t * f,
      */
     if ( ( f != NULL ) &&
          ( f->shared != NULL ) &&
-         ( f->shared->cache != NULL ) &&
-         ( H5C1_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0 ) &&
+         ( f->shared->cache1 != NULL ) &&
+         ( H5C1_get_trace_file_ptr(f->shared->cache1, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
         sprintf(trace, "H5AC1_unpin_entry %lx",
@@ -2277,7 +2277,7 @@ H5AC1_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC1_class_t *type, haddr_t addr
     FUNC_ENTER_NOAPI(H5AC1_unprotect, FAIL)
 
     HDassert(f);
-    HDassert(f->shared->cache);
+    HDassert(f->shared->cache1);
     HDassert(type);
     HDassert(type->clear);
     HDassert(type->flush);
@@ -2293,8 +2293,8 @@ H5AC1_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC1_class_t *type, haddr_t addr
      */
     if ( ( f != NULL ) &&
          ( f->shared != NULL ) &&
-         ( f->shared->cache != NULL ) &&
-         ( H5C1_get_trace_file_ptr(f->shared->cache, &trace_file_ptr) >= 0 ) &&
+         ( f->shared->cache1 != NULL ) &&
+         ( H5C1_get_trace_file_ptr(f->shared->cache1, &trace_file_ptr) >= 0 ) &&
          ( trace_file_ptr != NULL ) ) {
 
         sprintf(trace, "H5AC1_unprotect %lx %d",
@@ -2329,9 +2329,9 @@ H5AC1_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC1_class_t *type, haddr_t addr
 
 #ifdef H5_HAVE_PARALLEL
     if ( ( dirtied ) && ( ((H5AC1_info_t *)thing)->is_dirty == FALSE ) &&
-         ( NULL != (aux_ptr = f->shared->cache->aux_ptr) ) ) {
+         ( NULL != (aux_ptr = f->shared->cache1->aux_ptr) ) ) {
 
-        result = H5AC1_log_dirtied_entry(f->shared->cache,
+        result = H5AC1_log_dirtied_entry(f->shared->cache1,
                                         (H5AC1_info_t *)thing,
                                         addr,
                                         size_changed,
@@ -2345,10 +2345,10 @@ H5AC1_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC1_class_t *type, haddr_t addr
     }
 
     if ( ( (flags & H5C1__DELETED_FLAG) != 0 ) &&
-         ( NULL != (aux_ptr = f->shared->cache->aux_ptr) ) &&
+         ( NULL != (aux_ptr = f->shared->cache1->aux_ptr) ) &&
          ( aux_ptr->mpi_rank == 0 ) ) {
 
-        result = H5AC1_log_deleted_entry(f->shared->cache,
+        result = H5AC1_log_deleted_entry(f->shared->cache1,
                                         (H5AC1_info_t *)thing,
                                         addr,
                                         flags);
@@ -2364,7 +2364,7 @@ H5AC1_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC1_class_t *type, haddr_t addr
     result = H5C1_unprotect(f,
                            dxpl_id,
                            H5AC1_noblock_dxpl_id,
-                           f->shared->cache,
+                           f->shared->cache1,
                            type,
                            addr,
                            thing,
@@ -2383,7 +2383,7 @@ H5AC1_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC1_class_t *type, haddr_t addr
 
         result = H5AC1_propagate_flushed_and_still_clean_entries_list(f,
                                                           H5AC1_noblock_dxpl_id,
-                                                          f->shared->cache,
+                                                          f->shared->cache1,
                                                           TRUE);
 
         if ( result < 0 ) {
@@ -2490,10 +2490,10 @@ H5AC1_stats(const H5F_t *f)
     FUNC_ENTER_NOAPI(H5AC1_stats, FAIL)
 
     HDassert(f);
-    HDassert(f->shared->cache);
+    HDassert(f->shared->cache1);
 
     /* at present, this can't fail */
-    (void)H5C1_stats(f->shared->cache, f->name, FALSE);
+    (void)H5C1_stats(f->shared->cache1, f->name, FALSE);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -3573,9 +3573,9 @@ H5AC1_check_if_write_permitted(const H5F_t UNUSED * f,
 #ifdef H5_HAVE_PARALLEL
     HDassert( f != NULL );
     HDassert( f->shared != NULL );
-    HDassert( f->shared->cache != NULL );
+    HDassert( f->shared->cache1 != NULL );
 
-    aux_ptr = (H5AC1_aux_t *)(f->shared->cache->aux_ptr);
+    aux_ptr = (H5AC1_aux_t *)(f->shared->cache1->aux_ptr);
 
     if ( aux_ptr != NULL ) {
 
diff --git a/src/H5AC2pkg.h b/src/H5ACpkg.h
index 0899f70..30102a8 100644
--- a/src/H5AC2pkg.h
+++ b/src/H5ACpkg.h
@@ -17,62 +17,55 @@
  * Programmer: John Mainzer -- 4/19/06
  *
  * Purpose:     This file contains declarations which are normally visible
- *              only within the H5AC2 package (just H5AC2.c at present).
+ *              only within the H5AC package (just H5AC.c at present).
  *
  *		Source files outside the H5AC package should include
  *		H5ACprivate.h instead.
  *
  *		The one exception to this rule is testpar/t_cache.c.  The
- *		test code is easier to write if it can look at H5AC2_aux_t.
+ *		test code is easier to write if it can look at H5AC_aux_t.
  *		Indeed, this is the main reason why this file was created.
  *
- * Modifications:
- *
- *              JRM - 10/18/07
- *              Copied H5ACpkg.h to H5AC2pkg.h and reworked
- *              to use H5C2 instead of H5C.  All this is in support
- *              of cache API modifications needed for journaling.
- *
  */
 
-#ifndef H5AC2_PACKAGE
-#error "Do not include this file outside the H5AC2 package!"
+#ifndef H5AC_PACKAGE
+#error "Do not include this file outside the H5AC package!"
 #endif
 
-#ifndef _H5AC2pkg_H
-#define _H5AC2pkg_H
+#ifndef _H5ACpkg_H
+#define _H5ACpkg_H
 
 /* Get package's private header */
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 
 
 /* Get needed headers */
-#include "H5C2private.h"        /* Cache                                */
+#include "H5Cprivate.h"         /* Cache                                */
 #include "H5SLprivate.h"        /* Skip lists */
 
 
-#define H5AC2_DEBUG_DIRTY_BYTES_CREATION	0
+#define H5AC_DEBUG_DIRTY_BYTES_CREATION	0
 
 /*-------------------------------------------------------------------------
  *  It is a bit difficult to set ranges of allowable values on the
- *  dirty_bytes_threshold field of H5AC2_aux_t.  The following are
+ *  dirty_bytes_threshold field of H5AC_aux_t.  The following are
  *  probably broader than they should be.
  *-------------------------------------------------------------------------
  */
 
-#define H5AC2__MIN_DIRTY_BYTES_THRESHOLD	(int32_t) \
-						(H5C2__MIN_MAX_CACHE_SIZE / 2)
-#define H5AC2__DEFAULT_DIRTY_BYTES_THRESHOLD	(256 * 1024)
-#define H5AC2__MAX_DIRTY_BYTES_THRESHOLD   	(int32_t) \
-						(H5C2__MAX_MAX_CACHE_SIZE / 4)
+#define H5AC__MIN_DIRTY_BYTES_THRESHOLD	(int32_t) \
+						(H5C__MIN_MAX_CACHE_SIZE / 2)
+#define H5AC__DEFAULT_DIRTY_BYTES_THRESHOLD	(256 * 1024)
+#define H5AC__MAX_DIRTY_BYTES_THRESHOLD   	(int32_t) \
+						(H5C__MAX_MAX_CACHE_SIZE / 4)
 
 /****************************************************************************
  *
- * structure H5AC2_aux_t
+ * structure H5AC_aux_t
  *
- * While H5AC2 has become a wrapper for the cache implemented in H5C2.c, there
+ * While H5AC has become a wrapper for the cache implemented in H5C.c, there
  * are some features of the metadata cache that are specific to it, and which
- * therefore do not belong in the more generic H5C2 cache code.
+ * therefore do not belong in the more generic H5C cache code.
  *
  * In particular, there is the matter of synchronizing writes from the
  * metadata cache to disk in the PHDF5 case.
@@ -128,9 +121,9 @@
  * case.  However, other uses may arise in the future.
  *
  * Instance of this structure are associated with metadata caches via
- * the aux_ptr field of H5C2_t (see H5C2pkg.h).  The H5AC2 code is
+ * the aux_ptr field of H5C_t (see H5Cpkg.h).  The H5AC code is
  * responsible for allocating, maintaining, and discarding instances
- * of H5AC2_aux_t.
+ * of H5AC_aux_t.
  *
  * The remainder of this header comments documents the individual fields
  * of the structure.
@@ -138,8 +131,8 @@
  *                                              JRM - 6/27/05
  *
  * magic:       Unsigned 32 bit integer always set to
- *		H5AC2__H5AC2_AUX_T_MAGIC.  This field is used to validate
- *		pointers to instances of H5AC2_aux_t.
+ *		H5AC__H5AC_AUX_T_MAGIC.  This field is used to validate
+ *		pointers to instances of H5AC_aux_t.
  *
  * mpi_comm:	MPI communicator associated with the file for which the
  *		cache has been created.
@@ -170,49 +163,49 @@
  *		broadcast.
  *
  * dirty_bytes_propagations: This field only exists when the
- *		H5AC2_DEBUG_DIRTY_BYTES_CREATION #define is TRUE.
+ *		H5AC_DEBUG_DIRTY_BYTES_CREATION #define is TRUE.
  *
  *		It is used to track the number of times the cleaned list
  *		has been propagated from process 0 to the other
  *		processes.
  *
  * unprotect_dirty_bytes:  This field only exists when the
- *              H5AC2_DEBUG_DIRTY_BYTES_CREATION #define is TRUE.
+ *              H5AC_DEBUG_DIRTY_BYTES_CREATION #define is TRUE.
  *
  *		It is used to track the number of dirty bytes created
  *		via unprotect operations since the last time the cleaned
  *		list was propagated.
  *
  * unprotect_dirty_bytes_updates: This field only exists when the
- *              H5AC2_DEBUG_DIRTY_BYTES_CREATION #define is TRUE.
+ *              H5AC_DEBUG_DIRTY_BYTES_CREATION #define is TRUE.
  *
  *		It is used to track the number of times dirty bytes have
  *		been created via unprotect operations since the last time
  *		the cleaned list was propagated.
  *
  * insert_dirty_bytes:  This field only exists when the
- *              H5AC2_DEBUG_DIRTY_BYTES_CREATION #define is TRUE.
+ *              H5AC_DEBUG_DIRTY_BYTES_CREATION #define is TRUE.
  *
  *		It is used to track the number of dirty bytes created
  *		via insert operations since the last time the cleaned
  *		list was propagated.
  *
  * insert_dirty_bytes_updates:  This field only exists when the
- *              H5AC2_DEBUG_DIRTY_BYTES_CREATION #define is TRUE.
+ *              H5AC_DEBUG_DIRTY_BYTES_CREATION #define is TRUE.
  *
  *		It is used to track the number of times dirty bytes have
  *		been created via insert operations since the last time
  *		the cleaned list was propagated.
  *
  * rename_dirty_bytes:  This field only exists when the
- *              H5AC2_DEBUG_DIRTY_BYTES_CREATION #define is TRUE.
+ *              H5AC_DEBUG_DIRTY_BYTES_CREATION #define is TRUE.
  *
  *		It is used to track the number of dirty bytes created
  *		via rename operations since the last time the cleaned
  *		list was propagated.
  *
  * rename_dirty_bytes_updates:  This field only exists when the
- *              H5AC2_DEBUG_DIRTY_BYTES_CREATION #define is TRUE.
+ *              H5AC_DEBUG_DIRTY_BYTES_CREATION #define is TRUE.
  *
  *		It is used to track the number of times dirty bytes have
  *		been created via rename operations since the last time
@@ -282,9 +275,9 @@
 
 #ifdef H5_HAVE_PARALLEL
 
-#define H5AC2__H5AC2_AUX_T_MAGIC        (unsigned)0x00D0A02
+#define H5AC__H5AC_AUX_T_MAGIC        (unsigned)0x00D0A02
 
-typedef struct H5AC2_aux_t
+typedef struct H5AC_aux_t
 {
     uint32_t	magic;
 
@@ -300,7 +293,7 @@ typedef struct H5AC2_aux_t
 
     int32_t	dirty_bytes;
 
-#if H5AC2_DEBUG_DIRTY_BYTES_CREATION
+#if H5AC_DEBUG_DIRTY_BYTES_CREATION
 
     int32_t	dirty_bytes_propagations;
 
@@ -313,7 +306,7 @@ typedef struct H5AC2_aux_t
     int32_t     rename_dirty_bytes;
     int32_t     rename_dirty_bytes_updates;
 
-#endif /* H5AC2_DEBUG_DIRTY_BYTES_CREATION */
+#endif /* H5AC_DEBUG_DIRTY_BYTES_CREATION */
 
     H5SL_t *	d_slist_ptr;
 
@@ -325,9 +318,9 @@ typedef struct H5AC2_aux_t
 
     void	(* write_done)(void);
 
-} H5AC2_aux_t; /* struct H5AC2_aux_t */
+} H5AC_aux_t; /* struct H5AC_aux_t */
 
 #endif /* H5_HAVE_PARALLEL */
 
-#endif /* _H5AC2pkg_H */
+#endif /* _H5ACpkg_H */
 
diff --git a/src/H5AC2private.h b/src/H5ACprivate.h
index abd12ed..0365317 100644
--- a/src/H5AC2private.h
+++ b/src/H5ACprivate.h
@@ -15,7 +15,7 @@
 
 /*-------------------------------------------------------------------------
  *
- * Created:		H5AC2private.h
+ * Created:		H5ACprivate.h
  *			Jul  9 1997
  *			Robb Matzke <matzke@llnl.gov>
  *
@@ -27,83 +27,83 @@
  *			located in H5C.c
  *
  *			JRM - 10/18/07
- *			Copied H5ACprivate.h to H5AC2private.h and reworked
- *			to use H5C2 instead of H5C.  All this is in support
+ *			Copied H5ACprivate.h to H5ACprivate.h and reworked
+ *			to use H5C instead of H5C.  All this is in support
  *			of cache API modifications needed for journaling.
  *
  *-------------------------------------------------------------------------
  */
 
-#ifndef _H5AC2private_H
-#define _H5AC2private_H
+#ifndef _H5ACprivate_H
+#define _H5ACprivate_H
 
-#include "H5AC2public.h"	/*public prototypes			*/
+#include "H5ACpublic.h"		/*public prototypes			*/
 
 /* Pivate headers needed by this header */
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5C2private.h"	/* Cache				*/
+#include "H5Cprivate.h"		/* Cache				*/
 #include "H5Fprivate.h"		/* File access				*/
 
 #ifdef H5_METADATA_TRACE_FILE
-#define H5AC2__TRACE_FILE_ENABLED	1
+#define H5AC__TRACE_FILE_ENABLED	1
 #else /* H5_METADATA_TRACE_FILE */
-#define H5AC2__TRACE_FILE_ENABLED	0
+#define H5AC__TRACE_FILE_ENABLED	0
 #endif /* H5_METADATA_TRACE_FILE */
 
 /* Types of metadata objects cached */
 typedef enum {
-    H5AC2_BT_ID = 0, 	  /*B-tree nodes			       */
-    H5AC2_SNODE_ID,	  /*symbol table nodes			       */
-    H5AC2_LHEAP_PRFX_ID,  /*local heap prefix			       */
-    H5AC2_LHEAP_DBLK_ID,  /*local heap data block		       */
-    H5AC2_GHEAP_ID,	  /*global heap				       */
-    H5AC2_OHDR_ID,	  /*object header			       */
-    H5AC2_OHDR_CHK_ID,	  /*object header chunk			       */
-    H5AC2_BT2_HDR_ID,	  /*v2 B-tree header			       */
-    H5AC2_BT2_INT_ID,	  /*v2 B-tree internal node		       */
-    H5AC2_BT2_LEAF_ID,	  /*v2 B-tree leaf node			       */
-    H5AC2_FHEAP_HDR_ID,	  /*fractal heap header			       */
-    H5AC2_FHEAP_DBLOCK_ID,/*fractal heap direct block		       */
-    H5AC2_FHEAP_IBLOCK_ID,/*fractal heap indirect block		       */
-    H5AC2_FSPACE_HDR_ID,  /*free space header			       */
-    H5AC2_FSPACE_SINFO_ID,/*free space sections			       */
-    H5AC2_SOHM_TABLE_ID,  /*shared object header message master table  */
-    H5AC2_SOHM_LIST_ID,   /*shared message index stored as a list      */
-    H5AC2_TEST_ID,	  /*test entry -- not used for actual files    */
-    H5AC2_NTYPES	  /* Number of types, must be last             */
-} H5AC2_type_t;
-
-/* H5AC2_DUMP_STATS_ON_CLOSE should always be FALSE when
- * H5C2_COLLECT_CACHE_STATS is FALSE.
+    H5AC_BT_ID = 0, 	  /*B-tree nodes			       */
+    H5AC_SNODE_ID,	  /*symbol table nodes			       */
+    H5AC_LHEAP_PRFX_ID,  /*local heap prefix			       */
+    H5AC_LHEAP_DBLK_ID,  /*local heap data block		       */
+    H5AC_GHEAP_ID,	  /*global heap				       */
+    H5AC_OHDR_ID,	  /*object header			       */
+    H5AC_OHDR_CHK_ID,	  /*object header chunk			       */
+    H5AC_BT2_HDR_ID,	  /*v2 B-tree header			       */
+    H5AC_BT2_INT_ID,	  /*v2 B-tree internal node		       */
+    H5AC_BT2_LEAF_ID,	  /*v2 B-tree leaf node			       */
+    H5AC_FHEAP_HDR_ID,	  /*fractal heap header			       */
+    H5AC_FHEAP_DBLOCK_ID,/*fractal heap direct block		       */
+    H5AC_FHEAP_IBLOCK_ID,/*fractal heap indirect block		       */
+    H5AC_FSPACE_HDR_ID,  /*free space header			       */
+    H5AC_FSPACE_SINFO_ID,/*free space sections			       */
+    H5AC_SOHM_TABLE_ID,  /*shared object header message master table  */
+    H5AC_SOHM_LIST_ID,   /*shared message index stored as a list      */
+    H5AC_TEST_ID,	  /*test entry -- not used for actual files    */
+    H5AC_NTYPES	  /* Number of types, must be last             */
+} H5AC_type_t;
+
+/* H5AC_DUMP_STATS_ON_CLOSE should always be FALSE when
+ * H5C_COLLECT_CACHE_STATS is FALSE.
  *
- * When H5C2_COLLECT_CACHE_STATS is TRUE, H5AC2_DUMP_STATS_ON_CLOSE must
+ * When H5C_COLLECT_CACHE_STATS is TRUE, H5AC_DUMP_STATS_ON_CLOSE must
  * be FALSE for "make check" to succeed, but may be set to TRUE at other
  * times for debugging purposes.
  *
  * Hence the following, somewhat odd set of #defines.
  */
-#if H5C2_COLLECT_CACHE_STATS
+#if H5C_COLLECT_CACHE_STATS
 
-#define H5AC2_DUMP_STATS_ON_CLOSE	0
+#define H5AC_DUMP_STATS_ON_CLOSE	0
 
-#else /* H5C2_COLLECT_CACHE_STATS */
+#else /* H5C_COLLECT_CACHE_STATS */
 
-#define H5AC2_DUMP_STATS_ON_CLOSE	0
+#define H5AC_DUMP_STATS_ON_CLOSE	0
 
-#endif /* H5C2_COLLECT_CACHE_STATS */
+#endif /* H5C_COLLECT_CACHE_STATS */
 
 /* Default max metadata cache size and min clean size are give here.
- * At present, these are the same as those given in H5C2private.h.
+ * At present, these are the same as those given in H5Cprivate.h.
  */
 
-#define H5AC2__DEFAULT_MAX_CACHE_SIZE	H5C2__DEFAULT_MAX_CACHE_SIZE
-#define H5AC2__DEFAULT_MIN_CLEAN_SIZE	H5C2__DEFAULT_MIN_CLEAN_SIZE
+#define H5AC__DEFAULT_MAX_CACHE_SIZE	H5C__DEFAULT_MAX_CACHE_SIZE
+#define H5AC__DEFAULT_MIN_CLEAN_SIZE	H5C__DEFAULT_MIN_CLEAN_SIZE
 
 
 /*
  * Class methods pertaining to caching.	 Each type of cached object will
  * have a constant variable with permanent life-span that describes how
- * to cache the object.	 That variable will be of type H5AC2_class_t and
+ * to cache the object.	 That variable will be of type H5AC_class_t and
  * have the following required fields...
  *
  * LOAD:	Loads an object from disk to memory.  The function
@@ -124,80 +124,80 @@ typedef enum {
  *		Note that the space allocated on disk may not be contiguous.
  */
 
-#define H5AC2__SERIALIZE_RESIZED_FLAG	H5C2__SERIALIZE_RESIZED_FLAG
-#define H5AC2__SERIALIZE_RENAMED_FLAG	H5C2__SERIALIZE_RENAMED_FLAG
+#define H5AC__SERIALIZE_RESIZED_FLAG	H5C__SERIALIZE_RESIZED_FLAG
+#define H5AC__SERIALIZE_RENAMED_FLAG	H5C__SERIALIZE_RENAMED_FLAG
 
-typedef H5C2_deserialize_func_t		H5AC2_deserialize_func_t;
-typedef H5C2_image_len_func_t		H5AC2_image_len_func_t;
-typedef H5C2_serialize_func_t		H5AC2_serialize_func_t;
-typedef H5C2_free_icr_func_t		H5AC2_free_icr_func_t;
-typedef H5C2_clear_dirty_bits_func_t	H5AC2_clear_dirty_bits_func_t;
+typedef H5C_deserialize_func_t		H5AC_deserialize_func_t;
+typedef H5C_image_len_func_t		H5AC_image_len_func_t;
+typedef H5C_serialize_func_t		H5AC_serialize_func_t;
+typedef H5C_free_icr_func_t		H5AC_free_icr_func_t;
+typedef H5C_clear_dirty_bits_func_t	H5AC_clear_dirty_bits_func_t;
 
-typedef H5C2_class_t			H5AC2_class_t;
+typedef H5C_class_t			H5AC_class_t;
 
 
 
-typedef H5C2_cache_entry_t		H5AC2_info_t;
+typedef H5C_cache_entry_t		H5AC_info_t;
 
 
 /*===----------------------------------------------------------------------===
  *                             Protect Types
  *===----------------------------------------------------------------------===
  *
- * These are for the wrapper functions to H5AC2_protect. They specify what
+ * These are for the wrapper functions to H5AC_protect. They specify what
  * type of operation you're planning on doing to the metadata. The
  * Flexible Parallel HDF5 locking can then act accordingly.
  */
 
-typedef enum H5AC2_protect_t {
-    H5AC2_WRITE,                 /* Protect object for writing                */
-    H5AC2_READ                   /* Protect object for reading                */
-} H5AC2_protect_t;
+typedef enum H5AC_protect_t {
+    H5AC_WRITE,                 /* Protect object for writing                */
+    H5AC_READ                   /* Protect object for reading                */
+} H5AC_protect_t;
 
 
-/* Typedef for metadata cache (defined in H5C2pkg.h) */
-typedef H5C2_t	H5AC2_t;
+/* Typedef for metadata cache (defined in H5Cpkg.h) */
+typedef H5C_t	H5AC_t;
 
 /* Metadata specific properties for FAPL */
 /* (Only used for parallel I/O) */
 #ifdef H5_HAVE_PARALLEL
 /* Definitions for "block before metadata write" property */
-#define H5AC2_BLOCK_BEFORE_META_WRITE_NAME       "H5AC2_block_before_meta_write"
-#define H5AC2_BLOCK_BEFORE_META_WRITE_SIZE       sizeof(unsigned)
-#define H5AC2_BLOCK_BEFORE_META_WRITE_DEF        0
+#define H5AC_BLOCK_BEFORE_META_WRITE_NAME       "H5AC_block_before_meta_write"
+#define H5AC_BLOCK_BEFORE_META_WRITE_SIZE       sizeof(unsigned)
+#define H5AC_BLOCK_BEFORE_META_WRITE_DEF        0
 
 /* Definitions for "library internal" property */
-#define H5AC2_LIBRARY_INTERNAL_NAME       "H5AC2_library_internal"
-#define H5AC2_LIBRARY_INTERNAL_SIZE       sizeof(unsigned)
-#define H5AC2_LIBRARY_INTERNAL_DEF        0
+#define H5AC_LIBRARY_INTERNAL_NAME       "H5AC_library_internal"
+#define H5AC_LIBRARY_INTERNAL_SIZE       sizeof(unsigned)
+#define H5AC_LIBRARY_INTERNAL_DEF        0
 #endif /* H5_HAVE_PARALLEL */
 
 /* Dataset transfer property list for flush calls */
 /* (Collective set, "block before metadata write" set and "library internal" set) */
-/* (Global variable declaration, definition is in H5AC2.c) */
-extern hid_t H5AC2_dxpl_id;
+/* (Global variable declaration, definition is in H5AC.c) */
+extern hid_t H5AC_dxpl_id;
 
 /* Dataset transfer property list for independent metadata I/O calls */
 /* (just "library internal" set - i.e. independent transfer mode) */
-/* (Global variable declaration, definition is in H5AC2.c) */
-extern hid_t H5AC2_ind_dxpl_id;
+/* (Global variable declaration, definition is in H5AC.c) */
+extern hid_t H5AC_ind_dxpl_id;
 
 
 /* Cache config field limit #defines */
 
-#define H5AC2__MIN_JBRB_BUF_SIZE        H5C2__MIN_JBRB_BUF_SIZE
-#define H5AC2__MAX_JBRB_BUF_SIZE        H5C2__MAX_JBRB_BUF_SIZE
+#define H5AC__MIN_JBRB_BUF_SIZE        H5C__MIN_JBRB_BUF_SIZE
+#define H5AC__MAX_JBRB_BUF_SIZE        H5C__MAX_JBRB_BUF_SIZE
 
-#define H5AC2__MIN_JBRB_NUM_BUFS        H5C2__MIN_JBRB_NUM_BUFS
-#define H5AC2__MAX_JBRB_NUM_BUFS        H5C2__MAX_JBRB_NUM_BUFS
+#define H5AC__MIN_JBRB_NUM_BUFS        H5C__MIN_JBRB_NUM_BUFS
+#define H5AC__MAX_JBRB_NUM_BUFS        H5C__MAX_JBRB_NUM_BUFS
 
 
 /* Default cache configuration. */
 
-#define H5AC2__DEFAULT_CACHE_CONFIG                                           \
+#define H5AC__DEFAULT_CACHE_CONFIG                                           \
 {                                                                             \
   /* int         version                 = */                                 \
-	                                   H5AC2__CURR_CACHE_CONFIG_VERSION,  \
+	                                   H5AC__CURR_CACHE_CONFIG_VERSION,  \
   /* hbool_t     rpt_fcn_enabled         = */ FALSE,                          \
   /* hbool_t     open_trace_file         = */ FALSE,                          \
   /* hbool_t     close_trace_file        = */ FALSE,                          \
@@ -209,17 +209,17 @@ extern hid_t H5AC2_ind_dxpl_id;
   /* size_t      max_size                = */ (16 * 1024 * 1024 ),            \
   /* size_t      min_size                = */ ( 1 * 1024 * 1024 ),            \
   /* long int    epoch_length            = */ 50000,                          \
-  /* enum H5C2_cache_incr_mode incr_mode = */ H5C2_incr__threshold,           \
+  /* enum H5C_cache_incr_mode incr_mode = */ H5C_incr__threshold,           \
   /* double      lower_hr_threshold      = */ 0.9,                            \
   /* double      increment               = */ 2.0,                            \
   /* hbool_t     apply_max_increment     = */ TRUE,                           \
   /* size_t      max_increment           = */ (4 * 1024 * 1024),              \
-  /* enum H5C2_cache_flash_incr_mode       */                                 \
-  /*                    flash_incr_mode  = */ H5C2_flash_incr__add_space,     \
+  /* enum H5C_cache_flash_incr_mode       */                                 \
+  /*                    flash_incr_mode  = */ H5C_flash_incr__add_space,     \
   /* double      flash_multiple          = */ 1.0,                            \
   /* double      flash_threshold         = */ 0.25,                           \
-  /* enum H5C2_cache_decr_mode decr_mode = */                                 \
-	                                   H5C2_decr__age_out_with_threshold, \
+  /* enum H5C_cache_decr_mode decr_mode = */                                 \
+	                                   H5C_decr__age_out_with_threshold, \
   /* double      upper_hr_threshold      = */ 0.999,                          \
   /* double      decrement               = */ 0.9,                            \
   /* hbool_t     apply_max_decrement     = */ TRUE,                           \
@@ -233,9 +233,9 @@ extern hid_t H5AC2_ind_dxpl_id;
 
 /* Default journal configuration. */
 
-#define H5AC2__DEFAULT_JNL_CONFIG                                             \
+#define H5AC__DEFAULT_JNL_CONFIG                                             \
 {                                                                             \
-  /* int         version                 = */ H5AC2__CURR_JNL_CONFIG_VER,     \
+  /* int         version                 = */ H5AC__CURR_JNL_CONFIG_VER,     \
   /* hbool_t     enable_journaling       = */ FALSE,                          \
   /* char        journal_file_path[]     = */ "",                             \
   /* hbool_t     journal_recovered       = */ FALSE,                          \
@@ -252,30 +252,30 @@ extern hid_t H5AC2_ind_dxpl_id;
 
 /* #defines of flags used in the flags parameters in some of the
  * following function calls.  Note that they are just copies of
- * the equivalent flags from H5C2private.h.
+ * the equivalent flags from H5Cprivate.h.
  */
 
-#define H5AC2__NO_FLAGS_SET		   H5C2__NO_FLAGS_SET
-#define H5AC2__SET_FLUSH_MARKER_FLAG	   H5C2__SET_FLUSH_MARKER_FLAG
-#define H5AC2__DELETED_FLAG		   H5C2__DELETED_FLAG
-#define H5AC2__DIRTIED_FLAG		   H5C2__DIRTIED_FLAG
-#define H5AC2__SIZE_CHANGED_FLAG	   H5C2__SIZE_CHANGED_FLAG
-#define H5AC2__PIN_ENTRY_FLAG		   H5C2__PIN_ENTRY_FLAG
-#define H5AC2__UNPIN_ENTRY_FLAG		   H5C2__UNPIN_ENTRY_FLAG
-#define H5AC2__FLUSH_INVALIDATE_FLAG	   H5C2__FLUSH_INVALIDATE_FLAG
-#define H5AC2__FLUSH_CLEAR_ONLY_FLAG	   H5C2__FLUSH_CLEAR_ONLY_FLAG
-#define H5AC2__FLUSH_MARKED_ENTRIES_FLAG   H5C2__FLUSH_MARKED_ENTRIES_FLAG
-#define H5AC2__FLUSH_IGNORE_PROTECTED_FLAG H5C2__FLUSH_IGNORE_PROTECTED_FLAG
+#define H5AC__NO_FLAGS_SET		   H5C__NO_FLAGS_SET
+#define H5AC__SET_FLUSH_MARKER_FLAG	   H5C__SET_FLUSH_MARKER_FLAG
+#define H5AC__DELETED_FLAG		   H5C__DELETED_FLAG
+#define H5AC__DIRTIED_FLAG		   H5C__DIRTIED_FLAG
+#define H5AC__SIZE_CHANGED_FLAG	   H5C__SIZE_CHANGED_FLAG
+#define H5AC__PIN_ENTRY_FLAG		   H5C__PIN_ENTRY_FLAG
+#define H5AC__UNPIN_ENTRY_FLAG		   H5C__UNPIN_ENTRY_FLAG
+#define H5AC__FLUSH_INVALIDATE_FLAG	   H5C__FLUSH_INVALIDATE_FLAG
+#define H5AC__FLUSH_CLEAR_ONLY_FLAG	   H5C__FLUSH_CLEAR_ONLY_FLAG
+#define H5AC__FLUSH_MARKED_ENTRIES_FLAG   H5C__FLUSH_MARKED_ENTRIES_FLAG
+#define H5AC__FLUSH_IGNORE_PROTECTED_FLAG H5C__FLUSH_IGNORE_PROTECTED_FLAG
 
 
 /* #defines of flags used to report entry status in the
- * H5AC2_get_entry_status() call.
+ * H5AC_get_entry_status() call.
  */
 
-#define H5AC2_ES__IN_CACHE	0x0001
-#define H5AC2_ES__IS_DIRTY	0x0002
-#define H5AC2_ES__IS_PROTECTED	0x0004
-#define H5AC2_ES__IS_PINNED	0x0008
+#define H5AC_ES__IN_CACHE	0x0001
+#define H5AC_ES__IS_DIRTY	0x0002
+#define H5AC_ES__IS_PROTECTED	0x0004
+#define H5AC_ES__IS_PINNED	0x0008
 
 
 /* Forward declaration of structs used below */
@@ -283,20 +283,20 @@ struct H5O_loc_t;               /* Defined in H5Oprivate.h */
 
 /* external function declarations: */
 
-H5_DLL herr_t H5AC2_init(void);
+H5_DLL herr_t H5AC_init(void);
 
-H5_DLL herr_t H5AC2_check_for_journaling(H5F_t * f,
+H5_DLL herr_t H5AC_check_for_journaling(H5F_t * f,
                                          hid_t dxpl_id,
-                                         H5C2_t * cache_ptr,
+                                         H5C_t * cache_ptr,
                                          hbool_t journal_recovered);
 
-H5_DLL herr_t H5AC2_deregister_mdjsc_callback(H5F_t * file_ptr,
+H5_DLL herr_t H5AC_deregister_mdjsc_callback(H5F_t * file_ptr,
                                               int32_t idx);
 
-H5_DLL herr_t H5AC2_create(H5F_t *f,
-			   H5AC2_cache_config_t *config_ptr);
+H5_DLL herr_t H5AC_create(H5F_t *f,
+			   H5AC_cache_config_t *config_ptr);
 
-H5_DLL herr_t H5AC2_begin_transaction(hid_t id,
+H5_DLL herr_t H5AC_begin_transaction(hid_t id,
                                       hbool_t * do_transaction_ptr,
                                       struct H5O_loc_t * id_oloc_ptr,
                                       hbool_t * id_oloc_open_ptr,
@@ -304,7 +304,7 @@ H5_DLL herr_t H5AC2_begin_transaction(hid_t id,
                                       uint64_t * trans_num_ptr,
                                       const char * api_call_name);
 
-H5_DLL herr_t H5AC2_end_transaction(hbool_t do_transaction,
+H5_DLL herr_t H5AC_end_transaction(hbool_t do_transaction,
                                     struct H5O_loc_t * id_oloc_ptr,
                                     hbool_t id_oloc_open,
                                     hbool_t transaction_begun,
@@ -312,82 +312,82 @@ H5_DLL herr_t H5AC2_end_transaction(hbool_t do_transaction,
                                     uint64_t trans_num,
                                     const char * api_call_name);
 
-H5_DLL herr_t H5AC2_get_entry_status(H5F_t * f, haddr_t addr,
+H5_DLL herr_t H5AC_get_entry_status(H5F_t * f, haddr_t addr,
 				    unsigned * status_ptr);
 
-H5_DLL herr_t H5AC2_set(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type,
+H5_DLL herr_t H5AC_set(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type,
                         haddr_t addr, size_t len, void *thing,
 			unsigned int flags);
-H5_DLL herr_t H5AC2_pin_protected_entry(void *  thing);
-H5_DLL void * H5AC2_protect(H5F_t *f, hid_t dxpl_id, const H5AC2_class_t *type,
+H5_DLL herr_t H5AC_pin_protected_entry(void *  thing);
+H5_DLL void * H5AC_protect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type,
                            haddr_t addr, size_t len, void *udata,
-                           H5AC2_protect_t rw);
-H5_DLL herr_t H5AC2_resize_pinned_entry(void *  thing,
+                           H5AC_protect_t rw);
+H5_DLL herr_t H5AC_resize_pinned_entry(void *  thing,
                                        size_t  new_size);
-H5_DLL herr_t H5AC2_unpin_entry(void * thing);
-H5_DLL herr_t H5AC2_unprotect(H5F_t *f, hid_t dxpl_id,
-                             const H5AC2_class_t *type, haddr_t addr,
+H5_DLL herr_t H5AC_unpin_entry(void * thing);
+H5_DLL herr_t H5AC_unprotect(H5F_t *f, hid_t dxpl_id,
+                             const H5AC_class_t *type, haddr_t addr,
 			     size_t new_size, void *thing, unsigned flags);
-H5_DLL herr_t H5AC2_flush(H5F_t *f, hid_t dxpl_id, unsigned flags);
-H5_DLL herr_t H5AC2_mark_pinned_entry_dirty(void *  thing,
+H5_DLL herr_t H5AC_flush(H5F_t *f, hid_t dxpl_id, unsigned flags);
+H5_DLL herr_t H5AC_mark_pinned_entry_dirty(void *  thing,
 					   hbool_t size_changed,
                                            size_t  new_size);
-H5_DLL herr_t H5AC2_mark_pinned_or_protected_entry_dirty(void *  thing);
-H5_DLL herr_t H5AC2_rename(H5F_t *f, const H5AC2_class_t *type,
+H5_DLL herr_t H5AC_mark_pinned_or_protected_entry_dirty(void *  thing);
+H5_DLL herr_t H5AC_rename(H5F_t *f, const H5AC_class_t *type,
 			   haddr_t old_addr, haddr_t new_addr);
 
-H5_DLL herr_t H5AC2_dest(H5F_t *f, hid_t dxpl_id);
+H5_DLL herr_t H5AC_dest(H5F_t *f, hid_t dxpl_id);
 
-H5_DLL herr_t H5AC2_expunge_entry(H5F_t *f, hid_t dxpl_id,
-                                 const H5AC2_class_t *type, haddr_t addr);
+H5_DLL herr_t H5AC_expunge_entry(H5F_t *f, hid_t dxpl_id,
+                                 const H5AC_class_t *type, haddr_t addr);
 
-H5_DLL herr_t H5AC2_set_write_done_callback(H5C2_t * cache_ptr,
+H5_DLL herr_t H5AC_set_write_done_callback(H5C_t * cache_ptr,
                                            void (* write_done)(void));
-H5_DLL herr_t H5AC2_stats(const H5F_t *f);
+H5_DLL herr_t H5AC_stats(const H5F_t *f);
 
-H5_DLL herr_t H5AC2_get_cache_auto_resize_config(const H5AC2_t * cache_ptr,
-                                              H5AC2_cache_config_t *config_ptr);
+H5_DLL herr_t H5AC_get_cache_auto_resize_config(const H5AC_t * cache_ptr,
+                                              H5AC_cache_config_t *config_ptr);
 
-H5_DLL herr_t H5AC2_get_cache_size(H5AC2_t * cache_ptr,
+H5_DLL herr_t H5AC_get_cache_size(H5AC_t * cache_ptr,
                                   size_t * max_size_ptr,
                                   size_t * min_clean_size_ptr,
                                   size_t * cur_size_ptr,
                                   int32_t * cur_num_entries_ptr);
 
-H5_DLL herr_t H5AC2_get_cache_hit_rate(H5AC2_t * cache_ptr,
+H5_DLL herr_t H5AC_get_cache_hit_rate(H5AC_t * cache_ptr,
                                       double * hit_rate_ptr);
 
-H5_DLL herr_t H5AC2_get_jnl_config(H5AC2_t * cache_ptr,
-                                   H5AC2_jnl_config_t * config_ptr);
+H5_DLL herr_t H5AC_get_jnl_config(H5AC_t * cache_ptr,
+                                   H5AC_jnl_config_t * config_ptr);
 
-H5_DLL herr_t H5AC2_register_mdjsc_callback(const H5F_t * file_ptr,
-                                         H5C2_mdj_status_change_func_t fcn_ptr,
+H5_DLL herr_t H5AC_register_mdjsc_callback(const H5F_t * file_ptr,
+                                         H5C_mdj_status_change_func_t fcn_ptr,
                                          void * data_ptr,
                                          int32_t * idx_ptr,
-                                         H5C2_mdj_config_t * config_ptr);
+                                         H5C_mdj_config_t * config_ptr);
 
-H5_DLL herr_t H5AC2_reset_cache_hit_rate_stats(H5AC2_t * cache_ptr);
+H5_DLL herr_t H5AC_reset_cache_hit_rate_stats(H5AC_t * cache_ptr);
 
-H5_DLL herr_t H5AC2_set_cache_auto_resize_config(H5C2_t * cache_ptr,
-                                             H5AC2_cache_config_t *config_ptr);
+H5_DLL herr_t H5AC_set_cache_auto_resize_config(H5C_t * cache_ptr,
+                                             H5AC_cache_config_t *config_ptr);
 
-H5_DLL herr_t H5AC2_set_jnl_config(H5F_t * f,
+H5_DLL herr_t H5AC_set_jnl_config(H5F_t * f,
                                    hid_t dxpl_id,
-                                   const H5AC2_jnl_config_t *config_ptr,
+                                   const H5AC_jnl_config_t *config_ptr,
 				   hbool_t initializing);
 
-H5_DLL herr_t H5AC2_validate_config(H5AC2_cache_config_t * config_ptr);
+H5_DLL herr_t H5AC_validate_config(H5AC_cache_config_t * config_ptr);
 
-H5_DLL herr_t H5AC2_validate_jnl_config(const H5AC2_jnl_config_t *config_ptr);
+H5_DLL herr_t H5AC_validate_jnl_config(const H5AC_jnl_config_t *config_ptr);
 
-H5_DLL hbool_t H5AC2_validate_jnl_config_ver(int version_num);
+H5_DLL hbool_t H5AC_validate_jnl_config_ver(int version_num);
 
-H5_DLL hbool_t H5AC2_validate_cache_config_ver(int version_num);
+H5_DLL hbool_t H5AC_validate_cache_config_ver(int version_num);
 
-H5_DLL herr_t H5AC2_close_trace_file(H5AC2_t * cache_ptr);
+H5_DLL herr_t H5AC_close_trace_file(H5AC_t * cache_ptr);
 
-H5_DLL herr_t H5AC2_open_trace_file(H5AC2_t * cache_ptr,
+H5_DLL herr_t H5AC_open_trace_file(H5AC_t * cache_ptr,
 		                   const char * trace_file_name);
 
-#endif /* !_H5AC2private_H */
+#endif /* !_H5ACprivate_H */
 
diff --git a/src/H5AC2public.h b/src/H5ACpublic.h
index ac96b46..e09e658 100644
--- a/src/H5AC2public.h
+++ b/src/H5ACpublic.h
@@ -15,7 +15,7 @@
 
 /*-------------------------------------------------------------------------
  *
- * Created:             H5AC2public.h
+ * Created:             H5ACpublic.h
  *                      Jul 10 1997
  *                      Robb Matzke <matzke@llnl.gov>
  *
@@ -25,12 +25,12 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef _H5AC2public_H
-#define _H5AC2public_H
+#ifndef _H5ACpublic_H
+#define _H5ACpublic_H
 
 /* Public headers needed by this file */
 #include "H5public.h"
-#include "H5C2public.h"
+#include "H5Cpublic.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -38,35 +38,35 @@ extern "C" {
 
 /****************************************************************************
  *
- * structure H5AC2_cache_config_t
+ * structure H5AC_cache_config_t
  *
- * H5AC2_cache_config_t is a public structure intended for use in public APIs.
+ * H5AC_cache_config_t is a public structure intended for use in public APIs.
  * At least in its initial incarnation, it is basicaly a copy of struct
- * H5C2_auto_size_ctl_t, minus the report_fcn field, and plus the
+ * H5C_auto_size_ctl_t, minus the report_fcn field, and plus the
  * dirty_bytes_threshold field.
  *
  * The report_fcn field is omitted, as including it would require us to
- * make H5C2_t structure public.
+ * make H5C_t structure public.
  *
- * The dirty_bytes_threshold field does not appear in H5C2_auto_size_ctl_t,
+ * The dirty_bytes_threshold field does not appear in H5C_auto_size_ctl_t,
  * as synchronization between caches on different processes is handled at
- * the H5AC2 level, not at the level of H5C2.  Note however that there is
+ * the H5AC level, not at the level of H5C.  Note however that there is
  * considerable interaction between this value and the other fields in this
  * structure.
  *
  * Similarly, the open_trace_file, close_trace_file, and trace_file_name
- * fields do not appear in H5C2_auto_size_ctl_t, as most trace file
- * issues are handled at the H5AC2 level.  The one exception is storage of
- * the pointer to the trace file, which is handled by H5C2.
+ * fields do not appear in H5C_auto_size_ctl_t, as most trace file
+ * issues are handled at the H5AC level.  The one exception is storage of
+ * the pointer to the trace file, which is handled by H5C.
  *
- * The structure is in H5AC2public.h as we may wish to allow different
+ * The structure is in H5ACpublic.h as we may wish to allow different
  * configuration options for metadata and raw data caches.
  *
  * The fields of the structure are discussed individually below:
  *
  * version: Integer field containing the version number of this version
- *      of the H5AC2_cache_config_t structure.  Any instance of
- *      H5AC2_cache_config_t passed to the cache must have a known
+ *      of the H5AC_cache_config_t structure.  Any instance of
+ *      H5AC_cache_config_t passed to the cache must have a known
  *      version number, or an error will be flagged.
  *
  * rpt_fcn_enabled: Boolean field used to enable and disable the default
@@ -102,7 +102,7 @@ extern "C" {
  * 	the process will be appended to the file name to yield a unique
  * 	trace file name for each process.
  *
- * 	The length of the path must not exceed H5AC2__MAX_TRACE_FILE_NAME_LEN
+ * 	The length of the path must not exceed H5AC__MAX_TRACE_FILE_NAME_LEN
  * 	characters.
  *
  * evictions_enabled:  Boolean field used to either report the current
@@ -118,7 +118,7 @@ extern "C" {
  *
  * 	At present, evictions can only be disabled if automatic
  * 	cache resizing is also disabled (that is, ( incr_mode ==
- *	H5C2_incr__off ) && ( decr_mode == H5C2_decr__off )).  There
+ *	H5C_incr__off ) && ( decr_mode == H5C_decr__off )).  There
  *	is no logical reason why this should be so, but it simplifies
  *	implementation and testing, and I can't think of any reason
  *	why it would be desireable.  If you can think of one, I'll
@@ -144,7 +144,7 @@ extern "C" {
  *
  * min_size: Minimum size to which the cache can be adjusted.  The
  *      supplied value must fall in the closed interval
- *      [H5C2__MIN_MAX_CACHE_SIZE, H5C2__MAX_MAX_CACHE_SIZE].  Also, min_size
+ *      [H5C__MIN_MAX_CACHE_SIZE, H5C__MAX_MAX_CACHE_SIZE].  Also, min_size
  *      must be less than or equal to max_size.
  *
  * epoch_length: Number of accesses on the cache over which to collect
@@ -153,22 +153,22 @@ extern "C" {
  *
  *      At the end of an epoch, we discard prior hit rate data and start
  *      collecting afresh.  The epoch_length must lie in the closed
- *      interval [H5C2__MIN_AR_EPOCH_LENGTH, H5C2__MAX_AR_EPOCH_LENGTH].
+ *      interval [H5C__MIN_AR_EPOCH_LENGTH, H5C__MAX_AR_EPOCH_LENGTH].
  *
  *
  * Cache size increase control fields:
  *
- * incr_mode: Instance of the H5C2_cache_incr_mode enumerated type whose
+ * incr_mode: Instance of the H5C_cache_incr_mode enumerated type whose
  *      value indicates how we determine whether the cache size should be
  *      increased.  At present there are two possible values:
  *
- *      H5C2_incr__off:  Don't attempt to increase the size of the cache
+ *      H5C_incr__off:  Don't attempt to increase the size of the cache
  *              automatically.
  *
  *              When this increment mode is selected, the remaining fields
  *              in the cache size increase section ar ignored.
  *
- *      H5C2_incr__threshold: Attempt to increase the size of the cache
+ *      H5C_incr__threshold: Attempt to increase the size of the cache
  *              whenever the average hit rate over the last epoch drops
  *              below the value supplied in the lower_hr_threshold
  *              field.
@@ -177,11 +177,11 @@ extern "C" {
  *              at its maximum size, or if the cache is not already using
  *              all available space.
  *
- *      Note that you must set decr_mode to H5C2_incr__off if you
+ *      Note that you must set decr_mode to H5C_incr__off if you
  *      disable metadata cache entry evictions.
  *
  * lower_hr_threshold: Lower hit rate threshold.  If the increment mode
- *      (incr_mode) is H5C2_incr__threshold and the hit rate drops below the
+ *      (incr_mode) is H5C_incr__threshold and the hit rate drops below the
  *      value supplied in this field in an epoch, increment the cache size by
  *      size_increment.  Note that cache size may not be incremented above
  *      max_size, and that the increment may be further restricted by the
@@ -206,7 +206,7 @@ extern "C" {
  *      above, this field contains the maximum number of bytes by which the
  *      cache size can be increased in a single re-size.
  *
- * flash_incr_mode:  Instance of the H5C2_cache_flash_incr_mode enumerated
+ * flash_incr_mode:  Instance of the H5C_cache_flash_incr_mode enumerated
  *      type whose value indicates whether and by which algorithm we should
  *      make flash increases in the size of the cache to accomodate insertion
  *      of large entries and large increases in the size of a single entry.
@@ -219,10 +219,10 @@ extern "C" {
  *
  *      At present, there are two possible values for the flash_incr_mode:
  *
- *      H5C2_flash_incr__off:  Don't perform flash increases in the size of
+ *      H5C_flash_incr__off:  Don't perform flash increases in the size of
  *              the cache.
  *
- *      H5C2_flash_incr__add_space:  Let x be either the size of a newly
+ *      H5C_flash_incr__add_space:  Let x be either the size of a newly
  *              newly inserted entry, or the number of bytes by which the
  *              size of an existing entry has been increased.
  *
@@ -251,34 +251,34 @@ extern "C" {
  *      expect to revisit the issue.
  *
  * flash_multiple: Double containing the multiple described above in the
- *      H5C2_flash_incr__add_space section of the discussion of the
+ *      H5C_flash_incr__add_space section of the discussion of the
  *      flash_incr_mode section.  This field is ignored unless flash_incr_mode
- *      is H5C2_flash_incr__add_space.
+ *      is H5C_flash_incr__add_space.
  *
  * flash_threshold: Double containing the factor by which current max cache
  *      size is multiplied to obtain the size threshold for the add_space flash
  *      increment algorithm.  The field is ignored unless flash_incr_mode is
- *      H5C2_flash_incr__add_space.
+ *      H5C_flash_incr__add_space.
  *
  *
  * Cache size decrease control fields:
  *
- * decr_mode: Instance of the H5C2_cache_decr_mode enumerated type whose
+ * decr_mode: Instance of the H5C_cache_decr_mode enumerated type whose
  *      value indicates how we determine whether the cache size should be
  *      decreased.  At present there are four possibilities.
  *
- *      H5C2_decr__off:  Don't attempt to decrease the size of the cache
+ *      H5C_decr__off:  Don't attempt to decrease the size of the cache
  *              automatically.
  *
  *              When this increment mode is selected, the remaining fields
  *              in the cache size decrease section are ignored.
  *
- *      H5C2_decr__threshold: Attempt to decrease the size of the cache
+ *      H5C_decr__threshold: Attempt to decrease the size of the cache
  *              whenever the average hit rate over the last epoch rises
  *              above the value supplied in the upper_hr_threshold
  *              field.
  *
- *      H5C2_decr__age_out:  At the end of each epoch, search the cache for
+ *      H5C_decr__age_out:  At the end of each epoch, search the cache for
  *              entries that have not been accessed for at least the number
  *              of epochs specified in the epochs_before_eviction field, and
  *              evict these entries.  Conceptually, the maximum cache size
@@ -286,21 +286,21 @@ extern "C" {
  *              this reduction may be modified by the min_size, the
  *              max_decrement, and/or the empty_reserve.
  *
- *      H5C2_decr__age_out_with_threshold:  Same as age_out, but we only
+ *      H5C_decr__age_out_with_threshold:  Same as age_out, but we only
  *              attempt to reduce the cache size when the hit rate observed
  *              over the last epoch exceeds the value provided in the
  *              upper_hr_threshold field.
  *
- *      Note that you must set decr_mode to H5C2_decr__off if you
+ *      Note that you must set decr_mode to H5C_decr__off if you
  *      disable metadata cache entry evictions.
  *
  * upper_hr_threshold: Upper hit rate threshold.  The use of this field
  *      varies according to the current decr_mode:
  *
- *      H5C2_decr__off or H5C2_decr__age_out:  The value of this field is
+ *      H5C_decr__off or H5C_decr__age_out:  The value of this field is
  *              ignored.
  *
- *      H5C2_decr__threshold:  If the hit rate exceeds this threshold in any
+ *      H5C_decr__threshold:  If the hit rate exceeds this threshold in any
  *              epoch, attempt to decrement the cache size by size_decrement.
  *
  *              Note that cache size may not be decremented below min_size.
@@ -308,13 +308,13 @@ extern "C" {
  *              Note also that if the upper_threshold is 1.0, the cache size
  *              will never be reduced.
  *
- *      H5C2_decr__age_out_with_threshold:  If the hit rate exceeds this
+ *      H5C_decr__age_out_with_threshold:  If the hit rate exceeds this
  *              threshold in any epoch, attempt to reduce the cache size
  *              by evicting entries that have not been accessed for more
  *              than the specified number of epochs.
  *
  * decrement: This field is only used when the decr_mode is
- *      H5C2_decr__threshold.
+ *      H5C_decr__threshold.
  *
  *      The field is a double containing the multiplier used to derive the
  *      new cache size from the old if a cache size decrement is triggered.
@@ -330,20 +330,20 @@ extern "C" {
  *      restricted by the min_size of the cache, and (in age out modes) by
  *      the empty_reserve field.
  *
- * epochs_before_eviction:  Integer field used in H5C2_decr__age_out and
- *      H5C2_decr__age_out_with_threshold decrement modes.
+ * epochs_before_eviction:  Integer field used in H5C_decr__age_out and
+ *      H5C_decr__age_out_with_threshold decrement modes.
  *
  *      This field contains the number of epochs an entry must remain
  *      unaccessed before it is evicted in an attempt to reduce the
  *      cache size.  If applicable, this field must lie in the range
- *      [1, H5C2__MAX_EPOCH_MARKERS].
+ *      [1, H5C__MAX_EPOCH_MARKERS].
  *
  * apply_empty_reserve:  Boolean field controlling whether the empty_reserve
  *      field is to be used in computing the new cache size when the
- *      decr_mode is H5C2_decr__age_out or H5C2_decr__age_out_with_threshold.
+ *      decr_mode is H5C_decr__age_out or H5C_decr__age_out_with_threshold.
  *
  * empty_reserve:  To avoid a constant racheting down of cache size by small
- *      amounts in the H5C2_decr__age_out and H5C2_decr__age_out_with_threshold
+ *      amounts in the H5C_decr__age_out and H5C_decr__age_out_with_threshold
  *      modes, this field allows one to require that any cache size
  *      reductions leave the specified fraction of unused space in the cache.
  *
@@ -380,10 +380,10 @@ extern "C" {
  *
  ****************************************************************************/
 
-#define H5AC2__CURR_CACHE_CONFIG_VERSION 	1
-#define H5AC2__MAX_TRACE_FILE_NAME_LEN		1024
+#define H5AC__CURR_CACHE_CONFIG_VERSION 	1
+#define H5AC__MAX_TRACE_FILE_NAME_LEN		1024
 
-typedef struct H5AC2_cache_config_t
+typedef struct H5AC_cache_config_t
 {
     /* general configuration fields: */
     int                       version;
@@ -392,7 +392,7 @@ typedef struct H5AC2_cache_config_t
 
     hbool_t		      open_trace_file;
     hbool_t                   close_trace_file;
-    char                      trace_file_name[H5AC2__MAX_TRACE_FILE_NAME_LEN+1];
+    char                      trace_file_name[H5AC__MAX_TRACE_FILE_NAME_LEN+1];
 
     hbool_t                   evictions_enabled;
 
@@ -408,7 +408,7 @@ typedef struct H5AC2_cache_config_t
 
 
     /* size increase control fields: */
-    enum H5C2_cache_incr_mode incr_mode;
+    enum H5C_cache_incr_mode incr_mode;
 
     double                    lower_hr_threshold;
 
@@ -417,13 +417,13 @@ typedef struct H5AC2_cache_config_t
     hbool_t                   apply_max_increment;
     size_t                    max_increment;
 
-    enum H5C2_cache_flash_incr_mode     flash_incr_mode;
+    enum H5C_cache_flash_incr_mode     flash_incr_mode;
     double                              flash_multiple;
     double                              flash_threshold;
 
 
     /* size decrease control fields: */
-    enum H5C2_cache_decr_mode decr_mode;
+    enum H5C_cache_decr_mode decr_mode;
 
     double                    upper_hr_threshold;
 
@@ -441,14 +441,14 @@ typedef struct H5AC2_cache_config_t
     /* parallel configuration fields: */
     int                       dirty_bytes_threshold;
 
-} H5AC2_cache_config_t;
+} H5AC_cache_config_t;
 
 
 /****************************************************************************
  *
- * structure H5AC2_jnl_config_t
+ * structure H5AC_jnl_config_t
  *
- * H5AC2_jnl_config_t is a public structure intended for use in public APIs.
+ * H5AC_jnl_config_t is a public structure intended for use in public APIs.
  * At least in its initial incarnation, it is intended to package all the
  * data needed to configure metadata journaling.  In the future, we may
  * use it to package configuration data for other types of journaling as well.
@@ -459,8 +459,8 @@ typedef struct H5AC2_cache_config_t
  * output of journal messages.
  *
  * version: Integer field containing the version number of this version
- *      of the H5AC2_jnl_config_t structure.  Any instance of
- *      H5AC2_cache_config_t passed to the cache must have a known
+ *      of the H5AC_jnl_config_t structure.  Any instance of
+ *      H5AC_cache_config_t passed to the cache must have a known
  *      version number, or an error will be flagged.
  *
  * enable_journaling:  Boolean flag that is set to TRUE if journaling is
@@ -474,7 +474,7 @@ typedef struct H5AC2_cache_config_t
  * 	is TRUE.
  *
  * 	At present, the length of the journal file path is restricted to
- * 	no more than H5AC2__MAX_JOURNAL_FILE_NAME_LEN.
+ * 	no more than H5AC__MAX_JOURNAL_FILE_NAME_LEN.
  *
  * journal_recovered:  Boolean flag use to indicate that we are opening
  * 	a journaled file that was not closed correctly, and on which the
@@ -504,23 +504,23 @@ typedef struct H5AC2_cache_config_t
  *
  ****************************************************************************/
 
-#define H5AC2__CURR_JNL_CONFIG_VER 		1
-#define H5AC2__MAX_JOURNAL_FILE_NAME_LEN	1024
+#define H5AC__CURR_JNL_CONFIG_VER 		1
+#define H5AC__MAX_JOURNAL_FILE_NAME_LEN	1024
 
-typedef struct H5AC2_jnl_config_t
+typedef struct H5AC_jnl_config_t
 {
     int		version;
 
     /* metadata journaling configuration fields: */
     hbool_t     enable_journaling;
-    char        journal_file_path[H5AC2__MAX_JOURNAL_FILE_NAME_LEN + 1];
+    char        journal_file_path[H5AC__MAX_JOURNAL_FILE_NAME_LEN + 1];
     hbool_t     journal_recovered;
     size_t      jbrb_buf_size;
     int         jbrb_num_bufs;
     hbool_t     jbrb_use_aio;
     hbool_t     jbrb_human_readable;
 
-} H5AC2_jnl_config_t;
+} H5AC_jnl_config_t;
 
 
 #ifdef __cplusplus
diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c
index 5a591df..2c0f7cc 100644
--- a/src/H5Adeprec.c
+++ b/src/H5Adeprec.c
@@ -43,7 +43,7 @@
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Apkg.h"		/* Attributes				*/
-#include "H5AC2private.h"	/* Metadata cache                       */
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Dprivate.h"		/* Datasets				*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Iprivate.h"		/* IDs			  		*/
@@ -144,7 +144,7 @@ H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
     H5S_t		*space;                 /* Dataspace to use for attribute */
     hid_t		ret_value;              /* Return value */
 
-    FUNC_ENTER_API_META(H5Acreate1, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Acreate1, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, plist_id);
 
     /* check arguments */
@@ -162,7 +162,7 @@ H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space")
 
     /* Go do the real work for attaching the attribute to the dataset */
-    if((ret_value = H5A_create(&loc, name, type, space, plist_id, H5AC2_dxpl_id)) < 0)
+    if((ret_value = H5A_create(&loc, name, type, space, plist_id, H5AC_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to create attribute")
 
 done:
@@ -211,7 +211,7 @@ H5Aopen_name(hid_t loc_id, const char *name)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Open the attribute on the object header */
-    if(NULL == (attr = H5A_open_by_name(&loc, ".", name, H5P_LINK_ACCESS_DEFAULT, H5AC2_ind_dxpl_id)))
+    if(NULL == (attr = H5A_open_by_name(&loc, ".", name, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "can't open attribute")
 
     /* Register the attribute and get an ID for it */
@@ -267,7 +267,7 @@ H5Aopen_idx(hid_t loc_id, unsigned idx)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
     /* Open the attribute in the object header */
-    if(NULL == (attr = H5A_open_by_idx(&loc, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)idx, H5P_LINK_ACCESS_DEFAULT, H5AC2_ind_dxpl_id)))
+    if(NULL == (attr = H5A_open_by_idx(&loc, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)idx, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_ATTR, H5E_CANTOPENOBJ, FAIL, "unable to open attribute")
 
     /* Register the attribute and get an ID for it */
@@ -340,7 +340,7 @@ H5Aget_num_attrs(hid_t loc_id)
     } /*lint !e788 All appropriate cases are covered */
 
     /* Look up the # of attributes for the object */
-    if((ret_value = H5O_attr_count(loc, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5O_attr_count(loc, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTCOUNT, FAIL, "can't get attribute count for object")
 
 done:
@@ -406,7 +406,7 @@ H5Aiterate1(hid_t loc_id, unsigned *attr_num, H5A_operator1_t op, void *op_data)
 
     /* Call attribute iteration routine */
     last_attr = start_idx = (hsize_t)(attr_num ? *attr_num : 0);
-    if((ret_value = H5O_attr_iterate(loc_id, H5AC2_ind_dxpl_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, start_idx, &last_attr, &attr_op, op_data)) < 0)
+    if((ret_value = H5O_attr_iterate(loc_id, H5AC_ind_dxpl_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, start_idx, &last_attr, &attr_op, op_data)) < 0)
         HERROR(H5E_ATTR, H5E_BADITER, "error iterating over attributes");
 
     /* Set the last attribute information */
diff --git a/src/H5Atest.c b/src/H5Atest.c
index 9864cc5..1fbaa42 100644
--- a/src/H5Atest.c
+++ b/src/H5Atest.c
@@ -37,7 +37,7 @@
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Apkg.h"		/* Attributes	  			*/
-#include "H5AC2private.h"	/* Metadata cache                       */
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Iprivate.h"		/* IDs			  		*/
 #include "H5SMprivate.h"        /* Shared object header messages        */
@@ -140,7 +140,7 @@ H5A_get_shared_rc_test(hid_t attr_id, hsize_t *ref_count)
     HDassert(H5O_msg_is_shared(H5O_ATTR_ID, attr));
 
     /* Retrieve ref count for shared or shareable attribute */
-    if(H5SM_get_refcount(attr->shared->oloc.file, H5AC2_ind_dxpl_id, H5O_ATTR_ID,
+    if(H5SM_get_refcount(attr->shared->oloc.file, H5AC_ind_dxpl_id, H5O_ATTR_ID,
             &attr->sh_loc, ref_count) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTGET, FAIL, "can't retrieve shared message ref count")
 
diff --git a/src/H5B.c b/src/H5B.c
index 94d9938..0f32f0c 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -229,7 +229,7 @@ H5B_create(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, void *udata,
      */
     if(NULL == (bt = H5FL_MALLOC(H5B_t)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "memory allocation failed for B-tree root node")
-    HDmemset(&bt->cache_info, 0, sizeof(H5AC2_info_t));
+    HDmemset(&bt->cache_info, 0, sizeof(H5AC_info_t));
     bt->level = 0;
     bt->left = HADDR_UNDEF;
     bt->right = HADDR_UNDEF;
@@ -248,7 +248,7 @@ H5B_create(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, void *udata,
     /*
      * Cache the new B-tree node.
      */
-    if(H5AC2_set(f, dxpl_id, H5AC2_BT, *addr_p, shared->sizeof_rnode, bt, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(f, dxpl_id, H5AC_BT, *addr_p, shared->sizeof_rnode, bt, H5AC__NO_FLAGS_SET) < 0)
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "can't add B-tree root node to cache")
 #ifdef H5B_DEBUG
     H5B_assert(f, dxpl_id, *addr_p, shared->type, udata);
@@ -327,7 +327,7 @@ H5B_find(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void *u
     cache_udata.f = f;
     cache_udata.type = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC2_READ)))
+    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree node")
     rt = bt->nchildren;
 
@@ -380,7 +380,7 @@ H5B_find(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void *u
     }
 
 done:
-    if(bt && H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, H5AC2__NO_FLAGS_SET) < 0)
+    if(bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -416,7 +416,7 @@ H5B_split(H5F_t *f, hid_t dxpl_id, H5B_t *old_bt, unsigned *old_bt_flags,
     H5P_genplist_t *dx_plist;           /* Data transfer property list */
     H5B_shared_t        *shared;        /* Pointer to shared B-tree info */
     H5B_cache_ud_t cache_udata;         /* User-data for metadata cache callback */
-    unsigned 	new_bt_flags = H5AC2__NO_FLAGS_SET;
+    unsigned 	new_bt_flags = H5AC__NO_FLAGS_SET;
     H5B_t	*new_bt = NULL;
     unsigned	nleft, nright;          /* Number of keys in left & right halves */
     double      split_ratios[3];        /* B-tree split ratios */
@@ -498,7 +498,7 @@ H5B_split(H5F_t *f, hid_t dxpl_id, H5B_t *old_bt, unsigned *old_bt_flags,
     cache_udata.f = f;
     cache_udata.type = shared->type;
     cache_udata.rc_shared = old_bt->rc_shared;
-    if(NULL == (new_bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, *new_addr_p, shared->sizeof_rnode, &cache_udata, H5AC2_WRITE)))
+    if(NULL == (new_bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, *new_addr_p, shared->sizeof_rnode, &cache_udata, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to protect B-tree")
     new_bt->level = old_bt->level;
 
@@ -513,7 +513,7 @@ H5B_split(H5F_t *f, hid_t dxpl_id, H5B_t *old_bt, unsigned *old_bt_flags,
      * dirty again.
      *                                          -- JRM
      */
-    new_bt_flags |= H5AC2__DIRTIED_FLAG;
+    new_bt_flags |= H5AC__DIRTIED_FLAG;
     HDmemcpy(new_bt->native,
 	     old_bt->native + nleft * shared->type->sizeof_nkey,
 	     (nright + 1) * shared->type->sizeof_nkey);
@@ -526,7 +526,7 @@ H5B_split(H5F_t *f, hid_t dxpl_id, H5B_t *old_bt, unsigned *old_bt_flags,
     /*
      * Truncate the old node.
      */
-    *old_bt_flags |= H5AC2__DIRTIED_FLAG;
+    *old_bt_flags |= H5AC__DIRTIED_FLAG;
     old_bt->nchildren = nleft;
 
     /*
@@ -542,19 +542,19 @@ H5B_split(H5F_t *f, hid_t dxpl_id, H5B_t *old_bt, unsigned *old_bt_flags,
         cache_udata2.f = f;
         cache_udata2.type = shared->type;
         cache_udata2.rc_shared = old_bt->rc_shared;
-	if(NULL == (tmp_bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, old_bt->right, shared->sizeof_rnode, &cache_udata2, H5AC2_WRITE)))
+	if(NULL == (tmp_bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, old_bt->right, shared->sizeof_rnode, &cache_udata2, H5AC_WRITE)))
 	    HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load right sibling")
 
 	tmp_bt->left = *new_addr_p;
 
-        if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, old_bt->right, (size_t)0, tmp_bt, H5AC2__DIRTIED_FLAG) < 0)
+        if(H5AC_unprotect(f, dxpl_id, H5AC_BT, old_bt->right, (size_t)0, tmp_bt, H5AC__DIRTIED_FLAG) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
     } /* end if */
 
     old_bt->right = *new_addr_p;
 
 done:
-    if(new_bt && H5AC2_unprotect(f, dxpl_id, H5AC2_BT, *new_addr_p, (size_t)0, new_bt, new_bt_flags) < 0)
+    if(new_bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, *new_addr_p, (size_t)0, new_bt, new_bt_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -623,7 +623,7 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
     cache_udata.f = f;
     cache_udata.type = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC2_READ)))
+    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to locate root of B-tree")
 
     level = bt->level;
@@ -631,18 +631,18 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
     if(!lt_key_changed)
 	HDmemcpy(lt_key, H5B_NKEY(bt,shared,0), type->sizeof_nkey);
 
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release new child")
     bt = NULL;
 
     /* the new node */
-    if(NULL == (bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, child, shared->sizeof_rnode, &cache_udata, H5AC2_READ)))
+    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, child, shared->sizeof_rnode, &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load new node")
 
     if(!rt_key_changed)
 	HDmemcpy(rt_key, H5B_NKEY(bt,shared,bt->nchildren), type->sizeof_nkey);
 
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, child, (size_t)0, bt, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_BT, child, (size_t)0, bt, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release new child")
     bt = NULL;
 
@@ -656,12 +656,12 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
         HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "unable to allocate file space to move root")
 
     /* update the new child's left pointer */
-    if(NULL == (bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, child, shared->sizeof_rnode, &cache_udata, H5AC2_WRITE)))
+    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, child, shared->sizeof_rnode, &cache_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load new child")
 
     bt->left = old_root;
 
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, child, (size_t)0, bt, H5AC2__DIRTIED_FLAG) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_BT, child, (size_t)0, bt, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release new child")
     bt = NULL;    /* Make certain future references will be caught */
 
@@ -670,7 +670,7 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
      * at the new location -QAK
      */
     /* Bring the old root into the cache if it's not already */
-    if(NULL == (bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC2_WRITE)))
+    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load new child")
 
     /* Make certain the old root info is marked as dirty before moving it, */
@@ -680,18 +680,18 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
     if(NULL == (new_bt = H5B_copy(bt))) {
         HCOMMON_ERROR(H5E_BTREE, H5E_CANTCOPY, "unable to copy old root");
 
-        if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, H5AC2__DIRTIED_FLAG) < 0)
+        if(H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, H5AC__DIRTIED_FLAG) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release new child")
 
         HGOTO_DONE(FAIL)
     } /* end if */
 
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, H5AC2__DIRTIED_FLAG) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release new child")
     bt = NULL;    /* Make certain future references will be caught */
 
     /* Move the location of the old root on the disk */
-    if(H5AC2_rename(f, H5AC2_BT, addr, old_root) < 0)
+    if(H5AC_rename(f, H5AC_BT, addr, old_root) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to move B-tree root node")
 
     /* clear the old root info at the old address (we already copied it) */
@@ -711,7 +711,7 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
     HDmemcpy(H5B_NKEY(new_bt,shared,2), rt_key, shared->type->sizeof_nkey);
 
     /* Insert the modified copy of the old root into the file again */
-    if(H5AC2_set(f, dxpl_id, H5AC2_BT, addr, shared->sizeof_rnode, new_bt, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(f, dxpl_id, H5AC_BT, addr, shared->sizeof_rnode, new_bt, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTFLUSH, FAIL, "unable to flush old B-tree root node")
 
 #ifdef H5B_DEBUG
@@ -789,7 +789,7 @@ H5B_insert_child(H5B_t *bt, unsigned *bt_flags, unsigned idx,
     bt->nchildren += 1;
 
     /* Mark node as dirty */
-    *bt_flags |= H5AC2__DIRTIED_FLAG;
+    *bt_flags |= H5AC__DIRTIED_FLAG;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 }
@@ -833,7 +833,7 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
 		  uint8_t *rt_key, hbool_t *rt_key_changed,
 		  haddr_t *new_node_p/*out*/)
 {
-    unsigned	bt_flags = H5AC2__NO_FLAGS_SET, twin_flags = H5AC2__NO_FLAGS_SET;
+    unsigned	bt_flags = H5AC__NO_FLAGS_SET, twin_flags = H5AC__NO_FLAGS_SET;
     H5B_t	*bt = NULL, *twin = NULL;
     H5RC_t	*rc_shared;             /* Ref-counted shared info */
     H5B_shared_t        *shared;        /* Pointer to shared B-tree info */
@@ -878,7 +878,7 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
     cache_udata.f = f;
     cache_udata.type = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC2_WRITE)))
+    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to load node")
     rt = bt->nchildren;
 
@@ -900,7 +900,7 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
 			     H5B_NKEY(bt, shared, 1), bt->child + 0/*out*/) < 0)
 	    HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, H5B_INS_ERROR, "unable to create leaf node")
 	bt->nchildren = 1;
-        bt_flags |= H5AC2__DIRTIED_FLAG;
+        bt_flags |= H5AC__DIRTIED_FLAG;
 	idx = 0;
 
 	if(type->follow_min) {
@@ -1011,14 +1011,14 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
      * Update the left and right keys of the current node.
      */
     if(*lt_key_changed) {
-        bt_flags |= H5AC2__DIRTIED_FLAG;
+        bt_flags |= H5AC__DIRTIED_FLAG;
 	if(idx > 0)
 	    *lt_key_changed = FALSE;
 	else
 	    HDmemcpy(lt_key, H5B_NKEY(bt, shared, idx), type->sizeof_nkey);
     } /* end if */
     if(*rt_key_changed) {
-        bt_flags |= H5AC2__DIRTIED_FLAG;
+        bt_flags |= H5AC__DIRTIED_FLAG;
 	if(idx + 1 < bt->nchildren)
 	    *rt_key_changed = FALSE;
 	else
@@ -1029,7 +1029,7 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
 	 * The insertion simply changed the address for the child.
 	 */
 	bt->child[idx] = child_addr;
-        bt_flags |= H5AC2__DIRTIED_FLAG;
+        bt_flags |= H5AC__DIRTIED_FLAG;
 	ret_value = H5B_INS_NOOP;
     } else if(H5B_INS_LEFT == my_ins || H5B_INS_RIGHT == my_ins) {
         hbool_t *tmp_bt_flags_ptr = NULL;
@@ -1041,7 +1041,7 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
 	if(bt->nchildren == shared->two_k) {
 	    if(H5B_split(f, dxpl_id, bt, &bt_flags, addr, idx, udata, new_node_p/*out*/) < 0)
 		HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, H5B_INS_ERROR, "unable to split node")
-	    if(NULL == (twin = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, *new_node_p, shared->sizeof_rnode, &cache_udata, H5AC2_WRITE)))
+	    if(NULL == (twin = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, *new_node_p, shared->sizeof_rnode, &cache_udata, H5AC_WRITE)))
 		HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to load node")
 	    if(idx < bt->nchildren) {
 		tmp_bt = bt;
@@ -1084,8 +1084,8 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
 
 done:
     {
-	herr_t e1 = (bt && H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, bt_flags) < 0);
-	herr_t e2 = (twin && H5AC2_unprotect(f, dxpl_id, H5AC2_BT, *new_node_p, (size_t)0, twin, twin_flags) < 0);
+	herr_t e1 = (bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, bt_flags) < 0);
+	herr_t e2 = (twin && H5AC_unprotect(f, dxpl_id, H5AC_BT, *new_node_p, (size_t)0, twin, twin_flags) < 0);
 	if(e1 || e2)  /*use vars to prevent short-circuit of side effects */
 	    HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to release node(s)")
     }
@@ -1141,14 +1141,14 @@ H5B_iterate_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t add
     cache_udata.f = f;
     cache_udata.type = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC2_READ)))
+    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5_ITER_ERROR, "unable to load B-tree node")
 
     if(bt->level > 0) {
         haddr_t left_child = bt->child[0];     /* Address of left-most child in node */
 
         /* Release current node */
-        if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, H5AC2__NO_FLAGS_SET) < 0)
+        if(H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5_ITER_ERROR, "unable to release B-tree node")
         bt = NULL;
 
@@ -1175,7 +1175,7 @@ H5B_iterate_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t add
         HDmemcpy(child, bt->child, (nchildren * sizeof(haddr_t)));
 
         /* Release current node */
-        if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, H5AC2__NO_FLAGS_SET) < 0)
+        if(H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5_ITER_ERROR, "unable to release B-tree node")
         bt = NULL;
 
@@ -1205,7 +1205,7 @@ H5B_iterate_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t add
                 if(H5F_addr_defined(next_addr)) {
                     /* Protect the next node to the right */
                     addr = next_addr;
-                    if(NULL == (bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC2_READ)))
+                    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC_READ)))
                         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5_ITER_ERROR, "B-tree node")
 
                     /* Cache information from this node */
@@ -1217,7 +1217,7 @@ H5B_iterate_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t add
                     HDmemcpy(child, bt->child, nchildren * sizeof(haddr_t));
 
                     /* Unprotect node */
-                    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, H5AC2__NO_FLAGS_SET) < 0)
+                    if(H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, H5AC__NO_FLAGS_SET) < 0)
                         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5_ITER_ERROR, "unable to release B-tree node")
                     bt = NULL;
                 } /* end if */
@@ -1229,7 +1229,7 @@ H5B_iterate_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t add
     } /* end else */
 
 done:
-    if(bt && H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, H5AC2__NO_FLAGS_SET) < 0)
+    if(bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5_ITER_ERROR, "unable to release B-tree node")
     if(native)
         (void)H5FL_BLK_FREE(native_block, native);
@@ -1310,7 +1310,7 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
 		  uint8_t *rt_key/*out*/, hbool_t *rt_key_changed/*out*/)
 {
     H5B_t	*bt = NULL, *sibling = NULL;
-    unsigned	bt_flags = H5AC2__NO_FLAGS_SET;
+    unsigned	bt_flags = H5AC__NO_FLAGS_SET;
     H5RC_t	*rc_shared;             /* Ref-counted shared info */
     H5B_shared_t *shared;               /* Pointer to shared B-tree info */
     H5B_cache_ud_t cache_udata;         /* User-data for metadata cache callback */
@@ -1342,7 +1342,7 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
     cache_udata.f = f;
     cache_udata.type = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC2_WRITE)))
+    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to load B-tree node")
 
     rt = bt->nchildren;
@@ -1398,7 +1398,7 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
      * our right key and indicate that it changed.
      */
     if(*lt_key_changed) {
-        bt_flags |= H5AC2__DIRTIED_FLAG;
+        bt_flags |= H5AC__DIRTIED_FLAG;
 
 	if(idx > 0)
             /* Don't propagate change out of this B-tree node */
@@ -1407,7 +1407,7 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
 	    HDmemcpy(lt_key, H5B_NKEY(bt, shared, idx), type->sizeof_nkey);
     } /* end if */
     if(*rt_key_changed) {
-        bt_flags |= H5AC2__DIRTIED_FLAG;
+        bt_flags |= H5AC__DIRTIED_FLAG;
 	if(idx + 1 < bt->nchildren) {
             /* Don't propagate change out of this B-tree node */
 	    *rt_key_changed = FALSE;
@@ -1421,13 +1421,13 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
              */
             if(ret_value != H5B_INS_REMOVE && level > 0) {
                 if(H5F_addr_defined(bt->right)) {
-                    if(NULL == (sibling = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, bt->right, shared->sizeof_rnode, &cache_udata, H5AC2_WRITE)))
+                    if(NULL == (sibling = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, bt->right, shared->sizeof_rnode, &cache_udata, H5AC_WRITE)))
                         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to unlink node from tree")
 
                     /* Make certain the native key for the right sibling is set up */
                     HDmemcpy(H5B_NKEY(sibling, shared, 0), H5B_NKEY(bt, shared, idx + 1), type->sizeof_nkey);
 
-                    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, bt->right, (size_t)0, sibling, H5AC2__DIRTIED_FLAG) < 0)
+                    if(H5AC_unprotect(f, dxpl_id, H5AC_BT, bt->right, (size_t)0, sibling, H5AC__DIRTIED_FLAG) < 0)
                         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to release node from tree")
                     sibling = NULL;   /* Make certain future references will be caught */
                 } /* end if */
@@ -1445,21 +1445,21 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
 	 * keys and the subtree pointer. Free this node (unless it's the
 	 * root node) and return H5B_INS_REMOVE.
 	 */
-        bt_flags |= H5AC2__DIRTIED_FLAG;
+        bt_flags |= H5AC__DIRTIED_FLAG;
 	bt->nchildren = 0;
 	if(level > 0) {
 	    if(H5F_addr_defined(bt->left)) {
-		if(NULL == (sibling = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, bt->left, shared->sizeof_rnode, &cache_udata, H5AC2_WRITE)))
+		if(NULL == (sibling = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, bt->left, shared->sizeof_rnode, &cache_udata, H5AC_WRITE)))
 		    HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to load node from tree")
 
 		sibling->right = bt->right;
 
-                if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, bt->left, (size_t)0, sibling, H5AC2__DIRTIED_FLAG) < 0)
+                if(H5AC_unprotect(f, dxpl_id, H5AC_BT, bt->left, (size_t)0, sibling, H5AC__DIRTIED_FLAG) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to release node from tree")
                 sibling = NULL;   /* Make certain future references will be caught */
 	    } /* end if */
 	    if(H5F_addr_defined(bt->right)) {
-		if(NULL == (sibling = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, bt->right, shared->sizeof_rnode, &cache_udata, H5AC2_WRITE)))
+		if(NULL == (sibling = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, bt->right, shared->sizeof_rnode, &cache_udata, H5AC_WRITE)))
 		    HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to unlink node from tree")
 
                 /* Copy left-most key from deleted node to left-most key in it's right neighbor */
@@ -1467,7 +1467,7 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
 
 		sibling->left = bt->left;
 
-                if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, bt->right, (size_t)0, sibling, H5AC2__DIRTIED_FLAG) < 0)
+                if(H5AC_unprotect(f, dxpl_id, H5AC_BT, bt->right, (size_t)0, sibling, H5AC__DIRTIED_FLAG) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to release node from tree")
                 sibling = NULL;   /* Make certain future references will be caught */
 	    } /* end if */
@@ -1475,13 +1475,13 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
 	    bt->right = HADDR_UNDEF;
             H5_CHECK_OVERFLOW(shared->sizeof_rnode, size_t, hsize_t);
 	    if(H5MF_xfree(f, H5FD_MEM_BTREE, dxpl_id, addr, (hsize_t)shared->sizeof_rnode) < 0
-                    || H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, bt_flags | H5AC2__DELETED_FLAG) < 0) {
+                    || H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, bt_flags | H5AC__DELETED_FLAG) < 0) {
 		bt = NULL;
-                bt_flags = H5AC2__NO_FLAGS_SET;
+                bt_flags = H5AC__NO_FLAGS_SET;
 		HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to free B-tree node")
 	    } /* end if */
 	    bt = NULL;
-            bt_flags = H5AC2__NO_FLAGS_SET;
+            bt_flags = H5AC__NO_FLAGS_SET;
 	} /* end if */
     } else if(H5B_INS_REMOVE == ret_value && 0 == idx) {
 	/*
@@ -1491,7 +1491,7 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
 	 * key into lt_key and notify the caller that the left key has
 	 * changed.  Return H5B_INS_NOOP.
 	 */
-        bt_flags |= H5AC2__DIRTIED_FLAG;
+        bt_flags |= H5AC__DIRTIED_FLAG;
 	bt->nchildren -= 1;
 
 	HDmemmove(bt->native,
@@ -1510,7 +1510,7 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
 	 * freed).  We copy the new right-most key into rt_key and notify the
 	 * caller that the right key has changed.  Return H5B_INS_NOOP.
 	 */
-        bt_flags |= H5AC2__DIRTIED_FLAG;
+        bt_flags |= H5AC__DIRTIED_FLAG;
 	bt->nchildren -= 1;
 	HDmemcpy(rt_key, H5B_NKEY(bt, shared, bt->nchildren), type->sizeof_nkey);
 	*rt_key_changed = TRUE;
@@ -1521,12 +1521,12 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
          */
         if(level > 0) {
             if(H5F_addr_defined(bt->right)) {
-                if(NULL == (sibling = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, bt->right, shared->sizeof_rnode, &cache_udata, H5AC2_WRITE)))
+                if(NULL == (sibling = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, bt->right, shared->sizeof_rnode, &cache_udata, H5AC_WRITE)))
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, H5B_INS_ERROR, "unable to unlink node from tree")
 
                 HDmemcpy(H5B_NKEY(sibling, shared, 0), H5B_NKEY(bt, shared, bt->nchildren), type->sizeof_nkey);
 
-                if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, bt->right, (size_t)0, sibling, H5AC2__DIRTIED_FLAG) < 0)
+                if(H5AC_unprotect(f, dxpl_id, H5AC_BT, bt->right, (size_t)0, sibling, H5AC__DIRTIED_FLAG) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to release node from tree")
                 sibling = NULL;   /* Make certain future references will be caught */
             } /* end if */
@@ -1541,7 +1541,7 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
 	 * the right are shifted left by one place.  The subtree has already
 	 * been freed). Return H5B_INS_NOOP.
 	 */
-        bt_flags |= H5AC2__DIRTIED_FLAG;
+        bt_flags |= H5AC__DIRTIED_FLAG;
 	bt->nchildren -= 1;
 
 	HDmemmove(bt->native + idx * type->sizeof_nkey,
@@ -1555,7 +1555,7 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
 	ret_value = H5B_INS_NOOP;
 
 done:
-    if(bt && H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, bt_flags) < 0)
+    if(bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, bt_flags) < 0)
 	HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to release node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1587,7 +1587,7 @@ H5B_remove(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
     uint8_t	*rt_key = (uint8_t*)_rt_key;	/*right key*/
     hbool_t	lt_key_changed = FALSE;		/*left key changed?*/
     hbool_t	rt_key_changed = FALSE;		/*right key changed?*/
-    unsigned	bt_flags = H5AC2__NO_FLAGS_SET;
+    unsigned	bt_flags = H5AC__NO_FLAGS_SET;
     H5B_t	*bt = NULL;			/*btree node */
     H5RC_t	*rc_shared;             /* Ref-counted shared info */
     H5B_shared_t *shared;               /* Pointer to shared B-tree info */
@@ -1620,15 +1620,15 @@ H5B_remove(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
     cache_udata.f = f;
     cache_udata.type = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC2_WRITE)))
+    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree root node")
 
     if(0 == bt->nchildren && 0 != bt->level) {
 	bt->level = 0;
-        bt_flags |= H5AC2__DIRTIED_FLAG;
+        bt_flags |= H5AC__DIRTIED_FLAG;
     } /* end if */
 
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, bt_flags) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, bt_flags) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release node")
     bt = NULL;    /* Make certain future references will be caught */
 
@@ -1680,7 +1680,7 @@ H5B_delete(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
     cache_udata.f = f;
     cache_udata.type = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC2_WRITE)))
+    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree node")
 
     /* Iterate over all children in tree, deleting them */
@@ -1712,7 +1712,7 @@ H5B_delete(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
         HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to free B-tree node")
 
 done:
-    if(bt && H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, H5AC2__DELETED_FLAG) < 0)
+    if(bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, H5AC__DELETED_FLAG) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node in cache")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1856,7 +1856,7 @@ H5B_copy(const H5B_t *old_bt)
     HDmemcpy(new_node, old_bt, sizeof(H5B_t));
 
     /* Reset cache info */
-    HDmemset(&new_node->cache_info, 0, sizeof(H5AC2_info_t));
+    HDmemset(&new_node->cache_info, 0, sizeof(H5AC_info_t));
 
     if(NULL == (new_node->native = H5FL_BLK_MALLOC(native_block, shared->sizeof_keys)) ||
             NULL == (new_node->child = H5FL_SEQ_MALLOC(haddr_t, (size_t)shared->two_k)))
@@ -1937,7 +1937,7 @@ H5B_get_info_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t ad
     cache_udata.f = f;
     cache_udata.type = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC2_READ)))
+    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree node")
 
     /* Cache information from this node */
@@ -1950,7 +1950,7 @@ H5B_get_info_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t ad
     info_udata->bt_info->num_nodes++;
 
     /* Release current node */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
     bt = NULL;
 
@@ -1961,7 +1961,7 @@ H5B_get_info_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t ad
     while(H5F_addr_defined(next_addr)) {
         /* Protect the next node to the right */
         addr = next_addr;
-        if(NULL == (bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC2_READ)))
+        if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "B-tree node")
 
         /* Cache information from this node */
@@ -1972,7 +1972,7 @@ H5B_get_info_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t ad
         info_udata->bt_info->num_nodes++;
 
         /* Unprotect node */
-        if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, H5AC2__NO_FLAGS_SET) < 0)
+        if(H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
         bt = NULL;
     } /* end while */
@@ -1985,7 +1985,7 @@ H5B_get_info_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t ad
     } /* end if */
 
 done:
-    if(bt && H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, H5AC2__NO_FLAGS_SET) < 0)
+    if(bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2124,7 +2124,7 @@ H5B_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int f
     cache_udata.f = f;
     cache_udata.type = type;
     cache_udata.rc_shared = rc_shared;
-    if(NULL == (bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC2_READ)))
+    if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree node")
 
     /*
@@ -2186,7 +2186,7 @@ H5B_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int f
     } /* end for */
 
 done:
-    if(bt && H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, H5AC2__NO_FLAGS_SET) < 0)
+    if(bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2244,7 +2244,7 @@ H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, void
     cache_udata.f = f;
     cache_udata.type = type;
     cache_udata.rc_shared = rc_shared;
-    bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC2_READ);
+    bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, shared->sizeof_rnode, &cache_udata, H5AC_READ);
     HDassert(bt);
     shared=(H5B_shared_t *)H5RC_GET_OBJ(bt->rc_shared);
     HDassert(shared);
@@ -2254,7 +2254,7 @@ H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, void
     cur->level = bt->level;
     head = tail = cur;
 
-    status = H5AC2_unprotect(f, dxpl_id, H5AC2_BT, addr, (size_t)0, bt, H5AC2__NO_FLAGS_SET);
+    status = H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, (size_t)0, bt, H5AC__NO_FLAGS_SET);
     HDassert(status >= 0);
     bt = NULL;    /* Make certain future references will be caught */
 
@@ -2265,7 +2265,7 @@ H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, void
      * test.
      */
     for(ncell = 0; cur; ncell++) {
-	bt = (H5B_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT, cur->addr, shared->sizeof_rnode, &cache_udata, H5AC2_READ);
+	bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, cur->addr, shared->sizeof_rnode, &cache_udata, H5AC_READ);
 	HDassert(bt);
 
 	/* Check node header */
@@ -2305,7 +2305,7 @@ H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, void
 	} /* end if */
 
 	/* Release node */
-	status = H5AC2_unprotect(f, dxpl_id, H5AC2_BT, cur->addr, (size_t)0, bt, H5AC2__NO_FLAGS_SET);
+	status = H5AC_unprotect(f, dxpl_id, H5AC_BT, cur->addr, (size_t)0, bt, H5AC__NO_FLAGS_SET);
 	HDassert(status >= 0);
         bt = NULL;    /* Make certain future references will be caught */
 
diff --git a/src/H5B2.c b/src/H5B2.c
index 6e6962d..c2114eb 100644
--- a/src/H5B2.c
+++ b/src/H5B2.c
@@ -123,7 +123,7 @@ H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type,
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree header")
 
     /* Assign internal information */
-    HDmemset(&bt2->cache_info, 0, sizeof(H5AC2_info_t));
+    HDmemset(&bt2->cache_info, 0, sizeof(H5AC_info_t));
     bt2->root.addr = HADDR_UNDEF;
     bt2->root.node_nrec = 0;
     bt2->root.all_nrec = 0;
@@ -137,7 +137,7 @@ H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type,
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for B-tree header")
 
     /* Cache the new B-tree node */
-    if(H5AC2_set(f, dxpl_id, H5AC2_BT2_HDR, *addr_p, (size_t)H5B2_HEADER_SIZE(f), bt2, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(f, dxpl_id, H5AC_BT2_HDR, *addr_p, (size_t)H5B2_HEADER_SIZE(f), bt2, H5AC__NO_FLAGS_SET) < 0)
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "can't add B-tree header to cache")
 
 done:
@@ -168,7 +168,7 @@ H5B2_insert(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
            void *udata)
 {
     H5B2_t	*bt2 = NULL;            /* Pointer to the B-tree header */
-    unsigned	bt2_flags = H5AC2__NO_FLAGS_SET; /* Metadata cache flags for B-tree header */
+    unsigned	bt2_flags = H5AC__NO_FLAGS_SET; /* Metadata cache flags for B-tree header */
     H5B2_shared_t *shared;              /* Pointer to B-tree's shared information */
     H5B2_hdr_cache_ud_t cache_udata;    /* User-data for callback */
     herr_t	ret_value = SUCCEED;
@@ -184,7 +184,7 @@ H5B2_insert(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     cache_udata.type = type;
 
     /* Look up the b-tree header */
-    if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_WRITE)))
+    if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header")
 
     /* Get the pointer to the shared B-tree info */
@@ -198,7 +198,7 @@ H5B2_insert(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
 	    HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create root node")
 
         /* Mark B-tree header as dirty, since we updated the address of the root node */
-        bt2_flags |= H5AC2__DIRTIED_FLAG;
+        bt2_flags |= H5AC__DIRTIED_FLAG;
     } /* end if */
     /* Check if we need to split the root node (equiv. to a 1->2 node split) */
     else if(bt2->root.node_nrec == shared->node_info[shared->depth].split_nrec) {
@@ -218,11 +218,11 @@ H5B2_insert(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     } /* end else */
 
     /* Mark parent node as dirty */
-    bt2_flags |= H5AC2__DIRTIED_FLAG;
+    bt2_flags |= H5AC__DIRTIED_FLAG;
 
 done:
     /* Release the B-tree header info */
-    if(bt2 && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)0, bt2, bt2_flags) < 0)
+    if(bt2 && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)0, bt2, bt2_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header info")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -271,7 +271,7 @@ H5B2_iterate(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     cache_udata.type = type;
 
     /* Look up the B-tree header */
-    if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header")
 
     /* Safely grab pointer to reference counted shared B-tree info, so we can release the B-tree header if necessary */
@@ -290,7 +290,7 @@ H5B2_iterate(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     depth = shared->depth;
 
     /* Release header */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)0, bt2, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)0, bt2, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header info")
     bt2 = NULL;
 
@@ -360,7 +360,7 @@ H5B2_find(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     cache_udata.type = type;
 
     /* Look up the B-tree header */
-    if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header")
 
     /* Safely grab pointer to reference counted shared B-tree info, so we can release the B-tree header if necessary */
@@ -379,7 +379,7 @@ H5B2_find(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     depth = shared->depth;
 
     /* Release header */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)0, bt2, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)0, bt2, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header info")
     bt2 = NULL;
 
@@ -394,7 +394,7 @@ H5B2_find(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
         H5B2_node_ptr_t next_node_ptr;      /* Node pointer info for next node */
 
         /* Lock B-tree current node */
-        if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node_ptr.addr, curr_node_ptr.node_nrec, depth, H5AC2_READ)))
+        if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node_ptr.addr, curr_node_ptr.node_nrec, depth, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* Locate node pointer for child */
@@ -407,7 +407,7 @@ H5B2_find(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
             next_node_ptr=internal->node_ptrs[idx];
 
             /* Unlock current node */
-            if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC2__NO_FLAGS_SET) < 0)
+            if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             /* Set pointer to next node to load */
@@ -417,14 +417,14 @@ H5B2_find(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
             /* Make callback for current record */
             if(op && (op)(H5B2_INT_NREC(internal, shared, idx), op_data) < 0) {
                 /* Unlock current node */
-                if (H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC2__NO_FLAGS_SET) < 0)
+                if (H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
                 HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "'found' callback failed for B-tree find operation")
             } /* end if */
 
             /* Unlock current node */
-            if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC2__NO_FLAGS_SET) < 0)
+            if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             HGOTO_DONE(SUCCEED);
@@ -442,7 +442,7 @@ H5B2_find(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
         cache_leaf_udata.bt2_shared = bt2_shared;
 
         /* Lock B-tree leaf node */
-        if(NULL == (leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr.addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_READ)))
+        if(NULL == (leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* Locate record */
@@ -450,7 +450,7 @@ H5B2_find(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
 
         if(cmp != 0) {
             /* Unlock leaf node */
-            if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC2__NO_FLAGS_SET) < 0)
+            if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             /* Note: don't push error on stack, leave that to next higher level,
@@ -467,7 +467,7 @@ H5B2_find(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
             /* Make callback for current record */
             if(op && (op)(H5B2_LEAF_NREC(leaf, shared, idx), op_data) < 0) {
                 /* Unlock current node */
-                if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC2__NO_FLAGS_SET) < 0)
+                if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
                 HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "'found' callback failed for B-tree find operation")
@@ -475,7 +475,7 @@ H5B2_find(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
         } /* end else */
 
         /* Unlock current node */
-        if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC2__NO_FLAGS_SET) < 0)
+        if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
     } /* end block */
 
@@ -532,7 +532,7 @@ H5B2_index(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     cache_udata.type = type;
 
     /* Look up the B-tree header */
-    if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header")
 
     /* Safely grab pointer to reference counted shared B-tree info, so we can release the B-tree header if necessary */
@@ -551,7 +551,7 @@ H5B2_index(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     depth = shared->depth;
 
     /* Release header */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)0, bt2, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)0, bt2, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header info")
     bt2 = NULL;
 
@@ -574,7 +574,7 @@ H5B2_index(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
         unsigned u;                         /* Local index variable */
 
         /* Lock B-tree current node */
-        if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node_ptr.addr, curr_node_ptr.node_nrec, depth, H5AC2_READ)))
+        if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node_ptr.addr, curr_node_ptr.node_nrec, depth, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* Search for record with correct index */
@@ -585,7 +585,7 @@ H5B2_index(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
                 next_node_ptr = internal->node_ptrs[u];
 
                 /* Unlock current node */
-                if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC2__NO_FLAGS_SET) < 0)
+                if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
                 /* Set pointer to next node to load */
@@ -600,14 +600,14 @@ H5B2_index(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
                 /* Make callback for current record */
                 if((op)(H5B2_INT_NREC(internal, shared, u), op_data) < 0) {
                     /* Unlock current node */
-                    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC2__NO_FLAGS_SET) < 0)
+                    if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC__NO_FLAGS_SET) < 0)
                         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
                     HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "'found' callback failed for B-tree find operation")
                 } /* end if */
 
                 /* Unlock current node */
-                if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC2__NO_FLAGS_SET) < 0)
+                if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
                 HGOTO_DONE(SUCCEED);
@@ -627,7 +627,7 @@ H5B2_index(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
                 next_node_ptr = internal->node_ptrs[u];
 
                 /* Unlock current node */
-                if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC2__NO_FLAGS_SET) < 0)
+                if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
                 /* Set pointer to next node to load */
@@ -650,7 +650,7 @@ H5B2_index(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
         cache_leaf_udata.bt2_shared = bt2_shared;
 
         /* Lock B-tree leaf node */
-        if(NULL == (leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr.addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_READ)))
+        if(NULL == (leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* Sanity check index */
@@ -659,14 +659,14 @@ H5B2_index(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
         /* Make callback for correct record */
         if((op)(H5B2_LEAF_NREC(leaf, shared, idx), op_data) < 0) {
             /* Unlock current node */
-            if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC2__NO_FLAGS_SET) < 0)
+            if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             HGOTO_ERROR(H5E_BTREE, H5E_NOTFOUND, FAIL, "'found' callback failed for B-tree find operation")
         } /* end if */
 
         /* Unlock current node */
-        if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC2__NO_FLAGS_SET) < 0)
+        if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
     } /* end block */
 
@@ -697,7 +697,7 @@ H5B2_remove(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     void *udata, H5B2_remove_t op, void *op_data)
 {
     H5B2_t	*bt2 = NULL;            /* Pointer to the B-tree header */
-    unsigned    bt2_flags = H5AC2__NO_FLAGS_SET;
+    unsigned    bt2_flags = H5AC__NO_FLAGS_SET;
     H5B2_shared_t *shared;              /* Pointer to B-tree's shared information */
     H5B2_hdr_cache_ud_t cache_udata;    /* User-data for callback */
     herr_t	ret_value = SUCCEED;
@@ -713,7 +713,7 @@ H5B2_remove(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     cache_udata.type = type;
 
     /* Look up the b-tree header */
-    if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_WRITE)))
+    if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header")
 
     /* Get the pointer to the shared B-tree info */
@@ -754,11 +754,11 @@ H5B2_remove(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     bt2->root.all_nrec--;
 
     /* Mark parent node as dirty */
-    bt2_flags |= H5AC2__DIRTIED_FLAG;
+    bt2_flags |= H5AC__DIRTIED_FLAG;
 
 done:
     /* Release the B-tree header info */
-    if (bt2 && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)0, bt2, bt2_flags) < 0)
+    if (bt2 && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)0, bt2, bt2_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header info")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -784,7 +784,7 @@ H5B2_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type,
     void *op_data)
 {
     H5B2_t	*bt2 = NULL;              /* Pointer to the B-tree header */
-    unsigned    bt2_flags = H5AC2__NO_FLAGS_SET;
+    unsigned    bt2_flags = H5AC__NO_FLAGS_SET;
     H5B2_shared_t *shared;              /* Pointer to B-tree's shared information */
     H5B2_hdr_cache_ud_t cache_udata;    /* User-data for callback */
     herr_t	ret_value = SUCCEED;
@@ -800,7 +800,7 @@ H5B2_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type,
     cache_udata.type = type;
 
     /* Look up the b-tree header */
-    if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_WRITE)))
+    if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header")
 
     /* Get the pointer to the shared B-tree info */
@@ -849,11 +849,11 @@ H5B2_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type,
     bt2->root.all_nrec--;
 
     /* Mark parent node as dirty */
-    bt2_flags |= H5AC2__DIRTIED_FLAG;
+    bt2_flags |= H5AC__DIRTIED_FLAG;
 
 done:
     /* Release the B-tree header info */
-    if (bt2 && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)0, bt2, bt2_flags) < 0)
+    if (bt2 && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)0, bt2, bt2_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header info")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -893,7 +893,7 @@ H5B2_get_nrec(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     cache_udata.type = type;
 
     /* Look up the B-tree header */
-    if (NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if (NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header")
 
     /* Get B-tree number of records */
@@ -901,7 +901,7 @@ H5B2_get_nrec(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
 
 done:
     /* Release B-tree header node */
-    if (bt2 && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)0, bt2, H5AC2__NO_FLAGS_SET) < 0)
+    if (bt2 && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)0, bt2, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header info")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -954,7 +954,7 @@ H5B2_neighbor(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     cache_udata.type = type;
 
     /* Look up the B-tree header */
-    if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header")
 
     /* Get the pointer to the shared B-tree info */
@@ -977,7 +977,7 @@ H5B2_neighbor(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
 
 done:
     /* Release the B-tree header info */
-    if (bt2 && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)0, bt2, H5AC2__NO_FLAGS_SET) < 0)
+    if (bt2 && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)0, bt2, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header info")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1026,7 +1026,7 @@ H5B2_delete(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     cache_udata.type = type;
 
     /* Look up the B-tree header */
-    if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_WRITE)))
+    if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header")
 
     /* Get the pointer to the shared B-tree info */
@@ -1044,7 +1044,7 @@ H5B2_delete(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
 
 done:
     /* Release the B-tree header info */
-    if(bt2 && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)0, bt2, H5AC2__DELETED_FLAG) < 0)
+    if(bt2 && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)0, bt2, H5AC__DELETED_FLAG) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to delete B-tree header info")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1099,7 +1099,7 @@ H5B2_modify(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     cache_udata.type = type;
 
     /* Look up the B-tree header */
-    if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header")
 
     /* Safely grab pointer to reference counted shared B-tree info, so we can release the B-tree header if necessary */
@@ -1119,7 +1119,7 @@ H5B2_modify(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     depth = shared->depth;
 
     /* Release header */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)0, bt2, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)0, bt2, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header info")
     bt2 = NULL;
 
@@ -1130,12 +1130,12 @@ H5B2_modify(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     /* Walk down B-tree to find record or leaf node where record is located */
     cmp = -1;
     while(depth > 0 && cmp != 0) {
-        unsigned internal_flags = H5AC2__NO_FLAGS_SET;
+        unsigned internal_flags = H5AC__NO_FLAGS_SET;
         H5B2_internal_t *internal;          /* Pointer to internal node in B-tree */
         H5B2_node_ptr_t next_node_ptr;      /* Node pointer info for next node */
 
         /* Lock B-tree current node */
-        if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node_ptr.addr, curr_node_ptr.node_nrec, depth, H5AC2_WRITE)))
+        if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node_ptr.addr, curr_node_ptr.node_nrec, depth, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* Locate node pointer for child */
@@ -1148,7 +1148,7 @@ H5B2_modify(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
             next_node_ptr=internal->node_ptrs[idx];
 
             /* Unlock current node */
-            if (H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC2__NO_FLAGS_SET) < 0)
+            if (H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             /* Set pointer to next node to load */
@@ -1163,17 +1163,17 @@ H5B2_modify(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
                 HDassert(changed==FALSE);
 
                 /* Unlock current node */
-                if (H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC2__NO_FLAGS_SET) < 0)
+                if (H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTMODIFY, FAIL, "'modify' callback failed for B-tree find operation")
             } /* end if */
 
             /* Mark the node as dirty if it changed */
-            internal_flags |= changed ? H5AC2__DIRTIED_FLAG : 0;
+            internal_flags |= changed ? H5AC__DIRTIED_FLAG : 0;
 
             /* Unlock current node */
-            if (H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, curr_node_ptr.addr,(size_t)0, internal, internal_flags) < 0)
+            if (H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr,(size_t)0, internal, internal_flags) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             HGOTO_DONE(SUCCEED);
@@ -1184,7 +1184,7 @@ H5B2_modify(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
     } /* end while */
 
     {
-        unsigned leaf_flags = H5AC2__NO_FLAGS_SET;
+        unsigned leaf_flags = H5AC__NO_FLAGS_SET;
         H5B2_leaf_t *leaf;      /* Pointer to leaf node in B-tree */
         hbool_t changed = FALSE;/* Whether the 'modify' callback changed the record */
 
@@ -1193,7 +1193,7 @@ H5B2_modify(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
         cache_leaf_udata.bt2_shared = bt2_shared;
 
         /* Lock B-tree leaf node */
-        if (NULL == (leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr.addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+        if (NULL == (leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* Locate record */
@@ -1201,7 +1201,7 @@ H5B2_modify(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
 
         if(cmp != 0) {
             /* Unlock leaf node */
-            if (H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC2__NO_FLAGS_SET) < 0)
+            if (H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             /* Note: don't push error on stack, leave that to next higher level,
@@ -1221,7 +1221,7 @@ H5B2_modify(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
                 HDassert(changed==FALSE);
 
                 /* Unlock current node */
-                if (H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC2__NO_FLAGS_SET) < 0)
+                if (H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTMODIFY, FAIL, "'modify' callback failed for B-tree find operation")
@@ -1229,10 +1229,10 @@ H5B2_modify(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t addr,
         } /* end else */
 
         /* Mark the node as dirty if it changed */
-        leaf_flags |= (changed ? H5AC2__DIRTIED_FLAG : 0);
+        leaf_flags |= (changed ? H5AC__DIRTIED_FLAG : 0);
 
         /* Unlock current node */
-        if (H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, leaf_flags) < 0)
+        if (H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, leaf_flags) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
     }
 
@@ -1282,7 +1282,7 @@ H5B2_iterate_size(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t add
     cache_udata.type = type;
 
     /* Look up the B-tree header */
-    if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header")
 
     /* Safely grab pointer to reference counted shared B-tree info, so we can release the B-tree header if necessary */
@@ -1304,7 +1304,7 @@ H5B2_iterate_size(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr_t add
     depth = shared->depth;
 
     /* Release header */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)0, bt2, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)0, bt2, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header info")
     bt2 = NULL;
 
diff --git a/src/H5B2cache.c b/src/H5B2cache.c
index 85b0db7..aac486c 100644
--- a/src/H5B2cache.c
+++ b/src/H5B2cache.c
@@ -89,9 +89,9 @@ static herr_t H5B2_cache_leaf_free_icr(haddr_t addr, size_t len, void *thing);
 /* Package Variables */
 /*********************/
 
-/* H5B2 inherits cache-like properties from H5AC2 */
-const H5AC2_class_t H5AC2_BT2_HDR[1] = {{
-    H5AC2_BT2_HDR_ID,
+/* H5B2 inherits cache-like properties from H5AC */
+const H5AC_class_t H5AC_BT2_HDR[1] = {{
+    H5AC_BT2_HDR_ID,
     "v2 b-tree header",
     H5FD_MEM_BTREE,
     H5B2_cache_hdr_deserialize,
@@ -101,9 +101,9 @@ const H5AC2_class_t H5AC2_BT2_HDR[1] = {{
     NULL,
 }};
 
-/* H5B2 inherits cache-like properties from H5AC2 */
-const H5AC2_class_t H5AC2_BT2_INT[1] = {{
-    H5AC2_BT2_INT_ID,
+/* H5B2 inherits cache-like properties from H5AC */
+const H5AC_class_t H5AC_BT2_INT[1] = {{
+    H5AC_BT2_INT_ID,
     "v2 b-tree internal node",
     H5FD_MEM_BTREE,
     H5B2_cache_internal_deserialize,
@@ -113,9 +113,9 @@ const H5AC2_class_t H5AC2_BT2_INT[1] = {{
     NULL,
 }};
 
-/* H5B2 inherits cache-like properties from H5AC2 */
-const H5AC2_class_t H5AC2_BT2_LEAF[1] = {{
-    H5AC2_BT2_LEAF_ID,
+/* H5B2 inherits cache-like properties from H5AC */
+const H5AC_class_t H5AC_BT2_LEAF[1] = {{
+    H5AC_BT2_LEAF_ID,
     "v2 b-tree leaf node",
     H5FD_MEM_BTREE,
     H5B2_cache_leaf_deserialize,
@@ -175,7 +175,7 @@ H5B2_cache_hdr_deserialize(haddr_t UNUSED addr, size_t UNUSED len,
     /* Allocate space for the B-tree data structure */
     if(NULL == (bt2 = H5FL_MALLOC(H5B2_t)))
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    HDmemset(&bt2->cache_info, 0, sizeof(H5AC2_info_t));
+    HDmemset(&bt2->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Compute the size of the serialized B-tree header on disk */
     size = H5B2_HEADER_SIZE(udata->f);
@@ -398,7 +398,7 @@ H5B2_cache_internal_deserialize(haddr_t UNUSED addr, size_t UNUSED len,
     /* Allocate new internal node and reset cache info */
     if(NULL == (internal = H5FL_MALLOC(H5B2_internal_t)))
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    HDmemset(&internal->cache_info, 0, sizeof(H5AC2_info_t));
+    HDmemset(&internal->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Share common B-tree information */
     internal->shared = udata->bt2_shared;
@@ -646,7 +646,7 @@ H5B2_cache_leaf_deserialize(haddr_t UNUSED addr, size_t UNUSED len,
 
     if(NULL == (leaf = H5FL_MALLOC(H5B2_leaf_t)))
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    HDmemset(&leaf->cache_info, 0, sizeof(H5AC2_info_t));
+    HDmemset(&leaf->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Share common B-tree information */
     leaf->shared = udata->bt2_shared;
diff --git a/src/H5B2dbg.c b/src/H5B2dbg.c
index 121c463..72c92ba 100644
--- a/src/H5B2dbg.c
+++ b/src/H5B2dbg.c
@@ -115,7 +115,7 @@ H5B2_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     /*
      * Load the B-tree header.
      */
-    if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree header")
 
     /* Get the pointer to the shared B-tree info */
@@ -179,7 +179,7 @@ H5B2_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     } /* end for */
 
 done:
-    if(bt2 && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)0, bt2, H5AC2__NO_FLAGS_SET) < 0)
+    if(bt2 && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)0, bt2, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -231,7 +231,7 @@ H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     /*
      * Load the B-tree header.
      */
-    if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, hdr_addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree header")
 
     /* Get the pointer to the shared B-tree info */
@@ -241,11 +241,11 @@ H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     /*
      * Load the B-tree internal node
      */
-    if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2->shared, addr, nrec, depth, H5AC2_READ)))
+    if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2->shared, addr, nrec, depth, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree internal node")
 
     /* Release the B-tree header */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, hdr_addr, (size_t)0, bt2, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, (size_t)0, bt2, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree header")
     bt2 = NULL;
 
@@ -312,7 +312,7 @@ H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
               internal->node_ptrs[u].addr);
 
 done:
-    if(internal && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, addr, (size_t)0, internal, H5AC2__NO_FLAGS_SET) < 0)
+    if(internal && H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, addr, (size_t)0, internal, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree internal node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -364,7 +364,7 @@ H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     /*
      * Load the B-tree header.
      */
-    if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, hdr_addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree header")
 
     /* Get the pointer to the shared B-tree info */
@@ -374,11 +374,11 @@ H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     /*
      * Load the B-tree leaf node
      */
-    if(NULL == (leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_LEAF, addr, (size_t)shared->node_size, &cache_udata, H5AC2_READ)))
+    if(NULL == (leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_LEAF, addr, (size_t)shared->node_size, &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTLOAD, FAIL, "unable to load B-tree leaf node")
 
     /* Release the B-tree header */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, hdr_addr, (size_t)0, bt2, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, hdr_addr, (size_t)0, bt2, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree header")
     bt2 = NULL;
 
@@ -426,7 +426,7 @@ H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     } /* end for */
 
 done:
-    if(leaf && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_LEAF, addr, (size_t)0, leaf, H5AC2__NO_FLAGS_SET) < 0)
+    if(leaf && H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, addr, (size_t)0, leaf, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree leaf node")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5B2int.c b/src/H5B2int.c
index d991347..c9eb628 100644
--- a/src/H5B2int.c
+++ b/src/H5B2int.c
@@ -368,7 +368,7 @@ H5B2_split1(H5F_t *f, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *curr_node_
     unsigned *parent_cache_info_flags_ptr, H5B2_internal_t *internal,
     unsigned *internal_flags_ptr, unsigned idx)
 {
-    const H5AC2_class_t *child_class;    /* Pointer to child node's class info */
+    const H5AC_class_t *child_class;    /* Pointer to child node's class info */
     haddr_t left_addr, right_addr;      /* Addresses of left & right child nodes */
     void *left_child, *right_child;     /* Pointers to child nodes */
     unsigned *left_nrec, *right_nrec;   /* Pointers to child # of records */
@@ -407,14 +407,14 @@ H5B2_split1(H5F_t *f, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *curr_node_
 	    HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create new internal node")
 
         /* Setup information for unlocking child nodes */
-        child_class = H5AC2_BT2_INT;
+        child_class = H5AC_BT2_INT;
         left_addr = internal->node_ptrs[idx].addr;
         right_addr = internal->node_ptrs[idx + 1].addr;
 
         /* Protect both leafs */
-        if(NULL == (left_int = H5B2_protect_internal(f, dxpl_id, internal->shared, left_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC2_WRITE)))
+        if(NULL == (left_int = H5B2_protect_internal(f, dxpl_id, internal->shared, left_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
-        if(NULL == (right_int = H5B2_protect_internal(f, dxpl_id, internal->shared, right_addr, internal->node_ptrs[idx + 1].node_nrec, (depth - 1), H5AC2_WRITE)))
+        if(NULL == (right_int = H5B2_protect_internal(f, dxpl_id, internal->shared, right_addr, internal->node_ptrs[idx + 1].node_nrec, (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* More setup for child nodes */
@@ -436,7 +436,7 @@ H5B2_split1(H5F_t *f, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *curr_node_
 	    HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create new leaf node")
 
         /* Setup information for unlocking child nodes */
-        child_class = H5AC2_BT2_LEAF;
+        child_class = H5AC_BT2_LEAF;
         left_addr = internal->node_ptrs[idx].addr;
         right_addr = internal->node_ptrs[idx + 1].addr;
 
@@ -445,12 +445,12 @@ H5B2_split1(H5F_t *f, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *curr_node_
         cache_leaf_udata.bt2_shared = internal->shared;
 
         /* Protect both leafs */
-        if(NULL == (left_leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, child_class, left_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+        if(NULL == (left_leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, child_class, left_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         cache_leaf_udata.nrec = &(internal->node_ptrs[idx + 1].node_nrec);
 
-        if(NULL == (right_leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, child_class, right_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+        if(NULL == (right_leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, child_class, right_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         /* More setup for child nodes */
@@ -512,13 +512,13 @@ H5B2_split1(H5F_t *f, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *curr_node_
     internal->nrec++;
 
     /* Mark parent as dirty */
-    *internal_flags_ptr |= H5AC2__DIRTIED_FLAG;
+    *internal_flags_ptr |= H5AC__DIRTIED_FLAG;
 
     /* Update grandparent info */
     curr_node_ptr->node_nrec++;
 
     /* Mark grandparent as dirty */
-    *parent_cache_info_flags_ptr |= H5AC2__DIRTIED_FLAG;
+    *parent_cache_info_flags_ptr |= H5AC__DIRTIED_FLAG;
 
 #ifdef H5B2_DEBUG
     H5B2_assert_internal((hsize_t)0,shared,internal);
@@ -533,9 +533,9 @@ H5B2_split1(H5F_t *f, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *curr_node_
 #endif /* H5B2_DEBUG */
 
     /* Release child nodes (marked as dirty) */
-    if(H5AC2_unprotect(f, dxpl_id, child_class, left_addr, (size_t)0, left_child, H5AC2__DIRTIED_FLAG) < 0)
+    if(H5AC_unprotect(f, dxpl_id, child_class, left_addr, (size_t)0, left_child, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree leaf node")
-    if(H5AC2_unprotect(f, dxpl_id, child_class, right_addr, (size_t)0, right_child, H5AC2__DIRTIED_FLAG) < 0)
+    if(H5AC_unprotect(f, dxpl_id, child_class, right_addr, (size_t)0, right_child, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree leaf node")
 
 done:
@@ -563,7 +563,7 @@ H5B2_split_root(H5F_t *f, hid_t dxpl_id, H5B2_t *bt2, unsigned *bt2_flags_ptr)
 {
     H5B2_internal_t *new_root;          /* Pointer to new root node */
     H5B2_shared_t *shared;              /* Pointer to B-tree's shared information */
-    unsigned new_root_flags = H5AC2__NO_FLAGS_SET;   /* Cache flags for new root node */
+    unsigned new_root_flags = H5AC__NO_FLAGS_SET;   /* Cache flags for new root node */
     H5B2_node_ptr_t old_root_ptr;       /* Old node pointer to root node in B-tree */
     size_t sz_max_nrec;                 /* Temporary variable for range checking */
     unsigned u_max_nrec_size;           /* Temporary variable for range checking */
@@ -609,7 +609,7 @@ H5B2_split_root(H5F_t *f, hid_t dxpl_id, H5B2_t *bt2, unsigned *bt2_flags_ptr)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "unable to create new internal node")
 
     /* Protect new root node */
-    if(NULL == (new_root = H5B2_protect_internal(f, dxpl_id, bt2->shared, bt2->root.addr, bt2->root.node_nrec, shared->depth, H5AC2_WRITE)))
+    if(NULL == (new_root = H5B2_protect_internal(f, dxpl_id, bt2->shared, bt2->root.addr, bt2->root.node_nrec, shared->depth, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
     /* Set first node pointer in root node to old root node pointer info */
@@ -620,7 +620,7 @@ H5B2_split_root(H5F_t *f, hid_t dxpl_id, H5B2_t *bt2, unsigned *bt2_flags_ptr)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTSPLIT, FAIL, "unable to split old root node")
 
     /* Release new root node (marked as dirty) */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, bt2->root.addr, (size_t)0, new_root, new_root_flags) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, bt2->root.addr, (size_t)0, new_root, new_root_flags) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree internal node")
 
 done:
@@ -646,7 +646,7 @@ done:
 static herr_t
 H5B2_redistribute2(H5F_t *f, hid_t dxpl_id, unsigned depth, H5B2_internal_t *internal, unsigned idx)
 {
-    const H5AC2_class_t *child_class;    /* Pointer to child node's class info */
+    const H5AC_class_t *child_class;    /* Pointer to child node's class info */
     haddr_t left_addr, right_addr;      /* Addresses of left & right child nodes */
     void *left_child, *right_child;     /* Pointers to child nodes */
     unsigned *left_nrec, *right_nrec;   /* Pointers to child # of records */
@@ -672,14 +672,14 @@ H5B2_redistribute2(H5F_t *f, hid_t dxpl_id, unsigned depth, H5B2_internal_t *int
         H5B2_internal_t *right_internal;        /* Pointer to right internal node */
 
         /* Setup information for unlocking child nodes */
-        child_class = H5AC2_BT2_INT;
+        child_class = H5AC_BT2_INT;
         left_addr = internal->node_ptrs[idx].addr;
         right_addr = internal->node_ptrs[idx+1].addr;
 
         /* Lock left & right B-tree child nodes */
-        if (NULL == (left_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, left_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC2_WRITE)))
+        if (NULL == (left_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, left_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
-        if (NULL == (right_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, right_addr, internal->node_ptrs[idx+1].node_nrec, (depth - 1), H5AC2_WRITE)))
+        if (NULL == (right_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, right_addr, internal->node_ptrs[idx+1].node_nrec, (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         /* More setup for child nodes */
@@ -697,7 +697,7 @@ H5B2_redistribute2(H5F_t *f, hid_t dxpl_id, unsigned depth, H5B2_internal_t *int
         H5B2_leaf_t *right_leaf;        /* Pointer to right leaf node */
 
         /* Setup information for unlocking child nodes */
-        child_class = H5AC2_BT2_LEAF;
+        child_class = H5AC_BT2_LEAF;
         left_addr = internal->node_ptrs[idx].addr;
         right_addr = internal->node_ptrs[idx+1].addr;
 
@@ -706,12 +706,12 @@ H5B2_redistribute2(H5F_t *f, hid_t dxpl_id, unsigned depth, H5B2_internal_t *int
         cache_leaf_udata.bt2_shared = internal->shared;
 
         /* Lock left & right B-tree child nodes */
-        if (NULL == (left_leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, child_class, left_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+        if (NULL == (left_leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, child_class, left_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         cache_leaf_udata.nrec = &(internal->node_ptrs[idx + 1].node_nrec);
 
-        if (NULL == (right_leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, child_class, right_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+        if (NULL == (right_leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, child_class, right_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         /* More setup for child nodes */
@@ -848,9 +848,9 @@ H5B2_redistribute2(H5F_t *f, hid_t dxpl_id, unsigned depth, H5B2_internal_t *int
 #endif /* H5B2_DEBUG */
 
     /* Release child nodes (marked as dirty) */
-    if (H5AC2_unprotect(f, dxpl_id, child_class, left_addr, (size_t)0, left_child, H5AC2__DIRTIED_FLAG) < 0)
+    if (H5AC_unprotect(f, dxpl_id, child_class, left_addr, (size_t)0, left_child, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
-    if (H5AC2_unprotect(f, dxpl_id, child_class, right_addr, (size_t)0, right_child, H5AC2__DIRTIED_FLAG) < 0)
+    if (H5AC_unprotect(f, dxpl_id, child_class, right_addr, (size_t)0, right_child, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
 
 done:
@@ -877,7 +877,7 @@ static herr_t
 H5B2_redistribute3(H5F_t *f, hid_t dxpl_id, unsigned depth,
     H5B2_internal_t *internal, unsigned *internal_flags_ptr, unsigned idx)
 {
-    const H5AC2_class_t *child_class;    /* Pointer to child node's class info */
+    const H5AC_class_t *child_class;    /* Pointer to child node's class info */
     haddr_t left_addr, right_addr;      /* Addresses of left & right child nodes */
     haddr_t middle_addr;                /* Address of middle child node */
     void *left_child, *right_child;     /* Pointers to child nodes */
@@ -911,17 +911,17 @@ H5B2_redistribute3(H5F_t *f, hid_t dxpl_id, unsigned depth,
         H5B2_internal_t *right_internal;        /* Pointer to right internal node */
 
         /* Setup information for unlocking child nodes */
-        child_class = H5AC2_BT2_INT;
+        child_class = H5AC_BT2_INT;
         left_addr = internal->node_ptrs[idx-1].addr;
         middle_addr = internal->node_ptrs[idx].addr;
         right_addr = internal->node_ptrs[idx+1].addr;
 
         /* Lock B-tree child nodes */
-        if (NULL == (left_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, left_addr, internal->node_ptrs[idx-1].node_nrec, (depth - 1), H5AC2_WRITE)))
+        if (NULL == (left_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, left_addr, internal->node_ptrs[idx-1].node_nrec, (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
-        if (NULL == (middle_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, middle_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC2_WRITE)))
+        if (NULL == (middle_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, middle_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
-        if (NULL == (right_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, right_addr, internal->node_ptrs[idx+1].node_nrec, (depth - 1), H5AC2_WRITE)))
+        if (NULL == (right_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, right_addr, internal->node_ptrs[idx+1].node_nrec, (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* More setup for child nodes */
@@ -944,7 +944,7 @@ H5B2_redistribute3(H5F_t *f, hid_t dxpl_id, unsigned depth,
         H5B2_leaf_t *right_leaf;        /* Pointer to right leaf node */
 
         /* Setup information for unlocking child nodes */
-        child_class = H5AC2_BT2_LEAF;
+        child_class = H5AC_BT2_LEAF;
         left_addr = internal->node_ptrs[idx-1].addr;
         middle_addr = internal->node_ptrs[idx].addr;
         right_addr = internal->node_ptrs[idx+1].addr;
@@ -954,17 +954,17 @@ H5B2_redistribute3(H5F_t *f, hid_t dxpl_id, unsigned depth,
         cache_leaf_udata.bt2_shared = internal->shared;
 
         /* Lock B-tree child nodes */
-        if (NULL == (left_leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, child_class, left_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+        if (NULL == (left_leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, child_class, left_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         cache_leaf_udata.nrec = &(internal->node_ptrs[idx].node_nrec);
 
-        if (NULL == (middle_leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, child_class, middle_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+        if (NULL == (middle_leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, child_class, middle_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         cache_leaf_udata.nrec = &(internal->node_ptrs[idx+1].node_nrec);
 
-        if (NULL == (right_leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, child_class, right_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+        if (NULL == (right_leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, child_class, right_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         /* More setup for child nodes */
@@ -1173,7 +1173,7 @@ H5B2_redistribute3(H5F_t *f, hid_t dxpl_id, unsigned depth,
     } /* end else */
 
     /* Mark parent as dirty */
-    *internal_flags_ptr |= H5AC2__DIRTIED_FLAG;
+    *internal_flags_ptr |= H5AC__DIRTIED_FLAG;
 
 #ifdef QAK
 {
@@ -1231,11 +1231,11 @@ H5B2_redistribute3(H5F_t *f, hid_t dxpl_id, unsigned depth,
 #endif /* H5B2_DEBUG */
 
     /* Unlock child nodes (marked as dirty) */
-    if (H5AC2_unprotect(f, dxpl_id, child_class, left_addr, (size_t)0, left_child, H5AC2__DIRTIED_FLAG) < 0)
+    if (H5AC_unprotect(f, dxpl_id, child_class, left_addr, (size_t)0, left_child, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
-    if (H5AC2_unprotect(f, dxpl_id, child_class, middle_addr, (size_t)0, middle_child, H5AC2__DIRTIED_FLAG) < 0)
+    if (H5AC_unprotect(f, dxpl_id, child_class, middle_addr, (size_t)0, middle_child, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
-    if (H5AC2_unprotect(f, dxpl_id, child_class, right_addr, (size_t)0, right_child, H5AC2__DIRTIED_FLAG) < 0)
+    if (H5AC_unprotect(f, dxpl_id, child_class, right_addr, (size_t)0, right_child, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
 
 done:
@@ -1263,7 +1263,7 @@ H5B2_merge2(H5F_t *f, hid_t dxpl_id, unsigned depth,
     H5B2_node_ptr_t *curr_node_ptr, unsigned *parent_cache_info_flags_ptr,
     H5B2_internal_t *internal, unsigned *internal_flags_ptr, unsigned idx)
 {
-    const H5AC2_class_t *child_class;    /* Pointer to child node's class info */
+    const H5AC_class_t *child_class;    /* Pointer to child node's class info */
     haddr_t left_addr, right_addr;      /* Addresses of left & right child nodes */
     void *left_child, *right_child;     /* Pointers to left & right child nodes */
     unsigned *left_nrec, *right_nrec;   /* Pointers to left & right child # of records */
@@ -1291,14 +1291,14 @@ H5B2_merge2(H5F_t *f, hid_t dxpl_id, unsigned depth,
         H5B2_internal_t *right_internal;        /* Pointer to right internal node */
 
         /* Setup information for unlocking child nodes */
-        child_class = H5AC2_BT2_INT;
+        child_class = H5AC_BT2_INT;
         left_addr = internal->node_ptrs[idx].addr;
         right_addr = internal->node_ptrs[idx+1].addr;
 
         /* Lock left & right B-tree child nodes */
-        if(NULL == (left_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, left_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC2_WRITE)))
+        if(NULL == (left_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, left_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
-        if(NULL == (right_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, right_addr, internal->node_ptrs[idx+1].node_nrec, (depth - 1), H5AC2_WRITE)))
+        if(NULL == (right_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, right_addr, internal->node_ptrs[idx+1].node_nrec, (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* More setup for accessing child node information */
@@ -1316,7 +1316,7 @@ H5B2_merge2(H5F_t *f, hid_t dxpl_id, unsigned depth,
         H5B2_leaf_t *right_leaf;        /* Pointer to right leaf node */
 
         /* Setup information for unlocking child nodes */
-        child_class = H5AC2_BT2_LEAF;
+        child_class = H5AC_BT2_LEAF;
         left_addr = internal->node_ptrs[idx].addr;
         right_addr = internal->node_ptrs[idx+1].addr;
 
@@ -1325,12 +1325,12 @@ H5B2_merge2(H5F_t *f, hid_t dxpl_id, unsigned depth,
         cache_leaf_udata.bt2_shared = internal->shared;
 
         /* Lock left & right B-tree child nodes */
-        if(NULL == (left_leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, child_class, left_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+        if(NULL == (left_leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, child_class, left_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         cache_leaf_udata.nrec = &(internal->node_ptrs[idx+1].node_nrec);
 
-        if(NULL == (right_leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, child_class, right_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+        if(NULL == (right_leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, child_class, right_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         /* More setup for accessing child node information */
@@ -1374,13 +1374,13 @@ H5B2_merge2(H5F_t *f, hid_t dxpl_id, unsigned depth,
     internal->nrec--;
 
     /* Mark parent as dirty */
-    *internal_flags_ptr |= H5AC2__DIRTIED_FLAG;
+    *internal_flags_ptr |= H5AC__DIRTIED_FLAG;
 
     /* Update grandparent info */
     curr_node_ptr->node_nrec--;
 
     /* Mark grandparent as dirty */
-    *parent_cache_info_flags_ptr |= H5AC2__DIRTIED_FLAG;
+    *parent_cache_info_flags_ptr |= H5AC__DIRTIED_FLAG;
 
 #ifdef H5B2_DEBUG
     H5B2_assert_internal((hsize_t)0,shared,internal);
@@ -1391,13 +1391,13 @@ H5B2_merge2(H5F_t *f, hid_t dxpl_id, unsigned depth,
 #endif /* H5B2_DEBUG */
 
     /* Unlock left node (marked as dirty) */
-    if(H5AC2_unprotect(f, dxpl_id, child_class, left_addr, (size_t)0, left_child, H5AC2__DIRTIED_FLAG) < 0)
+    if(H5AC_unprotect(f, dxpl_id, child_class, left_addr, (size_t)0, left_child, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
 
     /* Delete right node & remove from cache (marked as dirty) */
     if(H5MF_xfree(f, H5FD_MEM_BTREE, dxpl_id, right_addr, (hsize_t)shared->node_size) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to free B-tree leaf node")
-    if(H5AC2_unprotect(f, dxpl_id, child_class, right_addr, (size_t)0, right_child, H5AC2__DIRTIED_FLAG|H5AC2__DELETED_FLAG) < 0)
+    if(H5AC_unprotect(f, dxpl_id, child_class, right_addr, (size_t)0, right_child, H5AC__DIRTIED_FLAG|H5AC__DELETED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
 
 done:
@@ -1425,7 +1425,7 @@ H5B2_merge3(H5F_t *f, hid_t dxpl_id, unsigned depth,
     H5B2_node_ptr_t *curr_node_ptr, unsigned *parent_cache_info_flags_ptr,
     H5B2_internal_t *internal, unsigned *internal_flags_ptr, unsigned idx)
 {
-    const H5AC2_class_t *child_class;    /* Pointer to child node's class info */
+    const H5AC_class_t *child_class;    /* Pointer to child node's class info */
     haddr_t left_addr, right_addr;      /* Addresses of left & right child nodes */
     haddr_t middle_addr;                /* Address of middle child node */
     void *left_child, *right_child;     /* Pointers to left & right child nodes */
@@ -1460,17 +1460,17 @@ H5B2_merge3(H5F_t *f, hid_t dxpl_id, unsigned depth,
         H5B2_internal_t *right_internal;        /* Pointer to right internal node */
 
         /* Setup information for unlocking child nodes */
-        child_class = H5AC2_BT2_INT;
+        child_class = H5AC_BT2_INT;
         left_addr = internal->node_ptrs[idx-1].addr;
         middle_addr = internal->node_ptrs[idx].addr;
         right_addr = internal->node_ptrs[idx+1].addr;
 
         /* Lock B-tree child nodes */
-        if (NULL == (left_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, left_addr, internal->node_ptrs[idx-1].node_nrec, (depth - 1), H5AC2_WRITE)))
+        if (NULL == (left_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, left_addr, internal->node_ptrs[idx-1].node_nrec, (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
-        if (NULL == (middle_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, middle_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC2_WRITE)))
+        if (NULL == (middle_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, middle_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
-        if (NULL == (right_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, right_addr, internal->node_ptrs[idx+1].node_nrec, (depth - 1), H5AC2_WRITE)))
+        if (NULL == (right_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, right_addr, internal->node_ptrs[idx+1].node_nrec, (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* More setup for accessing child node information */
@@ -1493,7 +1493,7 @@ H5B2_merge3(H5F_t *f, hid_t dxpl_id, unsigned depth,
         H5B2_leaf_t *right_leaf;        /* Pointer to right leaf node */
 
         /* Setup information for unlocking child nodes */
-        child_class = H5AC2_BT2_LEAF;
+        child_class = H5AC_BT2_LEAF;
         left_addr = internal->node_ptrs[idx-1].addr;
         middle_addr = internal->node_ptrs[idx].addr;
         right_addr = internal->node_ptrs[idx+1].addr;
@@ -1503,17 +1503,17 @@ H5B2_merge3(H5F_t *f, hid_t dxpl_id, unsigned depth,
         cache_leaf_udata.bt2_shared = internal->shared;
 
         /* Lock B-tree child nodes */
-        if (NULL == (left_leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, child_class, left_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+        if (NULL == (left_leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, child_class, left_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         cache_leaf_udata.nrec = &(internal->node_ptrs[idx].node_nrec);
 
-        if (NULL == (middle_leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, child_class, middle_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+        if (NULL == (middle_leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, child_class, middle_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         cache_leaf_udata.nrec = &(internal->node_ptrs[idx+1].node_nrec);
 
-        if (NULL == (right_leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, child_class, right_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+        if (NULL == (right_leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, child_class, right_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         /* More setup for accessing child node information */
@@ -1603,13 +1603,13 @@ H5B2_merge3(H5F_t *f, hid_t dxpl_id, unsigned depth,
     internal->nrec--;
 
     /* Mark parent as dirty */
-    *internal_flags_ptr |= H5AC2__DIRTIED_FLAG;
+    *internal_flags_ptr |= H5AC__DIRTIED_FLAG;
 
     /* Update grandparent info */
     curr_node_ptr->node_nrec--;
 
     /* Mark grandparent as dirty */
-    *parent_cache_info_flags_ptr |= H5AC2__DIRTIED_FLAG;
+    *parent_cache_info_flags_ptr |= H5AC__DIRTIED_FLAG;
 
 #ifdef H5B2_DEBUG
     H5B2_assert_internal((hsize_t)0,shared,internal);
@@ -1624,15 +1624,15 @@ H5B2_merge3(H5F_t *f, hid_t dxpl_id, unsigned depth,
 #endif /* H5B2_DEBUG */
 
     /* Unlock left & middle nodes (marked as dirty) */
-    if (H5AC2_unprotect(f, dxpl_id, child_class, left_addr, (size_t)0, left_child, H5AC2__DIRTIED_FLAG) < 0)
+    if (H5AC_unprotect(f, dxpl_id, child_class, left_addr, (size_t)0, left_child, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
-    if (H5AC2_unprotect(f, dxpl_id, child_class, middle_addr, (size_t)0, middle_child, H5AC2__DIRTIED_FLAG) < 0)
+    if (H5AC_unprotect(f, dxpl_id, child_class, middle_addr, (size_t)0, middle_child, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
 
     /* Delete right node & remove from cache (marked as dirty) */
     if (H5MF_xfree(f, H5FD_MEM_BTREE, dxpl_id, right_addr, (hsize_t)shared->node_size) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to free B-tree leaf node")
-    if (H5AC2_unprotect(f, dxpl_id, child_class, right_addr, (size_t)0, right_child, H5AC2__DIRTIED_FLAG|H5AC2__DELETED_FLAG) < 0)
+    if (H5AC_unprotect(f, dxpl_id, child_class, right_addr, (size_t)0, right_child, H5AC__DIRTIED_FLAG|H5AC__DELETED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
 
 done:
@@ -1660,7 +1660,7 @@ H5B2_swap_leaf(H5F_t *f, hid_t dxpl_id, unsigned depth,
     H5B2_internal_t *internal, unsigned *internal_flags_ptr,
     unsigned idx, void *swap_loc)
 {
-    const H5AC2_class_t *child_class;    /* Pointer to child node's class info */
+    const H5AC_class_t *child_class;    /* Pointer to child node's class info */
     haddr_t child_addr;                 /* Address of child node */
     void *child;                        /* Pointer to child node */
     uint8_t *child_native;              /* Pointer to child's native records */
@@ -1684,11 +1684,11 @@ H5B2_swap_leaf(H5F_t *f, hid_t dxpl_id, unsigned depth,
         H5B2_internal_t *child_internal;        /* Pointer to internal node */
 
         /* Setup information for unlocking child node */
-        child_class = H5AC2_BT2_INT;
+        child_class = H5AC_BT2_INT;
         child_addr = internal->node_ptrs[idx].addr;
 
         /* Lock B-tree child nodes */
-        if(NULL == (child_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, child_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC2_WRITE)))
+        if(NULL == (child_internal = H5B2_protect_internal(f, dxpl_id, internal->shared, child_addr, internal->node_ptrs[idx].node_nrec, (depth - 1), H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* More setup for accessing child node information */
@@ -1699,7 +1699,7 @@ H5B2_swap_leaf(H5F_t *f, hid_t dxpl_id, unsigned depth,
         H5B2_leaf_t *child_leaf;        /* Pointer to leaf node */
 
         /* Setup information for unlocking child nodes */
-        child_class = H5AC2_BT2_LEAF;
+        child_class = H5AC_BT2_LEAF;
         child_addr = internal->node_ptrs[idx].addr;
 
         cache_leaf_udata.f = f;
@@ -1707,7 +1707,7 @@ H5B2_swap_leaf(H5F_t *f, hid_t dxpl_id, unsigned depth,
         cache_leaf_udata.bt2_shared = internal->shared;
 
         /* Lock B-tree child node */
-        if (NULL == (child_leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, child_class, child_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+        if (NULL == (child_leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, child_class, child_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         /* More setup for accessing child node information */
@@ -1721,7 +1721,7 @@ H5B2_swap_leaf(H5F_t *f, hid_t dxpl_id, unsigned depth,
     HDmemcpy(swap_loc, shared->page, shared->type->nrec_size);
 
     /* Mark parent as dirty */
-    *internal_flags_ptr |= H5AC2__DIRTIED_FLAG;
+    *internal_flags_ptr |= H5AC__DIRTIED_FLAG;
 
 #ifdef H5B2_DEBUG
     H5B2_assert_internal((hsize_t)0,shared,internal);
@@ -1732,7 +1732,7 @@ H5B2_swap_leaf(H5F_t *f, hid_t dxpl_id, unsigned depth,
 #endif /* H5B2_DEBUG */
 
     /* Unlock child node */
-    if (H5AC2_unprotect(f, dxpl_id, child_class, child_addr, (size_t)0, child, H5AC2__DIRTIED_FLAG) < 0)
+    if (H5AC_unprotect(f, dxpl_id, child_class, child_addr, (size_t)0, child, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree child node")
 
 done:
@@ -1781,7 +1781,7 @@ H5B2_insert_leaf(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
     HDassert(shared);
 
     /* Lock current B-tree node */
-    if (NULL == (leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr->addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+    if (NULL == (leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr->addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
     /* Must have a leaf node with enough space to insert a record now */
@@ -1819,7 +1819,7 @@ H5B2_insert_leaf(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
 
 done:
     /* Release the B-tree leaf node (marked as dirty) */
-    if(leaf && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr->addr, (size_t)0, leaf, H5AC2__DIRTIED_FLAG) < 0)
+    if(leaf && H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr->addr, (size_t)0, leaf, H5AC__DIRTIED_FLAG) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release leaf B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1845,7 +1845,7 @@ H5B2_insert_internal(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
     H5B2_node_ptr_t *curr_node_ptr, void *udata)
 {
     H5B2_internal_t *internal;          /* Pointer to internal node */
-    unsigned internal_flags = H5AC2__NO_FLAGS_SET;
+    unsigned internal_flags = H5AC__NO_FLAGS_SET;
     H5B2_shared_t *shared;              /* Pointer to B-tree's shared information */
     unsigned    idx;                    /* Location of record which matches key */
     herr_t	ret_value = SUCCEED;
@@ -1861,7 +1861,7 @@ H5B2_insert_internal(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
     HDassert(H5F_addr_defined(curr_node_ptr->addr));
 
     /* Lock current B-tree node */
-    if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node_ptr->addr, curr_node_ptr->node_nrec, depth, H5AC2_WRITE)))
+    if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node_ptr->addr, curr_node_ptr->node_nrec, depth, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
     /* Get the pointer to the shared B-tree info */
@@ -1955,11 +1955,11 @@ H5B2_insert_internal(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
     curr_node_ptr->all_nrec++;
 
     /* Mark node as dirty */
-    internal_flags |= H5AC2__DIRTIED_FLAG;
+    internal_flags |= H5AC__DIRTIED_FLAG;
 
 done:
     /* Release the B-tree internal node */
-    if (internal && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, curr_node_ptr->addr, (size_t)0, internal, internal_flags) < 0)
+    if (internal && H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, curr_node_ptr->addr, (size_t)0, internal, internal_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release internal B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1999,7 +1999,7 @@ H5B2_create_leaf(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, H5B2_node_ptr_t *n
 	HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree leaf info")
 
     /* Set metadata cache info */
-    HDmemset(&leaf->cache_info, 0, sizeof(H5AC2_info_t));
+    HDmemset(&leaf->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Share common B-tree information */
     leaf->shared = bt2_shared;
@@ -2024,7 +2024,7 @@ HDmemset(leaf->leaf_native, 0, shared->type->nrec_size * shared->node_info[0].ma
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for B-tree leaf node")
 
     /* Cache the new B-tree node */
-    if(H5AC2_set(f, dxpl_id, H5AC2_BT2_LEAF, node_ptr->addr, (size_t)shared->node_size, leaf, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(f, dxpl_id, H5AC_BT2_LEAF, node_ptr->addr, (size_t)shared->node_size, leaf, H5AC__NO_FLAGS_SET) < 0)
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "can't add B-tree leaf to cache")
 
 done:
@@ -2072,7 +2072,7 @@ H5B2_create_internal(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree internal info")
 
     /* Set metadata cache info */
-    HDmemset(&internal->cache_info, 0, sizeof(H5AC2_info_t));
+    HDmemset(&internal->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Share common B-tree information */
     internal->shared = bt2_shared;
@@ -2105,7 +2105,7 @@ HDmemset(internal->node_ptrs, 0, sizeof(H5B2_node_ptr_t) * (shared->node_info[de
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for B-tree internal node")
 
     /* Cache the new B-tree node */
-    if(H5AC2_set(f, dxpl_id, H5AC2_BT2_INT, node_ptr->addr, (size_t)shared->node_size, internal, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(f, dxpl_id, H5AC_BT2_INT, node_ptr->addr, (size_t)shared->node_size, internal, H5AC__NO_FLAGS_SET) < 0)
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "can't add B-tree internal node to cache")
 
 done:
@@ -2133,7 +2133,7 @@ done:
  */
 H5B2_internal_t *
 H5B2_protect_internal(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, haddr_t addr,
-    unsigned nrec, unsigned depth, H5AC2_protect_t rw)
+    unsigned nrec, unsigned depth, H5AC_protect_t rw)
 {
     H5B2_internal_cache_ud_t udata;          /* User data to pass through to cache 'deserialize' callback */
     H5B2_shared_t *shared;              /* B-tree's shared info */
@@ -2158,7 +2158,7 @@ H5B2_protect_internal(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, haddr_t addr,
     HDassert(shared);
 
     /* Protect the internal node */
-    if(NULL == (ret_value = (H5B2_internal_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_INT, addr, (size_t)shared->node_size, &udata, rw)))
+    if(NULL == (ret_value = (H5B2_internal_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_INT, addr, (size_t)shared->node_size, &udata, rw)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, NULL, "unable to load B-tree internal node")
 
 done:
@@ -2188,7 +2188,7 @@ H5B2_iterate_node(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, unsigned depth,
     const H5B2_node_ptr_t *curr_node, H5B2_operator_t op, void *op_data)
 {
     H5B2_shared_t *shared;              /* Pointer to B-tree's shared information */
-    const H5AC2_class_t *curr_node_class = NULL; /* Pointer to current node's class info */
+    const H5AC_class_t *curr_node_class = NULL; /* Pointer to current node's class info */
     void *node = NULL;                  /* Pointers to current node */
     uint8_t *node_native;               /* Pointers to node's native records */
     uint8_t *native = NULL;             /* Pointers to copy of node's native records */
@@ -2214,11 +2214,11 @@ H5B2_iterate_node(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, unsigned depth,
         H5B2_internal_t *internal;     /* Pointer to internal node */
 
         /* Lock the current B-tree node */
-        if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node->addr, curr_node->node_nrec, depth, H5AC2_READ)))
+        if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node->addr, curr_node->node_nrec, depth, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* Set up information about current node */
-        curr_node_class = H5AC2_BT2_INT;
+        curr_node_class = H5AC_BT2_INT;
         node = internal;
         node_native = internal->int_native;
 
@@ -2237,11 +2237,11 @@ H5B2_iterate_node(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, unsigned depth,
         cache_leaf_udata.bt2_shared = bt2_shared;
 
         /* Lock the current B-tree node */
-        if (NULL == (leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node->addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_READ)))
+        if (NULL == (leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_LEAF, curr_node->addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         /* Set up information about current node */
-        curr_node_class = H5AC2_BT2_LEAF;
+        curr_node_class = H5AC_BT2_LEAF;
         node = leaf;
         node_native = leaf->leaf_native;
     } /* end else */
@@ -2254,7 +2254,7 @@ H5B2_iterate_node(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, unsigned depth,
     HDmemcpy(native, node_native, (shared->type->nrec_size * curr_node->node_nrec));
 
     /* Unlock the node */
-    if(H5AC2_unprotect(f, dxpl_id, curr_node_class, curr_node->addr, (size_t)0, node, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_unprotect(f, dxpl_id, curr_node_class, curr_node->addr, (size_t)0, node, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
     node = NULL;
 
@@ -2310,7 +2310,7 @@ H5B2_remove_leaf(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
 {
     H5B2_leaf_t *leaf;                  /* Pointer to leaf node */
     haddr_t     leaf_addr = HADDR_UNDEF;  /* Leaf address on disk */
-    unsigned    leaf_flags = H5AC2__NO_FLAGS_SET; /* Flags for unprotecting leaf node */
+    unsigned    leaf_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting leaf node */
     H5B2_shared_t *shared;              /* Pointer to B-tree's shared information */
     unsigned    idx;                    /* Location of record which matches key */
     H5B2_leaf_cache_ud_t cache_leaf_udata; /* User-data for callback */
@@ -2334,7 +2334,7 @@ H5B2_remove_leaf(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
 
     /* Lock current B-tree node */
     leaf_addr = curr_node_ptr->addr;
-    if(NULL == (leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_LEAF, leaf_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+    if(NULL == (leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_LEAF, leaf_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
     /* Sanity check number of records */
@@ -2354,7 +2354,7 @@ H5B2_remove_leaf(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
     leaf->nrec--;
 
     /* Mark leaf node as dirty also */
-    leaf_flags |= H5AC2__DIRTIED_FLAG;
+    leaf_flags |= H5AC__DIRTIED_FLAG;
 
     if(leaf->nrec > 0) {
         /* Pack record out of leaf */
@@ -2367,7 +2367,7 @@ H5B2_remove_leaf(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
             HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to free B-tree leaf node")
 
         /* Let the cache know that the object is deleted */
-        leaf_flags |= H5AC2__DELETED_FLAG;
+        leaf_flags |= H5AC__DELETED_FLAG;
 
         /* Reset address of parent node pointer */
         curr_node_ptr->addr = HADDR_UNDEF;
@@ -2378,7 +2378,7 @@ H5B2_remove_leaf(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
 
 done:
     /* Release the B-tree leaf node */
-    if(leaf && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_LEAF, leaf_addr, (size_t)0, leaf, leaf_flags) < 0)
+    if(leaf && H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, leaf_addr, (size_t)0, leaf, leaf_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release leaf B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2401,15 +2401,15 @@ done:
 herr_t
 H5B2_remove_internal(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
     hbool_t *depth_decreased, void *swap_loc, unsigned depth,
-    H5AC2_info_t *parent_cache_info, unsigned *parent_cache_info_flags_ptr,
+    H5AC_info_t *parent_cache_info, unsigned *parent_cache_info_flags_ptr,
     H5B2_node_ptr_t *curr_node_ptr, void *udata, H5B2_remove_t op,
     void *op_data)
 {
-    H5AC2_info_t *new_cache_info;        /* Pointer to new cache info */
+    H5AC_info_t *new_cache_info;        /* Pointer to new cache info */
     unsigned *new_cache_info_flags_ptr = NULL;
     H5B2_node_ptr_t *new_node_ptr;      /* Pointer to new node pointer */
     H5B2_internal_t *internal;          /* Pointer to internal node */
-    unsigned internal_flags = H5AC2__NO_FLAGS_SET;
+    unsigned internal_flags = H5AC__NO_FLAGS_SET;
     haddr_t internal_addr;              /* Address of internal node */
     H5B2_shared_t *shared;              /* Pointer to B-tree's shared information */
     size_t      merge_nrec;             /* Number of records to merge node at */
@@ -2429,7 +2429,7 @@ H5B2_remove_internal(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
 
     /* Lock current B-tree node */
     internal_addr = curr_node_ptr->addr;
-    if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, internal_addr, curr_node_ptr->node_nrec, depth, H5AC2_WRITE)))
+    if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, internal_addr, curr_node_ptr->node_nrec, depth, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
     /* Get the pointer to the shared B-tree info */
@@ -2454,7 +2454,7 @@ H5B2_remove_internal(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
             HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to free B-tree leaf node")
 
         /* Let the cache know that the object is deleted */
-        internal_flags |= H5AC2__DELETED_FLAG;
+        internal_flags |= H5AC__DELETED_FLAG;
 
         /* Reset information in header's root node pointer */
         curr_node_ptr->addr = internal->node_ptrs[0].addr;
@@ -2583,7 +2583,7 @@ H5B2_remove_internal(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
         new_node_ptr->all_nrec--;
 
     /* Mark node as dirty */
-    internal_flags |= H5AC2__DIRTIED_FLAG;
+    internal_flags |= H5AC__DIRTIED_FLAG;
 
 #ifdef H5B2_DEBUG
     H5B2_assert_internal((!collapsed_root ? (curr_node_ptr->all_nrec-1) : new_node_ptr->all_nrec),shared,internal);
@@ -2591,7 +2591,7 @@ H5B2_remove_internal(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
 
 done:
     /* Release the B-tree internal node */
-    if(internal && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, internal_addr, (size_t)0, internal, internal_flags) < 0)
+    if(internal && H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, internal_addr, (size_t)0, internal, internal_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release internal B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2619,7 +2619,7 @@ H5B2_remove_leaf_by_idx(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
 {
     H5B2_leaf_t *leaf;                  /* Pointer to leaf node */
     haddr_t     leaf_addr = HADDR_UNDEF;  /* Leaf address on disk */
-    unsigned    leaf_flags = H5AC2__NO_FLAGS_SET; /* Flags for unprotecting leaf node */
+    unsigned    leaf_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting leaf node */
     H5B2_shared_t *shared;              /* Pointer to B-tree's shared information */
     H5B2_leaf_cache_ud_t cache_leaf_udata; /* User-data for callback */
     herr_t	ret_value = SUCCEED;
@@ -2642,7 +2642,7 @@ H5B2_remove_leaf_by_idx(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
 
     /* Lock B-tree leaf node */
     leaf_addr = curr_node_ptr->addr;
-    if(NULL == (leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_LEAF, leaf_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+    if(NULL == (leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_LEAF, leaf_addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
     /* Sanity check number of records */
@@ -2659,7 +2659,7 @@ H5B2_remove_leaf_by_idx(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
     leaf->nrec--;
 
     /* Mark leaf node as dirty also */
-    leaf_flags |= H5AC2__DIRTIED_FLAG;
+    leaf_flags |= H5AC__DIRTIED_FLAG;
 
     if(leaf->nrec > 0) {
         /* Pack record out of leaf */
@@ -2672,7 +2672,7 @@ H5B2_remove_leaf_by_idx(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
             HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to free B-tree leaf node")
 
         /* Let the cache know that the object is deleted */
-        leaf_flags |= H5AC2__DELETED_FLAG;
+        leaf_flags |= H5AC__DELETED_FLAG;
 
         /* Reset address of parent node pointer */
         curr_node_ptr->addr = HADDR_UNDEF;
@@ -2683,7 +2683,7 @@ H5B2_remove_leaf_by_idx(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
 
 done:
     /* Release the B-tree leaf node */
-    if(leaf && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_LEAF, leaf_addr, (size_t)0, leaf, leaf_flags) < 0)
+    if(leaf && H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, leaf_addr, (size_t)0, leaf, leaf_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release leaf B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2707,15 +2707,15 @@ done:
 herr_t
 H5B2_remove_internal_by_idx(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
     hbool_t *depth_decreased, void *swap_loc, unsigned depth,
-    H5AC2_info_t *parent_cache_info, unsigned *parent_cache_info_flags_ptr,
+    H5AC_info_t *parent_cache_info, unsigned *parent_cache_info_flags_ptr,
     H5B2_node_ptr_t *curr_node_ptr, hsize_t n, H5B2_remove_t op,
     void *op_data)
 {
-    H5AC2_info_t *new_cache_info;        /* Pointer to new cache info */
+    H5AC_info_t *new_cache_info;        /* Pointer to new cache info */
     unsigned *new_cache_info_flags_ptr = NULL;
     H5B2_node_ptr_t *new_node_ptr;      /* Pointer to new node pointer */
     H5B2_internal_t *internal;          /* Pointer to internal node */
-    unsigned internal_flags = H5AC2__NO_FLAGS_SET;
+    unsigned internal_flags = H5AC__NO_FLAGS_SET;
     haddr_t internal_addr;              /* Address of internal node */
     H5B2_shared_t *shared;              /* Pointer to B-tree's shared information */
     size_t      merge_nrec;             /* Number of records to merge node at */
@@ -2735,7 +2735,7 @@ H5B2_remove_internal_by_idx(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
 
     /* Lock current B-tree node */
     internal_addr = curr_node_ptr->addr;
-    if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, internal_addr, curr_node_ptr->node_nrec, depth, H5AC2_WRITE)))
+    if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, internal_addr, curr_node_ptr->node_nrec, depth, H5AC_WRITE)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
     HDassert(internal->nrec == curr_node_ptr->node_nrec);
 
@@ -2763,7 +2763,7 @@ H5B2_remove_internal_by_idx(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
             HGOTO_ERROR(H5E_BTREE, H5E_CANTFREE, FAIL, "unable to free B-tree leaf node")
 
         /* Let the cache know that the object is deleted */
-        internal_flags |= H5AC2__DELETED_FLAG;
+        internal_flags |= H5AC__DELETED_FLAG;
 
         /* Reset information in header's root node pointer */
         curr_node_ptr->addr = internal->node_ptrs[0].addr;
@@ -2944,7 +2944,7 @@ H5B2_remove_internal_by_idx(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
         new_node_ptr->all_nrec--;
 
     /* Mark node as dirty */
-    internal_flags |= H5AC2__DIRTIED_FLAG;
+    internal_flags |= H5AC__DIRTIED_FLAG;
 
 #ifdef H5B2_DEBUG
     H5B2_assert_internal((!collapsed_root ? (curr_node_ptr->all_nrec-1) : new_node_ptr->all_nrec),shared,internal);
@@ -2952,7 +2952,7 @@ H5B2_remove_internal_by_idx(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
 
 done:
     /* Release the B-tree internal node */
-    if(internal && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, internal_addr, (size_t)0, internal, internal_flags) < 0)
+    if(internal && H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, internal_addr, (size_t)0, internal, internal_flags) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release internal B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -3015,7 +3015,7 @@ H5B2_neighbor_leaf(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
     HDassert(shared);
 
     /* Lock current B-tree node */
-    if (NULL == (leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr->addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_READ)))
+    if (NULL == (leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr->addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_READ)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
     /* Locate node pointer for child */
@@ -3049,7 +3049,7 @@ H5B2_neighbor_leaf(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
 
 done:
     /* Release the B-tree internal node */
-    if (leaf && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr->addr, (size_t)0, leaf, H5AC2__NO_FLAGS_SET) < 0)
+    if (leaf && H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr->addr, (size_t)0, leaf, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree leaf node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -3104,7 +3104,7 @@ H5B2_neighbor_internal(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
     HDassert(op);
 
     /* Lock current B-tree node */
-    if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node_ptr->addr, curr_node_ptr->node_nrec, depth, H5AC2_READ)))
+    if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node_ptr->addr, curr_node_ptr->node_nrec, depth, H5AC_READ)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
     /* Get the pointer to the shared B-tree info */
@@ -3140,7 +3140,7 @@ H5B2_neighbor_internal(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
 
 done:
     /* Release the B-tree internal node */
-    if (internal && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, curr_node_ptr->addr, (size_t)0, internal, H5AC2__NO_FLAGS_SET) < 0)
+    if (internal && H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, curr_node_ptr->addr, (size_t)0, internal, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release internal B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -3166,7 +3166,7 @@ H5B2_delete_node(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, unsigned depth,
     const H5B2_node_ptr_t *curr_node, H5B2_remove_t op, void *op_data)
 {
     H5B2_shared_t *shared;              /* Pointer to B-tree's shared information */
-    const H5AC2_class_t *curr_node_class=NULL; /* Pointer to current node's class info */
+    const H5AC_class_t *curr_node_class=NULL; /* Pointer to current node's class info */
     void *node=NULL;                    /* Pointers to current node */
     uint8_t *native;                    /* Pointers to node's native records */
     H5B2_leaf_cache_ud_t cache_leaf_udata; /* User-data for callback */
@@ -3188,11 +3188,11 @@ H5B2_delete_node(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, unsigned depth,
         unsigned u;                    /* Local index */
 
         /* Lock the current B-tree node */
-        if (NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node->addr, curr_node->node_nrec, depth, H5AC2_WRITE)))
+        if (NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node->addr, curr_node->node_nrec, depth, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* Set up information about current node */
-        curr_node_class = H5AC2_BT2_INT;
+        curr_node_class = H5AC_BT2_INT;
         node = internal;
         native = internal->int_native;
 
@@ -3209,11 +3209,11 @@ H5B2_delete_node(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, unsigned depth,
         cache_leaf_udata.bt2_shared = bt2_shared;
 
         /* Lock the current B-tree node */
-        if (NULL == (leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node->addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC2_WRITE)))
+        if (NULL == (leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_LEAF, curr_node->addr, (size_t)shared->node_size, &cache_leaf_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree leaf node")
 
         /* Set up information about current node */
-        curr_node_class = H5AC2_BT2_LEAF;
+        curr_node_class = H5AC_BT2_LEAF;
         node = leaf;
         native = leaf->leaf_native;
     } /* end else */
@@ -3237,7 +3237,7 @@ H5B2_delete_node(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, unsigned depth,
 done:
     /* Unlock & delete current node */
     if(node)
-        if(H5AC2_unprotect(f, dxpl_id, curr_node_class, curr_node->addr, (size_t)0, node, H5AC2__DELETED_FLAG) < 0)
+        if(H5AC_unprotect(f, dxpl_id, curr_node_class, curr_node->addr, (size_t)0, node, H5AC__DELETED_FLAG) < 0)
             HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -3279,7 +3279,7 @@ H5B2_iterate_size_node(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, unsigned dep
     HDassert(shared);
 
     /* Lock the current B-tree node */
-    if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node->addr, curr_node->node_nrec, depth, H5AC2_READ)))
+    if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node->addr, curr_node->node_nrec, depth, H5AC_READ)))
         HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
     /* Recursively descend into child nodes, if we are above the "twig" level in the B-tree */
@@ -3298,7 +3298,7 @@ H5B2_iterate_size_node(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared, unsigned dep
     *btree_size += shared->node_size;
 
 done:
-    if(internal && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, curr_node->addr, (size_t)0, internal, H5AC2__NO_FLAGS_SET) < 0)
+    if(internal && H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, curr_node->addr, (size_t)0, internal, H5AC__NO_FLAGS_SET) < 0)
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5B2pkg.h b/src/H5B2pkg.h
index 3a2cbcd..95c10e3 100644
--- a/src/H5B2pkg.h
+++ b/src/H5B2pkg.h
@@ -32,7 +32,7 @@
 #include "H5B2private.h"
 
 /* Other private headers needed by this file */
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5FLprivate.h"	/* Free Lists                           */
 #include "H5RCprivate.h"	/* Reference counted object functions	*/
 
@@ -184,7 +184,7 @@ typedef struct H5B2_shared_t {
 /* The B-tree information */
 typedef struct H5B2_t {
     /* Information for H5AC cache functions, _must_ be first field in structure */
-    H5AC2_info_t cache_info;
+    H5AC_info_t cache_info;
 
     /* Internal B-tree information */
     H5B2_node_ptr_t root;       /* Node pointer to root node in B-tree        */
@@ -194,7 +194,7 @@ typedef struct H5B2_t {
 /* B-tree leaf node information */
 typedef struct H5B2_leaf_t {
     /* Information for H5AC cache functions, _must_ be first field in structure */
-    H5AC2_info_t cache_info;
+    H5AC_info_t cache_info;
 
     /* Internal B-tree information */
     H5RC_t	*shared;	/* Ref-counted shared info	              */
@@ -205,7 +205,7 @@ typedef struct H5B2_leaf_t {
 /* B-tree internal node information */
 typedef struct H5B2_internal_t {
     /* Information for H5AC cache functions, _must_ be first field in structure */
-    H5AC2_info_t cache_info;
+    H5AC_info_t cache_info;
 
     /* Internal B-tree information */
     H5RC_t	*shared;	/* Ref-counted shared info	              */
@@ -235,14 +235,14 @@ typedef struct {
 /* Package Private Variables */
 /*****************************/
 
-/* H5B2 header inherits cache-like properties from H5AC2 */
-H5_DLLVAR const H5AC2_class_t H5AC2_BT2_HDR[1];
+/* H5B2 header inherits cache-like properties from H5AC */
+H5_DLLVAR const H5AC_class_t H5AC_BT2_HDR[1];
 
-/* H5B2 internal node inherits cache-like properties from H5AC2 */
-H5_DLLVAR const H5AC2_class_t H5AC2_BT2_INT[1];
+/* H5B2 internal node inherits cache-like properties from H5AC */
+H5_DLLVAR const H5AC_class_t H5AC_BT2_INT[1];
 
-/* H5B2 leaf node inherits cache-like properties from H5AC2 */
-H5_DLLVAR const H5AC2_class_t H5AC2_BT2_LEAF[1];
+/* H5B2 leaf node inherits cache-like properties from H5AC */
+H5_DLLVAR const H5AC_class_t H5AC_BT2_LEAF[1];
 
 /* Declare a free list to manage the H5B2_t struct */
 H5FL_EXTERN(H5B2_t);
@@ -271,7 +271,7 @@ H5_DLL herr_t H5B2_shared_init(H5F_t *f, H5B2_t *bt2, const H5B2_class_t *type,
 /* Routines for operating on internal nodes */
 H5_DLL H5B2_internal_t *H5B2_protect_internal(H5F_t *f, hid_t dxpl_id,
     H5RC_t *bt2_shared, haddr_t addr, unsigned nrec, unsigned depth,
-    H5AC2_protect_t rw);
+    H5AC_protect_t rw);
 
 /* Routines for allocating nodes */
 H5_DLL herr_t H5B2_split_root(H5F_t *f, hid_t dxpl_id, H5B2_t *bt2,
@@ -305,14 +305,14 @@ H5_DLL herr_t H5B2_neighbor_leaf(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
 
 /* Routines for removing records */
 H5_DLL herr_t H5B2_remove_internal(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
-    hbool_t *depth_decreased, void *swap_loc, unsigned depth, H5AC2_info_t *parent_cache_info,
+    hbool_t *depth_decreased, void *swap_loc, unsigned depth, H5AC_info_t *parent_cache_info,
     hbool_t * parent_cache_info_dirtied_ptr, H5B2_node_ptr_t *curr_node_ptr, void *udata,
     H5B2_remove_t op, void *op_data);
 H5_DLL herr_t H5B2_remove_leaf(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
     H5B2_node_ptr_t *curr_node_ptr, void *udata, H5B2_remove_t op,
     void *op_data);
 H5_DLL herr_t H5B2_remove_internal_by_idx(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
-    hbool_t *depth_decreased, void *swap_loc, unsigned depth, H5AC2_info_t *parent_cache_info,
+    hbool_t *depth_decreased, void *swap_loc, unsigned depth, H5AC_info_t *parent_cache_info,
     hbool_t * parent_cache_info_dirtied_ptr, H5B2_node_ptr_t *curr_node_ptr, hsize_t idx,
     H5B2_remove_t op, void *op_data);
 H5_DLL herr_t H5B2_remove_leaf_by_idx(H5F_t *f, hid_t dxpl_id, H5RC_t *bt2_shared,
diff --git a/src/H5B2stat.c b/src/H5B2stat.c
index 4f3f53b..ee9d784 100644
--- a/src/H5B2stat.c
+++ b/src/H5B2stat.c
@@ -103,7 +103,7 @@ H5B2_stat_info(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type,
     cache_udata.type = type;
 
     /* Look up the B-tree header */
-    if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header")
 
     /* Get pointer to reference counted shared B-tree info */
@@ -115,7 +115,7 @@ H5B2_stat_info(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type,
 
 done:
     /* Release B-tree header node */
-    if(bt2 && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)0, bt2, H5AC2__NO_FLAGS_SET) < 0)
+    if(bt2 && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)0, bt2, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header info")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5B2test.c b/src/H5B2test.c
index 8cc6e54..f697d30 100644
--- a/src/H5B2test.c
+++ b/src/H5B2test.c
@@ -273,7 +273,7 @@ H5B2_get_root_addr_test(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type,
     cache_udata.type = type;
 
     /* Look up the B-tree header */
-    if(NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header")
 
     /* Get B-tree root addr */
@@ -281,7 +281,7 @@ H5B2_get_root_addr_test(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type,
 
 done:
     /* Release B-tree header node */
-    if(bt2 && H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)0, bt2, H5AC2__NO_FLAGS_SET) < 0)
+    if(bt2 && H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)0, bt2, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header info")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -327,7 +327,7 @@ H5B2_get_node_info_test(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr
     cache_udata.type = type;
 
     /* Look up the B-tree header */
-    if (NULL == (bt2 = (H5B2_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if (NULL == (bt2 = (H5B2_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)H5B2_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree header")
 
     /* Safely grab pointer to reference counted shared B-tree info, so we can release the B-tree header if necessary */
@@ -346,7 +346,7 @@ H5B2_get_node_info_test(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr
     depth = shared->depth;
 
     /* Release header */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_HDR, addr, (size_t)0, bt2, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_HDR, addr, (size_t)0, bt2, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header info")
     bt2 = NULL;
 
@@ -361,7 +361,7 @@ H5B2_get_node_info_test(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr
         H5B2_node_ptr_t next_node_ptr;      /* Node pointer info for next node */
 
         /* Lock B-tree current node */
-        if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node_ptr.addr, curr_node_ptr.node_nrec, depth, H5AC2_READ)))
+        if(NULL == (internal = H5B2_protect_internal(f, dxpl_id, bt2_shared, curr_node_ptr.addr, curr_node_ptr.node_nrec, depth, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* Locate node pointer for child */
@@ -374,7 +374,7 @@ H5B2_get_node_info_test(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr
             next_node_ptr = internal->node_ptrs[idx];
 
             /* Unlock current node */
-            if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC2__NO_FLAGS_SET) < 0)
+            if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             /* Set pointer to next node to load */
@@ -382,7 +382,7 @@ H5B2_get_node_info_test(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr
         } /* end if */
         else {
             /* Unlock current node */
-            if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC2__NO_FLAGS_SET) < 0)
+            if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_INT, curr_node_ptr.addr, (size_t)0, internal, H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
             /* Fill in information about the node */
@@ -401,14 +401,14 @@ H5B2_get_node_info_test(H5F_t *f, hid_t dxpl_id, const H5B2_class_t *type, haddr
         H5B2_leaf_t *leaf;          /* Pointer to leaf node in B-tree */
 
         /* Lock B-tree leaf node */
-        if(NULL == (leaf = (H5B2_leaf_t *)H5AC2_protect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr.addr, (size_t)shared->node_size, &cache_udata, H5AC2_READ)))
+        if(NULL == (leaf = (H5B2_leaf_t *)H5AC_protect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, (size_t)shared->node_size, &cache_udata, H5AC_READ)))
             HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree internal node")
 
         /* Locate record */
         cmp = H5B2_locate_record(shared->type, leaf->nrec, shared->nat_off, leaf->leaf_native, udata, &idx);
 
         /* Unlock current node */
-        if(H5AC2_unprotect(f, dxpl_id, H5AC2_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC2__NO_FLAGS_SET) < 0)
+        if(H5AC_unprotect(f, dxpl_id, H5AC_BT2_LEAF, curr_node_ptr.addr, (size_t)0, leaf, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node")
 
         /* Indicate the depth that the record was found */
diff --git a/src/H5Bcache.c b/src/H5Bcache.c
index b6dedb2..fd99d1f 100644
--- a/src/H5Bcache.c
+++ b/src/H5Bcache.c
@@ -66,9 +66,9 @@ static herr_t H5B_free_icr(haddr_t addr, size_t len, void *thing);
 /* Package Variables */
 /*********************/
 
-/* H5B inherits cache-like properties from H5AC2 */
-const H5AC2_class_t H5AC2_BT[1] = {{
-    H5AC2_BT_ID,
+/* H5B inherits cache-like properties from H5AC */
+const H5AC_class_t H5AC_BT[1] = {{
+    H5AC_BT_ID,
     "v1 B-tree",
     H5FD_MEM_BTREE,
     H5B_deserialize,
@@ -118,7 +118,7 @@ H5B_deserialize(haddr_t UNUSED addr, size_t UNUSED len, const void *image,
     /* Allocate the B-tree node in memory */
     if(NULL == (bt = H5FL_MALLOC(H5B_t)))
 	HGOTO_ERROR(H5E_BTREE, H5E_NOSPACE, NULL, "can't allocate B-tree struct")
-    HDmemset(&bt->cache_info, 0, sizeof(H5AC2_info_t));
+    HDmemset(&bt->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Set & increment the ref-counted "shared" B-tree information for the node */
     bt->rc_shared = udata->rc_shared;
diff --git a/src/H5Bpkg.h b/src/H5Bpkg.h
index f1354ab..5309d02 100644
--- a/src/H5Bpkg.h
+++ b/src/H5Bpkg.h
@@ -32,7 +32,7 @@
 #include "H5Bprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5AC2private.h"	/* Metadata cache #2			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 
 
 /**************************/
@@ -46,7 +46,7 @@
 
 /* The B-tree node as stored in memory...  */
 typedef struct H5B_t {
-    H5AC2_info_t        cache_info;     /* Information for H5AC2 cache functions */
+    H5AC_info_t        cache_info;     /* Information for H5AC cache functions */
                                         /* _must_ be first field in structure */
     H5RC_t		*rc_shared;	/*ref-counted shared info	     */
     unsigned		level;		/*node level			     */
@@ -68,8 +68,8 @@ typedef struct H5B_cache_ud_t {
 /* Package Private Variables */
 /*****************************/
 
-/* H5B header inherits cache-like properties from H5AC2 */
-H5_DLLVAR const H5AC2_class_t H5AC2_BT[1];
+/* H5B header inherits cache-like properties from H5AC */
+H5_DLLVAR const H5AC_class_t H5AC_BT[1];
 
 /* Declare a free list to manage the haddr_t sequence information */
 H5FL_SEQ_EXTERN(haddr_t);
diff --git a/src/H5C2.c b/src/H5C.c
index dd4105a..6355182 100644
--- a/src/H5C2.c
+++ b/src/H5C.c
@@ -15,7 +15,7 @@
 
 /*-------------------------------------------------------------------------
  *
- * Created:     H5C2.c
+ * Created:     H5C.c
  *              June 1 2004
  *              John Mainzer
  *
@@ -30,7 +30,7 @@
  *		in an attempt to support re-use.
  *
  *		For a detailed overview of the cache, please see the
- *		header comment for H5C2_t in H5C2pkg.h.
+ *		header comment for H5C_t in H5Cpkg.h.
  *
  * Modifications:
  *
@@ -40,7 +40,7 @@
  *
  *		JRM - 12/15/04
  *		Added code supporting manual and automatic cache resizing.
- *		See the header for H5C2_auto_size_ctl_t in H5C2private.h for
+ *		See the header for H5C_auto_size_ctl_t in H5Cprivate.h for
  *		an overview.
  *
  *		Some elements of the automatic cache resize code depend on
@@ -59,7 +59,7 @@
  *
  *	Code Changes:
  *
- *	 - Remove extra functionality in H5C2_flush_single_entry()?
+ *	 - Remove extra functionality in H5C_flush_single_entry()?
  *
  *	 - Change protect/unprotect to lock/unlock.
  *
@@ -71,9 +71,9 @@
  *	   cache of changes in entry size.
  *
  *	 - Flush entries in increasing address order in
- *	   H5C2_make_space_in_cache().
+ *	   H5C_make_space_in_cache().
  *
- *	 - Also in H5C2_make_space_in_cache(), use high and low water marks
+ *	 - Also in H5C_make_space_in_cache(), use high and low water marks
  *	   to reduce the number of I/O calls.
  *
  *	 - When flushing, attempt to combine contiguous entries to reduce
@@ -97,12 +97,12 @@
 
 #include <aio.h>
 
-#define H5C2_PACKAGE		/*suppress error about including H5C2pkg  */
+#define H5C_PACKAGE		/*suppress error about including H5Cpkg  */
 #define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
 
 
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5C2pkg.h"		/* Cache				*/
+#include "H5Cpkg.h"		/* Cache				*/
 #include "H5Dprivate.h"		/* Dataset functions			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Fpkg.h"		/* Files				*/
@@ -119,17 +119,17 @@
  * before checkin.
  */
 
-#define H5C2_PRINT_ENTRY_POINTS	FALSE
+#define H5C_PRINT_ENTRY_POINTS	FALSE
 
-#if H5C2_PRINT_ENTRY_POINTS
-#define H5C2_PRINT_EXIT_POINTS	TRUE
-#define H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(i) \
-	( ( (i) == H5AC2_FHEAP_HDR_ID ) ||    \
-          ( (i) == H5AC2_FHEAP_DBLOCK_ID ) || \
-          ( (i) == H5AC2_FHEAP_IBLOCK_ID ) )
-#else /* H5C2_PRINT_ENTRY_POINTS */
-#define H5C2_PRINT_EXIT_POINTS	FALSE
-#endif /* H5C2_PRINT_ENTRY_POINTS */
+#if H5C_PRINT_ENTRY_POINTS
+#define H5C_PRINT_EXIT_POINTS	TRUE
+#define H5C_PRINT_ENTRY_POINT_TARGET_TYPE(i) \
+	( ( (i) == H5AC_FHEAP_HDR_ID ) ||    \
+          ( (i) == H5AC_FHEAP_DBLOCK_ID ) || \
+          ( (i) == H5AC_FHEAP_IBLOCK_ID ) )
+#else /* H5C_PRINT_ENTRY_POINTS */
+#define H5C_PRINT_EXIT_POINTS	FALSE
+#endif /* H5C_PRINT_ENTRY_POINTS */
 
 
 
@@ -137,75 +137,75 @@
  * Private file-scope variables.
  */
 
-/* Declare a free list to manage the H5C2_t struct */
-H5FL_DEFINE_STATIC(H5C2_t);
+/* Declare a free list to manage the H5C_t struct */
+H5FL_DEFINE_STATIC(H5C_t);
 
 
 /*
  * Private file-scope function declarations:
  */
 
-static herr_t H5C2__auto_adjust_cache_size(H5F_t * f,
+static herr_t H5C__auto_adjust_cache_size(H5F_t * f,
                                            hid_t dxpl_id,
-                                           H5C2_t * cache_ptr,
+                                           H5C_t * cache_ptr,
                                            hbool_t write_permitted);
 
-static herr_t H5C2__autoadjust__ageout(H5F_t * f,
+static herr_t H5C__autoadjust__ageout(H5F_t * f,
                                        hid_t dxpl_id,
-                                       H5C2_t * cache_ptr,
+                                       H5C_t * cache_ptr,
                                        double hit_rate,
-                                       enum H5C2_resize_status * status_ptr,
+                                       enum H5C_resize_status * status_ptr,
                                        size_t * new_max_cache_size_ptr,
                                        hbool_t write_permitted);
 
-static herr_t H5C2__autoadjust__ageout__cycle_epoch_marker(H5C2_t * cache_ptr);
+static herr_t H5C__autoadjust__ageout__cycle_epoch_marker(H5C_t * cache_ptr);
 
-static herr_t H5C2__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
+static herr_t H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
                                                        hid_t dxpl_id,
-                                                       H5C2_t * cache_ptr,
+                                                       H5C_t * cache_ptr,
                                                        hbool_t write_permitted);
 
-static herr_t H5C2__autoadjust__ageout__insert_new_marker(H5C2_t * cache_ptr);
+static herr_t H5C__autoadjust__ageout__insert_new_marker(H5C_t * cache_ptr);
 
-static herr_t H5C2__autoadjust__ageout__remove_all_markers(H5C2_t * cache_ptr);
+static herr_t H5C__autoadjust__ageout__remove_all_markers(H5C_t * cache_ptr);
 
-static herr_t H5C2__autoadjust__ageout__remove_excess_markers(H5C2_t * cache_ptr);
+static herr_t H5C__autoadjust__ageout__remove_excess_markers(H5C_t * cache_ptr);
 
-static herr_t H5C2__flash_increase_cache_size(H5C2_t * cache_ptr,
+static herr_t H5C__flash_increase_cache_size(H5C_t * cache_ptr,
                                               size_t old_entry_size,
                                               size_t new_entry_size);
 
-static herr_t H5C2_flush_single_entry(const H5F_t *	   f,
+static herr_t H5C_flush_single_entry(const H5F_t *	   f,
                                       hid_t 		   dxpl_id,
-                                      H5C2_t *	           cache_ptr,
-                                      const H5C2_class_t * type_ptr,
+                                      H5C_t *	           cache_ptr,
+                                      const H5C_class_t * type_ptr,
                                       haddr_t		   addr,
                                       unsigned	           flags,
                                       hbool_t del_entry_from_slist_on_destroy);
 
-static herr_t H5C2_flush_invalidate_cache(const H5F_t *  f,
+static herr_t H5C_flush_invalidate_cache(const H5F_t *  f,
                                           hid_t    dxpl_id,
-                                          H5C2_t * cache_ptr,
+                                          H5C_t * cache_ptr,
 			                  unsigned flags);
 
-static void * H5C2_load_entry(H5F_t *              f,
+static void * H5C_load_entry(H5F_t *              f,
                               hid_t                dxpl_id,
-                              const H5C2_class_t * type,
+                              const H5C_class_t * type,
                               haddr_t              addr,
 		              size_t		   len,
                               void *         udata_ptr);
 
-static herr_t H5C2_make_space_in_cache(H5F_t *  f,
+static herr_t H5C_make_space_in_cache(H5F_t *  f,
                                        hid_t	dxpl_id,
-                                       H5C2_t * cache_ptr,
+                                       H5C_t * cache_ptr,
 		                       size_t	space_needed,
                                        hbool_t	write_permitted);
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-static herr_t H5C2_validate_lru_list(H5C2_t * cache_ptr);
-static herr_t H5C2_verify_not_in_index(H5C2_t * cache_ptr,
-                                      H5C2_cache_entry_t * entry_ptr);
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#if H5C_DO_EXTREME_SANITY_CHECKS
+static herr_t H5C_validate_lru_list(H5C_t * cache_ptr);
+static herr_t H5C_verify_not_in_index(H5C_t * cache_ptr,
+                                      H5C_cache_entry_t * entry_ptr);
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
 
 /****************************************************************************
@@ -219,20 +219,20 @@ static herr_t H5C2_verify_not_in_index(H5C2_t * cache_ptr,
  *
  ****************************************************************************/
 
-/* Note that H5C2__MAX_EPOCH_MARKERS is defined in H5C2pkg.h, not here because
- * it is needed to dimension arrays in H5C2_t.
+/* Note that H5C__MAX_EPOCH_MARKERS is defined in H5Cpkg.h, not here because
+ * it is needed to dimension arrays in H5C_t.
  */
 
-#define H5C2__EPOCH_MARKER_TYPE	H5C2__MAX_NUM_TYPE_IDS
+#define H5C__EPOCH_MARKER_TYPE	H5C__MAX_NUM_TYPE_IDS
 
-static void * H5C2_epoch_marker_deserialize(haddr_t addr,
+static void * H5C_epoch_marker_deserialize(haddr_t addr,
 		                            size_t len,
                                             const void * image_ptr,
 			                    void * udata_ptr,
 			                    hbool_t * dirty_ptr);
-static herr_t H5C2_epoch_marker_image_len(const void * thing,
+static herr_t H5C_epoch_marker_image_len(const void * thing,
 		                          size_t *image_len_ptr);
-static herr_t H5C2_epoch_marker_serialize(const H5F_t *f,
+static herr_t H5C_epoch_marker_serialize(const H5F_t *f,
 		                          hid_t dxpl_id,
                                           haddr_t addr,
 		                          size_t len,
@@ -242,28 +242,28 @@ static herr_t H5C2_epoch_marker_serialize(const H5F_t *f,
 		                          haddr_t * new_addr_ptr,
 		                          size_t * new_len_ptr,
 		                          void ** new_image_ptr_ptr);
-static herr_t H5C2_epoch_marker_free_icr(haddr_t addr,
+static herr_t H5C_epoch_marker_free_icr(haddr_t addr,
 	 	                         size_t len,
 			                 void * thing);
-static herr_t H5C2_epoch_marker_clear_dirty_bits(haddr_t addr,
+static herr_t H5C_epoch_marker_clear_dirty_bits(haddr_t addr,
 		                                 size_t len,
 				                 void * thing);
 
-const H5C2_class_t epoch_marker_class_2 =
+const H5C_class_t epoch_marker_class_2 =
 {
-    /* id               = */ H5C2__EPOCH_MARKER_TYPE,
+    /* id               = */ H5C__EPOCH_MARKER_TYPE,
     /* name             = */ "epoch marker",
     /* mem_type         = */ H5FD_MEM_DEFAULT, /* value doesn't matter */
-    /* deserialize      = */ &H5C2_epoch_marker_deserialize,
-    /* image_len        = */ &H5C2_epoch_marker_image_len,
-    /* serialize        = */ &H5C2_epoch_marker_serialize,
-    /* free_icr         = */ &H5C2_epoch_marker_free_icr,
-    /* clear_dirty_bits = */ &H5C2_epoch_marker_clear_dirty_bits,
+    /* deserialize      = */ &H5C_epoch_marker_deserialize,
+    /* image_len        = */ &H5C_epoch_marker_image_len,
+    /* serialize        = */ &H5C_epoch_marker_serialize,
+    /* free_icr         = */ &H5C_epoch_marker_free_icr,
+    /* clear_dirty_bits = */ &H5C_epoch_marker_clear_dirty_bits,
 };
 
 
 /***************************************************************************
- * Class functions for H5C2__EPOCH_MAKER_TYPE:
+ * Class functions for H5C__EPOCH_MAKER_TYPE:
  *
  * None of these functions should ever be called, so there is no point in
  * documenting them separately.
@@ -272,7 +272,7 @@ const H5C2_class_t epoch_marker_class_2 =
  ***************************************************************************/
 
 static void *
-H5C2_epoch_marker_deserialize(haddr_t UNUSED addr,
+H5C_epoch_marker_deserialize(haddr_t UNUSED addr,
 		              size_t UNUSED len,
                               const void UNUSED * image_ptr,
 			      void UNUSED * udata_ptr,
@@ -280,7 +280,7 @@ H5C2_epoch_marker_deserialize(haddr_t UNUSED addr,
 {
     void * ret_value = NULL;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_epoch_marker_deserialize, NULL)
+    FUNC_ENTER_NOAPI(H5C_epoch_marker_deserialize, NULL)
 
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, NULL, "called unreachable fcn.")
 
@@ -290,12 +290,12 @@ done:
 }
 
 static herr_t
-H5C2_epoch_marker_image_len(const void UNUSED *thing,
+H5C_epoch_marker_image_len(const void UNUSED *thing,
 		            size_t UNUSED *image_len_ptr)
 {
     herr_t ret_value = FAIL;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_epoch_marker_image_len, FAIL)
+    FUNC_ENTER_NOAPI(H5C_epoch_marker_image_len, FAIL)
 
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
 
@@ -305,7 +305,7 @@ done:
 }
 
 static herr_t
-H5C2_epoch_marker_serialize(const H5F_t UNUSED *f,
+H5C_epoch_marker_serialize(const H5F_t UNUSED *f,
 		            hid_t UNUSED dxpl_id,
                             haddr_t UNUSED addr,
 		            size_t UNUSED len,
@@ -318,7 +318,7 @@ H5C2_epoch_marker_serialize(const H5F_t UNUSED *f,
 {
     herr_t ret_value = FAIL;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_epoch_marker_serialize, FAIL)
+    FUNC_ENTER_NOAPI(H5C_epoch_marker_serialize, FAIL)
 
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
 
@@ -328,13 +328,13 @@ done:
 }
 
 static herr_t
-H5C2_epoch_marker_free_icr(haddr_t UNUSED addr,
+H5C_epoch_marker_free_icr(haddr_t UNUSED addr,
 		           size_t UNUSED len,
 			   void UNUSED * thing)
 {
     herr_t ret_value = FAIL;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_epoch_marker_free_icr, FAIL)
+    FUNC_ENTER_NOAPI(H5C_epoch_marker_free_icr, FAIL)
 
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
 
@@ -344,13 +344,13 @@ done:
 }
 
 static herr_t
-H5C2_epoch_marker_clear_dirty_bits(haddr_t UNUSED addr,
+H5C_epoch_marker_clear_dirty_bits(haddr_t UNUSED addr,
 		                   size_t UNUSED len,
 				   void UNUSED * thing)
 {
     herr_t ret_value = FAIL;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_epoch_marker_clear_dirty_bits, FAIL)
+    FUNC_ENTER_NOAPI(H5C_epoch_marker_clear_dirty_bits, FAIL)
 
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
 
@@ -362,17 +362,17 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_create
+ * Function:    H5C_create
  *
  * Purpose:     Allocate, initialize, and return the address of a new
- *		instance of H5C2_t.
+ *		instance of H5C_t.
  *
  *		In general, the max_cache_size parameter must be positive,
  *		and the min_clean_size parameter must lie in the closed
  *		interval [0, max_cache_size].
  *
  *		The check_write_permitted parameter must either be NULL,
- *		or point to a function of type H5C2_write_permitted_func_t.
+ *		or point to a function of type H5C_write_permitted_func_t.
  *		If it is NULL, the cache will use the write_permitted
  *		flag to determine whether writes are permitted.
  *
@@ -389,7 +389,7 @@ done:
  *		Updated for the addition of the hash table.
  *
  *		JRM -- 10/5/04
- *		Added call to H5C2_reset_cache_hit_rate_stats().  Also
+ *		Added call to H5C_reset_cache_hit_rate_stats().  Also
  *		added initialization for cache_is_full flag and for
  *		resize_ctl.
  *
@@ -402,7 +402,7 @@ done:
  *
  *		JRM -- 6/24/05
  *		Added support for the new write_permitted field of
- *		the H5C2_t structure.
+ *		the H5C_t structure.
  *
  *		JRM -- 7/5/05
  *		Added the new log_flush parameter and supporting code.
@@ -411,7 +411,7 @@ done:
  *		Added the new aux_ptr parameter and supporting code.
  *
  *		JRM -- 1/20/06
- *		Added initialization of the new prefix field in H5C2_t.
+ *		Added initialization of the new prefix field in H5C_t.
  *
  *		JRM -- 3/16/06
  *		Added initialization for the pinned entry related fields.
@@ -426,7 +426,7 @@ done:
  *		Added initialization for the slist_len_increase and
  *		slist_size_increase fields.  These fields are used
  *		for sanity checking in the flush process, and are not
- *		compiled in unless H5C2_DO_SANITY_CHECKS is TRUE.
+ *		compiled in unless H5C_DO_SANITY_CHECKS is TRUE.
  *
  *		JRM -- 3/28/07
  *		Added initialization for the new is_read_only and
@@ -434,9 +434,9 @@ done:
  *
  *		JRM -- 7/10/07
  *		Added the f parameter, along with initialization of
- *		the field of the same in in H5C2_t.  Also removed the
+ *		the field of the same in in H5C_t.  Also removed the
  *		type name table, as type names are now included in
- *		instances of H5C2_class_t.
+ *		instances of H5C_class_t.
  *
  *              JRM -- 3/28/07
  *              Added initialization for the new is_read_only and
@@ -444,11 +444,11 @@ done:
  *
  *              JRM -- 12/31/07
  *              Added initialization for the new flash cache size increase
- *              related fields of H5C2_t.
+ *              related fields of H5C_t.
  *
  * 		JRM -- 3/6/08
  * 		Added initialization for metadata journaling related
- * 		fields in H5C2_t.
+ * 		fields in H5C_t.
  *
  * 		JRM -- 3/26/08
  * 		Added dxpl_id and journal_recovered parameters.  Also
@@ -459,33 +459,33 @@ done:
  * 		JRM -- 7/10/08
  * 		Removed the f, dxpl_id, and journal_recovered parameters,
  * 		as checking for journaling in progress is no longer handled
- * 		in H5C2_create().
+ * 		in H5C_create().
  *
  *-------------------------------------------------------------------------
  */
 
-H5C2_t *
-H5C2_create(size_t		        max_cache_size,
+H5C_t *
+H5C_create(size_t		        max_cache_size,
             size_t		        min_clean_size,
             int			        max_type_id,
 	    const char *                (* type_name_table_ptr),
-            H5C2_write_permitted_func_t check_write_permitted,
+            H5C_write_permitted_func_t check_write_permitted,
             hbool_t		        write_permitted,
-            H5C2_log_flush_func_t       log_flush,
+            H5C_log_flush_func_t       log_flush,
             void *                      aux_ptr)
 {
     int i;
-    H5C2_t * cache_ptr = NULL;
-    H5C2_t * ret_value = NULL;      /* Return value */
+    H5C_t * cache_ptr = NULL;
+    H5C_t * ret_value = NULL;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_create, NULL)
+    FUNC_ENTER_NOAPI(H5C_create, NULL)
 
-    HDassert( max_cache_size >= H5C2__MIN_MAX_CACHE_SIZE );
-    HDassert( max_cache_size <= H5C2__MAX_MAX_CACHE_SIZE );
+    HDassert( max_cache_size >= H5C__MIN_MAX_CACHE_SIZE );
+    HDassert( max_cache_size <= H5C__MAX_MAX_CACHE_SIZE );
     HDassert( min_clean_size <= max_cache_size );
 
     HDassert( max_type_id >= 0 );
-    HDassert( max_type_id < H5C2__MAX_NUM_TYPE_IDS );
+    HDassert( max_type_id < H5C__MAX_NUM_TYPE_IDS );
     HDassert( type_name_table_ptr );
 
     HDassert( ( write_permitted == TRUE ) || ( write_permitted == FALSE ) );
@@ -496,7 +496,7 @@ H5C2_create(size_t		        max_cache_size,
         HDassert( HDstrlen(( type_name_table_ptr)[i]) > 0 );
     }
 
-    if ( NULL == (cache_ptr = H5FL_CALLOC(H5C2_t)) ) {
+    if ( NULL == (cache_ptr = H5FL_CALLOC(H5C_t)) ) {
 
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, \
                     "memory allocation failed")
@@ -513,7 +513,7 @@ H5C2_create(size_t		        max_cache_size,
      * the fields as we will need some of them for the journaling check.
      */
 
-    cache_ptr->magic 				= H5C2__H5C2_T_MAGIC;
+    cache_ptr->magic 				= H5C__H5C_T_MAGIC;
 
     cache_ptr->flush_in_progress		= FALSE;
 
@@ -541,12 +541,12 @@ H5C2_create(size_t		        max_cache_size,
     cache_ptr->slist_len			= 0;
     cache_ptr->slist_size			= (size_t)0;
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
     cache_ptr->slist_len_increase		= 0;
     cache_ptr->slist_size_increase		= 0;
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
-    for ( i = 0; i < H5C2__HASH_TABLE_LEN; i++ )
+    for ( i = 0; i < H5C__HASH_TABLE_LEN; i++ )
     {
         (cache_ptr->index)[i] = NULL;
     }
@@ -584,33 +584,33 @@ H5C2_create(size_t		        max_cache_size,
     cache_ptr->cache_full			= FALSE;
     cache_ptr->size_decreased			= FALSE;
 
-    (cache_ptr->resize_ctl).version		= H5C2__CURR_AUTO_SIZE_CTL_VER;
+    (cache_ptr->resize_ctl).version		= H5C__CURR_AUTO_SIZE_CTL_VER;
     (cache_ptr->resize_ctl).rpt_fcn		= NULL;
     (cache_ptr->resize_ctl).set_initial_size	= FALSE;
-    (cache_ptr->resize_ctl).initial_size	= H5C2__DEF_AR_INIT_SIZE;
-    (cache_ptr->resize_ctl).min_clean_fraction	= H5C2__DEF_AR_MIN_CLEAN_FRAC;
-    (cache_ptr->resize_ctl).max_size		= H5C2__DEF_AR_MAX_SIZE;
-    (cache_ptr->resize_ctl).min_size		= H5C2__DEF_AR_MIN_SIZE;
-    (cache_ptr->resize_ctl).epoch_length	= H5C2__DEF_AR_EPOCH_LENGTH;
-
-    (cache_ptr->resize_ctl).incr_mode		= H5C2_incr__off;
-    (cache_ptr->resize_ctl).lower_hr_threshold	= H5C2__DEF_AR_LOWER_THRESHHOLD;
-    (cache_ptr->resize_ctl).increment	        = H5C2__DEF_AR_INCREMENT;
+    (cache_ptr->resize_ctl).initial_size	= H5C__DEF_AR_INIT_SIZE;
+    (cache_ptr->resize_ctl).min_clean_fraction	= H5C__DEF_AR_MIN_CLEAN_FRAC;
+    (cache_ptr->resize_ctl).max_size		= H5C__DEF_AR_MAX_SIZE;
+    (cache_ptr->resize_ctl).min_size		= H5C__DEF_AR_MIN_SIZE;
+    (cache_ptr->resize_ctl).epoch_length	= H5C__DEF_AR_EPOCH_LENGTH;
+
+    (cache_ptr->resize_ctl).incr_mode		= H5C_incr__off;
+    (cache_ptr->resize_ctl).lower_hr_threshold	= H5C__DEF_AR_LOWER_THRESHHOLD;
+    (cache_ptr->resize_ctl).increment	        = H5C__DEF_AR_INCREMENT;
     (cache_ptr->resize_ctl).apply_max_increment	= TRUE;
-    (cache_ptr->resize_ctl).max_increment	= H5C2__DEF_AR_MAX_INCREMENT;
+    (cache_ptr->resize_ctl).max_increment	= H5C__DEF_AR_MAX_INCREMENT;
 
-    (cache_ptr->resize_ctl).flash_incr_mode     = H5C2_flash_incr__off;
+    (cache_ptr->resize_ctl).flash_incr_mode     = H5C_flash_incr__off;
     (cache_ptr->resize_ctl).flash_multiple      = 1.0;
     (cache_ptr->resize_ctl).flash_threshold     = 0.25;
 
-    (cache_ptr->resize_ctl).decr_mode		= H5C2_decr__off;
-    (cache_ptr->resize_ctl).upper_hr_threshold	= H5C2__DEF_AR_UPPER_THRESHHOLD;
-    (cache_ptr->resize_ctl).decrement	        = H5C2__DEF_AR_DECREMENT;
+    (cache_ptr->resize_ctl).decr_mode		= H5C_decr__off;
+    (cache_ptr->resize_ctl).upper_hr_threshold	= H5C__DEF_AR_UPPER_THRESHHOLD;
+    (cache_ptr->resize_ctl).decrement	        = H5C__DEF_AR_DECREMENT;
     (cache_ptr->resize_ctl).apply_max_decrement	= TRUE;
-    (cache_ptr->resize_ctl).max_decrement	= H5C2__DEF_AR_MAX_DECREMENT;
-    (cache_ptr->resize_ctl).epochs_before_eviction = H5C2__DEF_AR_EPCHS_B4_EVICT;
+    (cache_ptr->resize_ctl).max_decrement	= H5C__DEF_AR_MAX_DECREMENT;
+    (cache_ptr->resize_ctl).epochs_before_eviction = H5C__DEF_AR_EPCHS_B4_EVICT;
     (cache_ptr->resize_ctl).apply_empty_reserve = TRUE;
-    (cache_ptr->resize_ctl).empty_reserve	= H5C2__DEF_AR_EMPTY_RESERVE;
+    (cache_ptr->resize_ctl).empty_reserve	= H5C__DEF_AR_EMPTY_RESERVE;
 
     cache_ptr->epoch_markers_active		= 0;
 
@@ -619,12 +619,12 @@ H5C2_create(size_t		        max_cache_size,
     cache_ptr->epoch_marker_ringbuf_last	= 0;
     cache_ptr->epoch_marker_ringbuf_size	= 0;
 
-    for ( i = 0; i < H5C2__MAX_EPOCH_MARKERS; i++ )
+    for ( i = 0; i < H5C__MAX_EPOCH_MARKERS; i++ )
     {
         (cache_ptr->epoch_marker_active)[i]		 = FALSE;
 #ifndef NDEBUG
         ((cache_ptr->epoch_markers)[i]).magic		 =
-					       H5C2__H5C2_CACHE_ENTRY_T_MAGIC;
+					       H5C__H5C_CACHE_ENTRY_T_MAGIC;
 #endif /* NDEBUG */
         ((cache_ptr->epoch_markers)[i]).addr		 = (haddr_t)i;
         ((cache_ptr->epoch_markers)[i]).size		 = (size_t)0;
@@ -644,12 +644,12 @@ H5C2_create(size_t		        max_cache_size,
         ((cache_ptr->epoch_markers)[i]).prev		 = NULL;
         ((cache_ptr->epoch_markers)[i]).aux_next	 = NULL;
         ((cache_ptr->epoch_markers)[i]).aux_prev	 = NULL;
-#if H5C2_COLLECT_CACHE_ENTRY_STATS
+#if H5C_COLLECT_CACHE_ENTRY_STATS
         ((cache_ptr->epoch_markers)[i]).accesses	 = 0;
         ((cache_ptr->epoch_markers)[i]).clears		 = 0;
         ((cache_ptr->epoch_markers)[i]).flushes		 = 0;
         ((cache_ptr->epoch_markers)[i]).pins		 = 0;
-#endif /* H5C2_COLLECT_CACHE_ENTRY_STATS */
+#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
     }
 
     /* metadata journaling related fields */
@@ -662,7 +662,7 @@ H5C2_create(size_t		        max_cache_size,
     cache_ptr->jnl_file_name_len                         = 0;
     (cache_ptr->jnl_file_name)[0]                        = '\0';
     (cache_ptr->mdj_jbrb).magic                          =
-	    					H5C2__H5C2_JBRB_T_MAGIC;
+	    					H5C__H5C_JBRB_T_MAGIC;
     cache_ptr->tl_len                                    = 0;
     cache_ptr->tl_size                                   = 0;
     cache_ptr->tl_head_ptr                               = NULL;
@@ -677,34 +677,34 @@ H5C2_create(size_t		        max_cache_size,
      * the table will grow and shrink as needed.
      */
     cache_ptr->mdjsc_cb_tbl =
-	    H5MM_malloc(H5C2__MIN_MDJSC_CB_TBL_LEN *
-			sizeof(H5C2_mdjsc_record_t));
+	    H5MM_malloc(H5C__MIN_MDJSC_CB_TBL_LEN *
+			sizeof(H5C_mdjsc_record_t));
     if ( cache_ptr->mdjsc_cb_tbl == NULL ) {
 
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, \
 		    "can't alloc mdjsc_cb_tbl.")
     }
-    for ( i = 0; i < H5C2__MIN_MDJSC_CB_TBL_LEN; i++ )
+    for ( i = 0; i < H5C__MIN_MDJSC_CB_TBL_LEN; i++ )
     {
         ((cache_ptr->mdjsc_cb_tbl)[i]).fcn_ptr  = NULL;
         ((cache_ptr->mdjsc_cb_tbl)[i]).data_ptr = NULL;
         ((cache_ptr->mdjsc_cb_tbl)[i]).fl_next  = i + 1;
     }
-    ((cache_ptr->mdjsc_cb_tbl)[H5C2__MIN_MDJSC_CB_TBL_LEN - 1]).fl_next  = -1;
-    cache_ptr->mdjsc_cb_tbl_len = H5C2__MIN_MDJSC_CB_TBL_LEN;
+    ((cache_ptr->mdjsc_cb_tbl)[H5C__MIN_MDJSC_CB_TBL_LEN - 1]).fl_next  = -1;
+    cache_ptr->mdjsc_cb_tbl_len = H5C__MIN_MDJSC_CB_TBL_LEN;
     cache_ptr->num_mdjsc_cbs = 0;
     cache_ptr->mdjsc_cb_tbl_fl_head = 0;
     cache_ptr->mdjsc_cb_tbl_max_idx_in_use = -1;
 
 
-    if ( H5C2_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED ) {
+    if ( H5C_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED ) {
 
         /* this should be impossible... */
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, NULL, \
-                    "H5C2_reset_cache_hit_rate_stats failed.")
+                    "H5C_reset_cache_hit_rate_stats failed.")
     }
 
-    H5C2_stats__reset(cache_ptr);
+    H5C_stats__reset(cache_ptr);
 
     cache_ptr->skip_file_checks			= FALSE;
     cache_ptr->skip_dxpl_id_checks		= FALSE;
@@ -712,10 +712,10 @@ H5C2_create(size_t		        max_cache_size,
 
     /* We used to check for journaling here, but the super block hasn't
      * been read in yet at cache creation time -- thus the check for
-     * journaling has been moved to H5AC2_check_for_journaling(), which
-     * is simply a wrapper for H5C2_check_for_journaling().
+     * journaling has been moved to H5AC_check_for_journaling(), which
+     * is simply a wrapper for H5C_check_for_journaling().
      *
-     * H5AC2_check_for_journaling() is called at the end of H5Fopen() --
+     * H5AC_check_for_journaling() is called at the end of H5Fopen() --
      * at which point the superblock has been read.
      *
      * Note that H5Fopen() is called by both H5Fcreate() and H5Fopen().
@@ -734,7 +734,7 @@ done:
                 H5SL_close(cache_ptr->slist_ptr);
 
             cache_ptr->magic = 0;
-            H5FL_FREE(H5C2_t, cache_ptr);
+            H5FL_FREE(H5C_t, cache_ptr);
             cache_ptr = NULL;
 
         } /* end if */
@@ -743,11 +743,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_create() */
+} /* H5C_create() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_def_auto_resize_rpt_fcn
+ * Function:    H5C_def_auto_resize_rpt_fcn
  *
  * Purpose:     Print results of a automatic cache resize.
  *
@@ -767,7 +767,7 @@ done:
  *
  *		JRM -- 1/19/06
  *		Updated function for display the new prefix field of
- *		H5C2_t in output.
+ *		H5C_t in output.
  *
  *		JRM 12/31/07
  *              Updated function to handle flash size increases.
@@ -775,22 +775,22 @@ done:
  *-------------------------------------------------------------------------
  */
 void
-H5C2_def_auto_resize_rpt_fcn(H5C2_t * cache_ptr,
+H5C_def_auto_resize_rpt_fcn(H5C_t * cache_ptr,
 #ifndef NDEBUG
                             int32_t version,
 #else /* NDEBUG */
                             int32_t UNUSED version,
 #endif /* NDEBUG */
                             double hit_rate,
-                            enum H5C2_resize_status status,
+                            enum H5C_resize_status status,
                             size_t old_max_cache_size,
                             size_t new_max_cache_size,
                             size_t old_min_clean_size,
                             size_t new_min_clean_size)
 {
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
-    HDassert( version == H5C2__CURR_AUTO_RESIZE_RPT_FCN_VER );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
+    HDassert( version == H5C__CURR_AUTO_RESIZE_RPT_FCN_VER );
 
     switch ( status )
     {
@@ -842,7 +842,7 @@ H5C2_def_auto_resize_rpt_fcn(H5C2_t * cache_ptr,
 
             switch ( (cache_ptr->resize_ctl).decr_mode )
             {
-                case H5C2_decr__threshold:
+                case H5C_decr__threshold:
                     HDassert( hit_rate >
                               (cache_ptr->resize_ctl).upper_hr_threshold );
 
@@ -856,13 +856,13 @@ H5C2_def_auto_resize_rpt_fcn(H5C2_t * cache_ptr,
                               (cache_ptr->resize_ctl).upper_hr_threshold);
                     break;
 
-                case H5C2_decr__age_out:
+                case H5C_decr__age_out:
                     HDfprintf(stdout,
                               "%sAuto cache resize -- decrease by ageout.  HR = %lf\n",
                               cache_ptr->prefix, hit_rate);
                     break;
 
-                case H5C2_decr__age_out_with_threshold:
+                case H5C_decr__age_out_with_threshold:
                     HDassert( hit_rate >
                               (cache_ptr->resize_ctl).upper_hr_threshold );
 
@@ -937,11 +937,11 @@ H5C2_def_auto_resize_rpt_fcn(H5C2_t * cache_ptr,
 
     return;
 
-} /* H5C2_def_auto_resize_rpt_fcn() */
+} /* H5C_def_auto_resize_rpt_fcn() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_dest
+ * Function:    H5C_dest
  *
  * Purpose:     Flush all data to disk and destroy the cache.
  *
@@ -973,16 +973,16 @@ H5C2_def_auto_resize_rpt_fcn(H5C2_t * cache_ptr,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C2_dest(H5F_t * f,
+H5C_dest(H5F_t * f,
           hid_t	 dxpl_id)
 {
-    H5C2_t * cache_ptr = f->shared->cache2;
+    H5C_t * cache_ptr = f->shared->cache;
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_dest, FAIL)
+    FUNC_ENTER_NOAPI(H5C_dest, FAIL)
 
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     /* All metadata journaling status change callbacks should have
      * de-registered at this point.
@@ -991,15 +991,15 @@ H5C2_dest(H5F_t * f,
 
     if ( cache_ptr->mdj_enabled ) {
 
-	if ( H5C2_end_journaling(f, dxpl_id, cache_ptr) != SUCCEED ) {
+	if ( H5C_end_journaling(f, dxpl_id, cache_ptr) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-			    "H5C2_end_journaling() failed.")
+			    "H5C_end_journaling() failed.")
 	}
     }
 
-    if ( H5C2_flush_cache(f, dxpl_id,
-                          H5C2__FLUSH_INVALIDATE_FLAG) < 0 ) {
+    if ( H5C_flush_cache(f, dxpl_id,
+                          H5C__FLUSH_INVALIDATE_FLAG) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush cache")
     }
@@ -1023,16 +1023,16 @@ H5C2_dest(H5F_t * f,
 
     cache_ptr->magic = 0;
 
-    cache_ptr = H5FL_FREE(H5C2_t, cache_ptr);
+    cache_ptr = H5FL_FREE(H5C_t, cache_ptr);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_dest() */
+} /* H5C_dest() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_dest_empty
+ * Function:    H5C_dest_empty
  *
  * Purpose:     Destroy an empty cache.
  *
@@ -1052,17 +1052,17 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C2_dest_empty(H5C2_t * cache_ptr)
+H5C_dest_empty(H5C_t * cache_ptr)
 {
     herr_t ret_value=SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_dest_empty, FAIL)
+    FUNC_ENTER_NOAPI(H5C_dest_empty, FAIL)
 
     /* This would normally be an assert, but we need to use an HGOTO_ERROR
      * call to shut up the compiler.
      */
     if ( ( ! cache_ptr ) ||
-         ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ||
+         ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ||
          ( cache_ptr->index_len != 0 ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
@@ -1078,17 +1078,17 @@ H5C2_dest_empty(H5C2_t * cache_ptr)
 
     cache_ptr->magic = 0;
 
-    H5FL_FREE(H5C2_t, cache_ptr);
+    H5FL_FREE(H5C_t, cache_ptr);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_dest_empty() */
+} /* H5C_dest_empty() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2_expunge_entry
+ * Function:    H5C_expunge_entry
  *
  * Purpose:     Use this function to tell the cache to expunge an entry
  * 		from the cache without writing it to disk even if it is
@@ -1112,51 +1112,51 @@ done:
  *		If so, must remove the entry from the transaction list
  *		(if it is present), remove the entry from the journal
  *		write in progress list, and set entry_ptr->last_trans to
- *		zero before calling H5C2_flush_single_entry().
+ *		zero before calling H5C_flush_single_entry().
  *
  *-------------------------------------------------------------------------
  */
 
 herr_t
-H5C2_expunge_entry(H5F_t *              f,
+H5C_expunge_entry(H5F_t *              f,
 		   hid_t                dxpl_id,
-                   const H5C2_class_t * type,
+                   const H5C_class_t * type,
                    haddr_t 	        addr)
 {
-    H5C2_t *            cache_ptr;
+    H5C_t *            cache_ptr;
     herr_t		result;
     herr_t		ret_value = SUCCEED;      /* Return value */
-    H5C2_cache_entry_t *	entry_ptr = NULL;
+    H5C_cache_entry_t *	entry_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5C2_expunge_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5C_expunge_entry, FAIL)
 
-#if H5C2_PRINT_ENTRY_POINTS
-    if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) )
+#if H5C_PRINT_ENTRY_POINTS
+    if ( H5C_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) )
     {
         HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n",
 	          FUNC, (unsigned long)addr, type->name);
     }
-#endif /* H5C2_PRINT_ENTRY_POINTS */
+#endif /* H5C_PRINT_ENTRY_POINTS */
 
     HDassert( f );
     HDassert( f->shared );
 
-    cache_ptr = f->shared->cache2;
+    cache_ptr = f->shared->cache;
 
     HDassert( H5F_addr_defined(addr) );
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( type );
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-        if ( H5C2_validate_lru_list(cache_ptr) < 0 ) {
+#if H5C_DO_EXTREME_SANITY_CHECKS
+        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                             "LRU sanity check failed.\n");
         }
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-    H5C2__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
+    H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
 
     if ( ( entry_ptr == NULL ) || ( entry_ptr->type != type ) ) {
 
@@ -1179,7 +1179,7 @@ H5C2_expunge_entry(H5F_t *              f,
 		    "Target entry is pinned.")
     }
 
-    /* H5C2_flush_single_entry() will choke if the last_trans field
+    /* H5C_flush_single_entry() will choke if the last_trans field
      * of the entry isn't zero, or if the entry is on the transaction
      * list, or on the transaction write in progress list.  Must tend
      * to this before we we make the call.
@@ -1189,62 +1189,62 @@ H5C2_expunge_entry(H5F_t *              f,
 	if ( cache_ptr->trans_num > 0 ) {
 
 	    /* remove the entry from the transaction list if it is there */
-            H5C2__TRANS_DLL_REMOVE(entry_ptr, cache_ptr->tl_head_ptr, \
+            H5C__TRANS_DLL_REMOVE(entry_ptr, cache_ptr->tl_head_ptr, \
                                    cache_ptr->tl_tail_ptr, cache_ptr->tl_len, \
                                    cache_ptr->tl_size, FAIL);
 
             entry_ptr->last_trans = (uint64_t)0;
 
-            H5C2__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE(cache_ptr, \
+            H5C__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE(cache_ptr, \
                                                        entry_ptr, \
                                                        FAIL)
         }
     }
 
-    /* If we get this far, call H5C2_flush_single_entry() with the
-     * H5C2__FLUSH_INVALIDATE_FLAG and the H5C2__FLUSH_CLEAR_ONLY_FLAG.
+    /* If we get this far, call H5C_flush_single_entry() with the
+     * H5C__FLUSH_INVALIDATE_FLAG and the H5C__FLUSH_CLEAR_ONLY_FLAG.
      * This will clear the entry, and then delete it from the cache.
      */
 
-    result = H5C2_flush_single_entry(f,
+    result = H5C_flush_single_entry(f,
                                      dxpl_id,
                                      cache_ptr,
                                      entry_ptr->type,
                                      entry_ptr->addr,
-                                     H5C2__FLUSH_INVALIDATE_FLAG |
-				     H5C2__FLUSH_CLEAR_ONLY_FLAG,
+                                     H5C__FLUSH_INVALIDATE_FLAG |
+				     H5C__FLUSH_CLEAR_ONLY_FLAG,
                                      TRUE);
 
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, \
-                    "H5C2_flush_single_entry() failed.")
+                    "H5C_flush_single_entry() failed.")
     }
 
 done:
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-        if ( H5C2_validate_lru_list(cache_ptr) < 0 ) {
+#if H5C_DO_EXTREME_SANITY_CHECKS
+        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                             "LRU sanity check failed.\n");
         }
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-#if H5C2_PRINT_EXIT_POINTS
-    if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) {
+#if H5C_PRINT_EXIT_POINTS
+    if ( H5C_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) {
         HDfprintf(stdout, "%s: Exiting with result = %d.\n",
                   FUNC, (int)ret_value);
     }
-#endif /* H5C2_PRINT_EXIT_POINTS */
+#endif /* H5C_PRINT_EXIT_POINTS */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_expunge_entry() */
+} /* H5C_expunge_entry() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_flush_cache
+ * Function:    H5C_flush_cache
  *
  * Purpose:	Flush (and possibly destroy) the entries contained in the
  *		specified cache.
@@ -1281,24 +1281,24 @@ done:
  *
  *		JRM -- 1/6/05
  *		Reworked code to support the new
- *		H5C2__FLUSH_MARKED_ENTRIES_FLAG, and for the replacement of
- *		H5F_FLUSH_INVALIDATE flag with H5C2__FLUSH_INVALIDATE_FLAG.
+ *		H5C__FLUSH_MARKED_ENTRIES_FLAG, and for the replacement of
+ *		H5F_FLUSH_INVALIDATE flag with H5C__FLUSH_INVALIDATE_FLAG.
  *
- *		Note that the H5C2__FLUSH_INVALIDATE_FLAG takes precidence
- *		over the H5C2__FLUSH_MARKED_ENTRIES_FLAG.  Thus if both are
+ *		Note that the H5C__FLUSH_INVALIDATE_FLAG takes precidence
+ *		over the H5C__FLUSH_MARKED_ENTRIES_FLAG.  Thus if both are
  *		set, the functions behaves as if just the
- *		H5C2__FLUSH_INVALIDATE_FLAG was set.
+ *		H5C__FLUSH_INVALIDATE_FLAG was set.
  *
- *		The H5C2__FLUSH_CLEAR_ONLY_FLAG flag can co-exist with
- *		either the H5C2__FLUSH_MARKED_ENTRIES_FLAG, or the
- *		H5C2__FLUSH_INVALIDATE_FLAG.  In all cases, it is simply
- *		passed along to H5C2_flush_single_entry().  In the case of
- *		H5C2__FLUSH_MARKED_ENTRIES_FLAG, it will only apply to
+ *		The H5C__FLUSH_CLEAR_ONLY_FLAG flag can co-exist with
+ *		either the H5C__FLUSH_MARKED_ENTRIES_FLAG, or the
+ *		H5C__FLUSH_INVALIDATE_FLAG.  In all cases, it is simply
+ *		passed along to H5C_flush_single_entry().  In the case of
+ *		H5C__FLUSH_MARKED_ENTRIES_FLAG, it will only apply to
  *		the marked entries.
  *
  *		JRM -- 10/15/05
  *		Added code supporting the new
- *		H5C2__FLUSH_IGNORE_PROTECTED_FLAG.  We need this flag, as
+ *		H5C__FLUSH_IGNORE_PROTECTED_FLAG.  We need this flag, as
  *		we now use this function to flush large number of entries
  *		in increasing address order.  We do this by marking the
  *		entries to be flushed, calling this function to flush them,
@@ -1316,7 +1316,7 @@ done:
  *
  *		JRM -- 8/19/06
  *		Added code managing the new flush_in_progress field of
- *		H5C2_t.
+ *		H5C_t.
  *
  *		Also reworked function to allow for the possibility that
  *		entries will be dirtied, resized, or renamed during flush
@@ -1363,9 +1363,9 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
+H5C_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 {
-    H5C2_t *            cache_ptr;
+    H5C_t *            cache_ptr;
     herr_t              status;
     herr_t		ret_value = SUCCEED;
     hbool_t             destroy;
@@ -1376,37 +1376,37 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
     int32_t		passes = 0;
     int32_t		protected_entries = 0;
     H5SL_node_t * 	node_ptr = NULL;
-    H5C2_cache_entry_t *	entry_ptr = NULL;
-    H5C2_cache_entry_t *	next_entry_ptr = NULL;
-#if H5C2_DO_SANITY_CHECKS
+    H5C_cache_entry_t *	entry_ptr = NULL;
+    H5C_cache_entry_t *	next_entry_ptr = NULL;
+#if H5C_DO_SANITY_CHECKS
     int64_t		flushed_entries_count;
     size_t		flushed_entries_size;
     int64_t		initial_slist_len;
     size_t              initial_slist_size;
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
-    FUNC_ENTER_NOAPI(H5C2_flush_cache, FAIL)
+    FUNC_ENTER_NOAPI(H5C_flush_cache, FAIL)
 
-#if H5C2_PRINT_ENTRY_POINTS
+#if H5C_PRINT_ENTRY_POINTS
     HDfprintf(stdout, "%s: flags = 0x%x.\n", FUNC, flags);
-#endif /* H5C2_PRINT_ENTRY_POINTS */
+#endif /* H5C_PRINT_ENTRY_POINTS */
 
     HDassert( f );
     HDassert( f->shared );
 
-    cache_ptr = f->shared->cache2;
+    cache_ptr = f->shared->cache;
 
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->skip_file_checks || f);
     HDassert( cache_ptr->slist_ptr );
 
-    ignore_protected = ( (flags & H5C2__FLUSH_IGNORE_PROTECTED_FLAG) != 0 );
+    ignore_protected = ( (flags & H5C__FLUSH_IGNORE_PROTECTED_FLAG) != 0 );
 
-    destroy = ( (flags & H5C2__FLUSH_INVALIDATE_FLAG) != 0 );
+    destroy = ( (flags & H5C__FLUSH_INVALIDATE_FLAG) != 0 );
 
     /* note that flush_marked_entries is set to FALSE if destroy is TRUE */
-    flush_marked_entries = ( ( (flags & H5C2__FLUSH_MARKED_ENTRIES_FLAG) != 0 )
+    flush_marked_entries = ( ( (flags & H5C__FLUSH_MARKED_ENTRIES_FLAG) != 0 )
                              &&
                              ( ! destroy )
                            );
@@ -1417,12 +1417,12 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 
     if ( cache_ptr->mdj_enabled ) {
 
-        status = H5C2_journal_pre_flush(cache_ptr);
+        status = H5C_journal_pre_flush(cache_ptr);
 
 	if ( status != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-			"H5C2_journal_pre_flush() failed.")
+			"H5C_journal_pre_flush() failed.")
 	}
     }
 
@@ -1430,7 +1430,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 
     if ( destroy ) {
 
-        status = H5C2_flush_invalidate_cache(f,
+        status = H5C_flush_invalidate_cache(f,
                                              dxpl_id,
 					     cache_ptr,
 					     flags);
@@ -1452,7 +1452,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 
 	flushed_entries_last_pass = TRUE;
 
-        while ( ( passes < H5C2__MAX_PASSES_ON_FLUSH ) &&
+        while ( ( passes < H5C__MAX_PASSES_ON_FLUSH ) &&
 		( cache_ptr->slist_len != 0 ) &&
 		( protected_entries == 0 ) &&
 		( flushed_entries_last_pass ) )
@@ -1462,7 +1462,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 
 	    if ( node_ptr != NULL ) {
 
-		next_entry_ptr = (H5C2_cache_entry_t *)H5SL_item(node_ptr);
+		next_entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
 
                 if ( next_entry_ptr == NULL ) {
 
@@ -1471,7 +1471,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
                 }
 #ifndef NDEBUG
 		HDassert( next_entry_ptr->magic ==
-				H5C2__H5C2_CACHE_ENTRY_T_MAGIC );
+				H5C__H5C_CACHE_ENTRY_T_MAGIC );
 #endif /* NDEBUG */
                 HDassert( next_entry_ptr->is_dirty );
                 HDassert( next_entry_ptr->in_slist );
@@ -1484,7 +1484,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 
 	    HDassert( node_ptr != NULL );
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
 	    /* For sanity checking, try to verify that the skip list has
 	     * the expected size and number of entries at the end of each
 	     * internal while loop (see below).
@@ -1513,7 +1513,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 	     * our pass through the skip list.  To capture the number
 	     * of entries added, and the skip list size delta,
 	     * zero the slist_len_increase and slist_size_increase of
-	     * the cache's instance of H5C2_t.  These fields will be
+	     * the cache's instance of H5C_t.  These fields will be
 	     * updated elsewhere to account for slist insertions and/or
 	     * dirty entry size changes.
 	     */
@@ -1522,9 +1522,9 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 
 	    /* at the end of the loop, use these values to compute the
 	     * expected slist length and size and compare this with the
-	     * value recorded in the cache's instance of H5C2_t.
+	     * value recorded in the cache's instance of H5C_t.
 	     */
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
 	    while ( node_ptr != NULL )
 	    {
@@ -1559,7 +1559,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
                  * exit.
 		 */
 #ifndef NDEBUG
-		if ( entry_ptr->magic != H5C2__H5C2_CACHE_ENTRY_T_MAGIC ) {
+		if ( entry_ptr->magic != H5C__H5C_CACHE_ENTRY_T_MAGIC ) {
 
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                                 "entry_ptr->magic invalid ?!?!");
@@ -1583,7 +1583,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 
 	        if ( node_ptr != NULL ) {
 
-		    next_entry_ptr = (H5C2_cache_entry_t *)H5SL_item(node_ptr);
+		    next_entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
 
 		    if ( next_entry_ptr == NULL ) {
 
@@ -1592,7 +1592,7 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 		    }
 #ifndef NDEBUG
 		    HDassert( next_entry_ptr->magic ==
-				    H5C2__H5C2_CACHE_ENTRY_T_MAGIC );
+				    H5C__H5C_CACHE_ENTRY_T_MAGIC );
 #endif /* NDEBUG */
                     HDassert( next_entry_ptr->is_dirty );
                     HDassert( next_entry_ptr->in_slist );
@@ -1627,11 +1627,11 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 				       * and/or a test to see if the entry
 				       * is in flushable condition here.
                                        */
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
                             flushed_entries_count++;
 			    flushed_entries_size += entry_ptr->size;
-#endif /* H5C2_DO_SANITY_CHECKS */
-                            status = H5C2_flush_single_entry(f,
+#endif /* H5C_DO_SANITY_CHECKS */
+                            status = H5C_flush_single_entry(f,
                                                              dxpl_id,
                                                              cache_ptr,
                                                              entry_ptr->type,
@@ -1649,11 +1649,11 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
 			    flushed_entries_last_pass = TRUE;
 			}
                     } else {
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
                         flushed_entries_count++;
 			flushed_entries_size += entry_ptr->size;
-#endif /* H5C2_DO_SANITY_CHECKS */
-                        status = H5C2_flush_single_entry(f,
+#endif /* H5C_DO_SANITY_CHECKS */
+                        status = H5C_flush_single_entry(f,
                                                          dxpl_id,
                                                          cache_ptr,
                                                          entry_ptr->type,
@@ -1673,14 +1673,14 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
                 }
             } /* while ( node_ptr != NULL ) */
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
             /* Verify that the slist size and length are as expected. */
 
 	    HDassert( (initial_slist_len + cache_ptr->slist_len_increase -
                        flushed_entries_count) == cache_ptr->slist_len );
 	    HDassert( (initial_slist_size + cache_ptr->slist_size_increase -
 		       flushed_entries_size) == cache_ptr->slist_size );
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
 	    passes++;
 
@@ -1697,31 +1697,31 @@ H5C2_flush_cache(H5F_t *f, hid_t    dxpl_id, unsigned flags)
         }
 
 	if ( ( cache_ptr->slist_len != 0 ) &&
-	     ( passes >= H5C2__MAX_PASSES_ON_FLUSH ) ) {
+	     ( passes >= H5C__MAX_PASSES_ON_FLUSH ) ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
 		        "flush pass limit exceeded.")
 	}
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
         if ( ! flush_marked_entries ) {
 
             HDassert( cache_ptr->slist_len == 0 );
             HDassert( cache_ptr->slist_size == 0 );
         }
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
     }
 
     if ( cache_ptr->mdj_enabled ) {
 
-        status = H5C2_journal_post_flush(f, dxpl_id, cache_ptr,
+        status = H5C_journal_post_flush(f, dxpl_id, cache_ptr,
 			              (hbool_t)(flush_marked_entries == FALSE));
 
 	if ( status != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, \
-			"H5C2_journal_post_flush() failed.")
+			"H5C_journal_post_flush() failed.")
 	}
     }
 
@@ -1729,18 +1729,18 @@ done:
 
     cache_ptr->flush_in_progress = FALSE;
 
-#if H5C2_PRINT_EXIT_POINTS
+#if H5C_PRINT_EXIT_POINTS
     HDfprintf(stdout, "%s: Exiting with result = %d.\n",
               FUNC, (int)ret_value);
-#endif /* H5C2_PRINT_EXIT_POINTS */
+#endif /* H5C_PRINT_EXIT_POINTS */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_flush_cache() */
+} /* H5C_flush_cache() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_flush_to_min_clean
+ * Function:    H5C_flush_to_min_clean
  *
  * Purpose:	Flush dirty entries until the caches min clean size is
  *		attained.
@@ -1772,7 +1772,7 @@ done:
  *		flags, and recording their addresses in the order
  *		encountered.
  *
- *		Then call H5C2_flush_cache() to flush the marked entries.
+ *		Then call H5C_flush_cache() to flush the marked entries.
  *
  *		Finally, use the list of marked entries to force the
  *		correct LRU list order after the flush.
@@ -1798,10 +1798,10 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C2_flush_to_min_clean(H5F_t * f,
+H5C_flush_to_min_clean(H5F_t * f,
 		        hid_t    dxpl_id)
 {
-    H5C2_t *            cache_ptr;
+    H5C_t *            cache_ptr;
     herr_t      	result;
     herr_t		ret_value = SUCCEED;
     hbool_t		write_permitted;
@@ -1811,18 +1811,18 @@ H5C2_flush_to_min_clean(H5F_t * f,
     size_t		flushed_entries_size = 0;
     size_t		space_needed = 0;
     haddr_t	      * flushed_entries_list = NULL;
-    H5C2_cache_entry_t *	entry_ptr = NULL;
+    H5C_cache_entry_t *	entry_ptr = NULL;
 #endif /* JRM */
 
-    FUNC_ENTER_NOAPI(H5C2_flush_to_min_clean, FAIL)
+    FUNC_ENTER_NOAPI(H5C_flush_to_min_clean, FAIL)
 
     HDassert( f );
     HDassert( f->shared );
 
-    cache_ptr = f->shared->cache2;
+    cache_ptr = f->shared->cache;
 
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->skip_file_checks || f );
 
     if ( cache_ptr->check_write_permitted != NULL ) {
@@ -1847,7 +1847,7 @@ H5C2_flush_to_min_clean(H5F_t * f,
                     "cache write is not permitted!?!\n");
     }
 #if 1 /* original code */
-    result = H5C2_make_space_in_cache(f,
+    result = H5C_make_space_in_cache(f,
                                       dxpl_id,
                                       cache_ptr,
                                       (size_t)0,
@@ -1856,7 +1856,7 @@ H5C2_flush_to_min_clean(H5F_t * f,
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_make_space_in_cache failed.")
+                    "H5C_make_space_in_cache failed.")
     }
 #else /* modified code -- commented out for now */
     if ( cache_ptr->max_cache_size > cache_ptr->index_size ) {
@@ -1930,13 +1930,13 @@ H5C2_flush_to_min_clean(H5F_t * f,
 
 
         /* Flush the marked entries */
-	result = H5C2_flush_cache(f, primary_dxpl_id, secondary_dxpl_id,
-                                 cache_ptr, H5C2__FLUSH_MARKED_ENTRIES_FLAG |
-                                 H5C2__FLUSH_IGNORE_PROTECTED_FLAG);
+	result = H5C_flush_cache(f, primary_dxpl_id, secondary_dxpl_id,
+                                 cache_ptr, H5C__FLUSH_MARKED_ENTRIES_FLAG |
+                                 H5C__FLUSH_IGNORE_PROTECTED_FLAG);
 
         if ( result < 0 ) {
 
-            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C2_flush_cache failed.")
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_flush_cache failed.")
         }
 
         /* Now touch up the LRU list so as to place the flushed entries in
@@ -1947,7 +1947,7 @@ H5C2_flush_to_min_clean(H5F_t * f,
         i = 0;
         while ( i < flushed_entries_count )
         {
-            H5C2__SEARCH_INDEX_NO_STATS(cache_ptr, flushed_entries_list[i], \
+            H5C__SEARCH_INDEX_NO_STATS(cache_ptr, flushed_entries_list[i], \
                                        entry_ptr, FAIL)
 
 	    /* At present, the above search must always succeed.  However,
@@ -1955,7 +1955,7 @@ H5C2_flush_to_min_clean(H5F_t * f,
              * following assert in that event.
              */
             HDassert( entry_ptr != NULL );
-            H5C2__FAKE_RP_FOR_MOST_RECENT_ACCESS(cache_ptr, entry_ptr, FAIL)
+            H5C__FAKE_RP_FOR_MOST_RECENT_ACCESS(cache_ptr, entry_ptr, FAIL)
             i++;
         }
     } /* if ( space_needed > 0 ) */
@@ -1965,14 +1965,14 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_flush_to_min_clean() */
+} /* H5C_flush_to_min_clean() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_get_cache_auto_resize_config
+ * Function:    H5C_get_cache_auto_resize_config
  *
  * Purpose:	Copy the current configuration of the cache automatic
- *		re-sizing function into the instance of H5C2_auto_size_ctl_t
+ *		re-sizing function into the instance of H5C_auto_size_ctl_t
  *		pointed to by config_ptr.
  *
  * Return:      SUCCEED on success, and FAIL on failure.
@@ -1988,14 +1988,14 @@ done:
  */
 
 herr_t
-H5C2_get_cache_auto_resize_config(const H5C2_t * cache_ptr,
-                                  H5C2_auto_size_ctl_t *config_ptr)
+H5C_get_cache_auto_resize_config(const H5C_t * cache_ptr,
+                                  H5C_auto_size_ctl_t *config_ptr)
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_get_cache_auto_resize_config, FAIL)
+    FUNC_ENTER_NOAPI(H5C_get_cache_auto_resize_config, FAIL)
 
-    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) {
+    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
     }
@@ -2014,11 +2014,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_get_cache_auto_resize_config() */
+} /* H5C_get_cache_auto_resize_config() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_get_cache_size
+ * Function:    H5C_get_cache_size
  *
  * Purpose:	Return the cache maximum size, the minimum clean size, the
  *		current size, and the current number of entries in
@@ -2039,7 +2039,7 @@ done:
  */
 
 herr_t
-H5C2_get_cache_size(H5C2_t * cache_ptr,
+H5C_get_cache_size(H5C_t * cache_ptr,
                     size_t * max_size_ptr,
                     size_t * min_clean_size_ptr,
                     size_t * cur_size_ptr,
@@ -2047,9 +2047,9 @@ H5C2_get_cache_size(H5C2_t * cache_ptr,
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_get_cache_size, FAIL)
+    FUNC_ENTER_NOAPI(H5C_get_cache_size, FAIL)
 
-    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) {
+    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
     }
@@ -2078,11 +2078,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_get_cache_size() */
+} /* H5C_get_cache_size() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_get_cache_hit_rate
+ * Function:    H5C_get_cache_hit_rate
  *
  * Purpose:	Compute and return the current cache hit rate in
  *              *hit_rate_ptr.  If there have been no accesses since the
@@ -2103,15 +2103,15 @@ done:
  */
 
 herr_t
-H5C2_get_cache_hit_rate(H5C2_t * cache_ptr,
+H5C_get_cache_hit_rate(H5C_t * cache_ptr,
                         double * hit_rate_ptr)
 
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_get_cache_hit_rate, FAIL)
+    FUNC_ENTER_NOAPI(H5C_get_cache_hit_rate, FAIL)
 
-    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) {
+    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
     }
@@ -2138,12 +2138,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_get_cache_hit_rate() */
+} /* H5C_get_cache_hit_rate() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2_get_entry_status
+ * Function:    H5C_get_entry_status
  *
  * Purpose:     This function is used to determine whether the cache
  *		contains an entry with the specified base address.  If
@@ -2170,7 +2170,7 @@ done:
  */
 
 herr_t
-H5C2_get_entry_status(const H5F_t *  f,
+H5C_get_entry_status(const H5F_t *  f,
                       haddr_t   addr,
                       size_t *  size_ptr,
                       hbool_t * in_cache_ptr,
@@ -2178,31 +2178,31 @@ H5C2_get_entry_status(const H5F_t *  f,
                       hbool_t * is_protected_ptr,
 		      hbool_t * is_pinned_ptr)
 {
-    H5C2_t *                    cache_ptr;
+    H5C_t *                    cache_ptr;
     herr_t			ret_value = SUCCEED;      /* Return value */
-    H5C2_cache_entry_t *	entry_ptr = NULL;
+    H5C_cache_entry_t *	entry_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5C2_get_entry_status, FAIL)
+    FUNC_ENTER_NOAPI(H5C_get_entry_status, FAIL)
 
     HDassert( f );
     HDassert( f->shared );
 
-    cache_ptr = f->shared->cache2;
+    cache_ptr = f->shared->cache;
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( H5F_addr_defined(addr) );
     HDassert( in_cache_ptr != NULL );
 
     /* this test duplicates two of the above asserts, but we need an
      * invocation of HGOTO_ERROR to keep the compiler happy.
      */
-    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) {
+    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
     }
 
-    H5C2__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
+    H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
 
     if ( entry_ptr == NULL ) {
 
@@ -2240,11 +2240,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_get_entry_status() */
+} /* H5C_get_entry_status() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_get_evictions_enabled()
+ * Function:    H5C_get_evictions_enabled()
  *
  * Purpose:     Copy the current value of cache_ptr->evictions_enabled into
  *              *evictions_enabled_ptr.
@@ -2262,15 +2262,15 @@ done:
  */
 
 herr_t
-H5C2_get_evictions_enabled(const H5C2_t *  cache_ptr,
+H5C_get_evictions_enabled(const H5C_t *  cache_ptr,
                            hbool_t * evictions_enabled_ptr)
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_get_evictions_enabled, FAIL)
+    FUNC_ENTER_NOAPI(H5C_get_evictions_enabled, FAIL)
 
     if ( ( cache_ptr == NULL ) ||
-         ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) {
+         ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
     }
@@ -2287,11 +2287,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_get_evictions_enabled() */
+} /* H5C_get_evictions_enabled() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_get_trace_file_ptr
+ * Function:    H5C_get_trace_file_ptr
  *
  * Purpose:     Get the trace_file_ptr field from the cache.
  *
@@ -2307,22 +2307,22 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C2_get_trace_file_ptr(const H5C2_t *cache_ptr, FILE **trace_file_ptr_ptr)
+H5C_get_trace_file_ptr(const H5C_t *cache_ptr, FILE **trace_file_ptr_ptr)
 {
-    FUNC_ENTER_NOAPI_NOFUNC(H5C2_get_trace_file_ptr)
+    FUNC_ENTER_NOAPI_NOFUNC(H5C_get_trace_file_ptr)
 
     HDassert(cache_ptr);
-    HDassert(cache_ptr->magic == H5C2__H5C2_T_MAGIC);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
     HDassert(trace_file_ptr_ptr);
 
     *trace_file_ptr_ptr = cache_ptr->trace_file_ptr;
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5C2_get_trace_file_ptr() */
+} /* H5C_get_trace_file_ptr() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_get_trace_file_ptr_from_entry
+ * Function:    H5C_get_trace_file_ptr_from_entry
  *
  * Purpose:     Get the trace_file_ptr field from the cache, via an entry.
  *
@@ -2338,23 +2338,23 @@ H5C2_get_trace_file_ptr(const H5C2_t *cache_ptr, FILE **trace_file_ptr_ptr)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C2_get_trace_file_ptr_from_entry(const H5C2_cache_entry_t *entry_ptr,
+H5C_get_trace_file_ptr_from_entry(const H5C_cache_entry_t *entry_ptr,
     FILE ** trace_file_ptr_ptr)
 {
-    FUNC_ENTER_NOAPI_NOFUNC(H5C2_get_trace_file_ptr_from_entry)
+    FUNC_ENTER_NOAPI_NOFUNC(H5C_get_trace_file_ptr_from_entry)
 
     /* Sanity checks */
     HDassert(entry_ptr);
     HDassert(entry_ptr->cache_ptr);
 
-    H5C2_get_trace_file_ptr(entry_ptr->cache_ptr, trace_file_ptr_ptr);
+    H5C_get_trace_file_ptr(entry_ptr->cache_ptr, trace_file_ptr_ptr);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5C2_get_trace_file_ptr_from_entry() */
+} /* H5C_get_trace_file_ptr_from_entry() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_insert_entry
+ * Function:    H5C_insert_entry
  *
  * Purpose:     Adds the specified thing to the cache.  The thing need not
  *              exist on disk yet, but it must have an address and disk
@@ -2389,29 +2389,29 @@ H5C2_get_trace_file_ptr_from_entry(const H5C2_cache_entry_t *entry_ptr,
  *
  *		JRM -- 11/22/04
  *		Updated function for the addition of the first_flush_ptr
- *		parameter to H5C2_make_space_in_cache().
+ *		parameter to H5C_make_space_in_cache().
  *
  *		JRM -- 1/6/05
  *		Added the flags parameter, and code supporting
- *		H5C2__SET_FLUSH_MARKER_FLAG.  Note that this flag is
+ *		H5C__SET_FLUSH_MARKER_FLAG.  Note that this flag is
  *		ignored unless the new entry is dirty.
  *
  *		JRM -- 6/6/05
  *		Added code to force all inserted entries to be dirty.
  *		This is part of a set of changes moving management of the
- *		is_dirty field of H5C2_cache_entry_t into the H5C2 code.
+ *		is_dirty field of H5C_cache_entry_t into the H5C code.
  *
  *		JRM -- 6/24/05
  *		Added support for the new write_permitted field of
- *		the H5C2_t structure.
+ *		the H5C_t structure.
  *
  *		JRM -- 3/16/06
  *		Added initialization for the new is_pinned field of the
- *		H5C2_cache_entry_t structure.
+ *		H5C_cache_entry_t structure.
  *
  *		JRM -- 5/3/06
  *		Added initialization for the new dirtied field of the
- *		H5C2_cache_entry_t structure.
+ *		H5C_cache_entry_t structure.
  *
  *		JRM -- 8/9/06
  *		Added code supporting insertion of pinned entries.
@@ -2451,27 +2451,27 @@ H5C2_get_trace_file_ptr_from_entry(const H5C2_cache_entry_t *entry_ptr,
  */
 
 herr_t
-H5C2_insert_entry(H5F_t *              f,
+H5C_insert_entry(H5F_t *              f,
                   hid_t		       dxpl_id,
-                  const H5C2_class_t * type,
+                  const H5C_class_t * type,
                   haddr_t 	       addr,
 		  size_t               len,
                   void *	       thing,
                   unsigned int         flags)
 {
-    H5C2_t *                    cache_ptr;
+    H5C_t *                    cache_ptr;
     herr_t			result;
     herr_t			ret_value = SUCCEED;    /* Return value */
     hbool_t			insert_pinned;
     hbool_t             	set_flush_marker;
     hbool_t			write_permitted = TRUE;
-    H5C2_cache_entry_t *	entry_ptr;
-    H5C2_cache_entry_t *	test_entry_ptr;
+    H5C_cache_entry_t *	entry_ptr;
+    H5C_cache_entry_t *	test_entry_ptr;
 
-    FUNC_ENTER_NOAPI(H5C2_insert_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5C_insert_entry, FAIL)
 
-#if H5C2_PRINT_ENTRY_POINTS
-    if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) )
+#if H5C_PRINT_ENTRY_POINTS
+    if ( H5C_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) )
     {
         HDfprintf(stdout, "%s: addr = 0x%lX, len = %d, type = %s.\n", FUNC,
 	          (unsigned long)addr, (int)len, type->name);
@@ -2481,10 +2481,10 @@ H5C2_insert_entry(H5F_t *              f,
     HDassert( f );
     HDassert( f->shared );
 
-    cache_ptr = f->shared->cache2;
+    cache_ptr = f->shared->cache;
 
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->skip_file_checks || f );
     HDassert( ( ! ( cache_ptr->mdj_enabled ) ) ||
               ( cache_ptr->trans_in_progress ) );
@@ -2492,27 +2492,27 @@ H5C2_insert_entry(H5F_t *              f,
     HDassert( H5F_addr_defined(addr) );
     HDassert( thing );
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-    if ( H5C2_verify_not_in_index(cache_ptr, (H5C2_cache_entry_t *)thing) < 0 ) {
+#if H5C_DO_EXTREME_SANITY_CHECKS
+    if ( H5C_verify_not_in_index(cache_ptr, (H5C_cache_entry_t *)thing) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "thing already in index.\n");
     }
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-    if ( H5C2_validate_lru_list(cache_ptr) < 0 ) {
+#if H5C_DO_EXTREME_SANITY_CHECKS
+    if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                         "LRU sanity check failed.\n");
     }
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-    set_flush_marker = ( (flags & H5C2__SET_FLUSH_MARKER_FLAG) != 0 );
-    insert_pinned    = ( (flags & H5C2__PIN_ENTRY_FLAG) != 0 );
+    set_flush_marker = ( (flags & H5C__SET_FLUSH_MARKER_FLAG) != 0 );
+    insert_pinned    = ( (flags & H5C__PIN_ENTRY_FLAG) != 0 );
 
-    entry_ptr = (H5C2_cache_entry_t *)thing;
+    entry_ptr = (H5C_cache_entry_t *)thing;
 #ifndef NDEBUG
-    entry_ptr->magic = H5C2__H5C2_CACHE_ENTRY_T_MAGIC;
+    entry_ptr->magic = H5C__H5C_CACHE_ENTRY_T_MAGIC;
 #endif /* NDEBUG */
     entry_ptr->cache_ptr = cache_ptr;
     entry_ptr->addr  = addr;
@@ -2529,7 +2529,7 @@ H5C2_insert_entry(H5F_t *              f,
 
     entry_ptr->size = len;
 
-    HDassert( entry_ptr->size < H5C2_MAX_ENTRY_SIZE );
+    HDassert( entry_ptr->size < H5C_MAX_ENTRY_SIZE );
 
     entry_ptr->in_slist = FALSE;
 
@@ -2553,18 +2553,18 @@ H5C2_insert_entry(H5F_t *              f,
     entry_ptr->trans_next = NULL;
     entry_ptr->trans_prev = NULL;
 
-    H5C2__RESET_CACHE_ENTRY_STATS(entry_ptr)
+    H5C__RESET_CACHE_ENTRY_STATS(entry_ptr)
 
     if ( ( cache_ptr->flash_size_increase_possible ) &&
          ( entry_ptr->size > cache_ptr->flash_size_increase_threshold ) ) {
 
-        result = H5C2__flash_increase_cache_size(cache_ptr, 0,
+        result = H5C__flash_increase_cache_size(cache_ptr, 0,
 			                         entry_ptr->size);
 
         if ( result < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, \
-                        "H5C2__flash_increase_cache_size failed.")
+                        "H5C__flash_increase_cache_size failed.")
         }
     }
 
@@ -2592,7 +2592,7 @@ H5C2_insert_entry(H5F_t *              f,
             write_permitted = cache_ptr->write_permitted;
         }
 
-        HDassert( entry_ptr->size <= H5C2_MAX_ENTRY_SIZE );
+        HDassert( entry_ptr->size <= H5C_MAX_ENTRY_SIZE );
 
         space_needed = entry_ptr->size;
 
@@ -2603,7 +2603,7 @@ H5C2_insert_entry(H5F_t *              f,
 
         /* Note that space_needed is just the amount of space that
          * needed to insert the new entry without exceeding the cache
-         * size limit.  The subsequent call to H5C2_make_space_in_cache()
+         * size limit.  The subsequent call to H5C_make_space_in_cache()
          * may evict the entries required to free more or less space
          * depending on conditions.  It MAY be less if the cache is
          * currently undersized, or more if the cache is oversized.
@@ -2626,7 +2626,7 @@ H5C2_insert_entry(H5F_t *              f,
          * no point in worrying about the third.
          */
 
-        result = H5C2_make_space_in_cache(f,
+        result = H5C_make_space_in_cache(f,
                                           dxpl_id,
                                           cache_ptr,
                                           space_needed,
@@ -2635,7 +2635,7 @@ H5C2_insert_entry(H5F_t *              f,
         if ( result < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, \
-                        "H5C2_make_space_in_cache failed.")
+                        "H5C_make_space_in_cache failed.")
         }
     }
 
@@ -2643,7 +2643,7 @@ H5C2_insert_entry(H5F_t *              f,
      * and die if it is.
      */
 
-    H5C2__SEARCH_INDEX(cache_ptr, addr, test_entry_ptr, FAIL)
+    H5C__SEARCH_INDEX(cache_ptr, addr, test_entry_ptr, FAIL)
 
     if ( test_entry_ptr != NULL ) {
 
@@ -2671,7 +2671,7 @@ H5C2_insert_entry(H5F_t *              f,
 
     entry_ptr->is_pinned = insert_pinned;
 
-    H5C2__INSERT_IN_INDEX(cache_ptr, entry_ptr, FAIL)
+    H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, FAIL)
 
     /* New entries are presumed to be dirty, so this if statement is
      * unnecessary.  Rework it once the rest of the code changes are
@@ -2680,7 +2680,7 @@ H5C2_insert_entry(H5F_t *              f,
     if ( entry_ptr->is_dirty ) {
 
         entry_ptr->flush_marker = set_flush_marker;
-        H5C2__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+        H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
 
     } else {
 
@@ -2688,54 +2688,54 @@ H5C2_insert_entry(H5F_t *              f,
     }
 
     /* insert the entry in the transaction list if journaling is enabled */
-    H5C2__INSERT_ENTRY_IN_TL(cache_ptr, entry_ptr, FAIL);
+    H5C__INSERT_ENTRY_IN_TL(cache_ptr, entry_ptr, FAIL);
 
-    H5C2__UPDATE_RP_FOR_INSERTION(cache_ptr, entry_ptr, FAIL)
+    H5C__UPDATE_RP_FOR_INSERTION(cache_ptr, entry_ptr, FAIL)
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-    if ( H5C2_validate_lru_list(cache_ptr) < 0 ) {
+#if H5C_DO_EXTREME_SANITY_CHECKS
+    if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                         "LRU sanity check failed.\n");
     }
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-    H5C2__UPDATE_STATS_FOR_INSERTION(cache_ptr, entry_ptr)
+    H5C__UPDATE_STATS_FOR_INSERTION(cache_ptr, entry_ptr)
 
 done:
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-    if ( H5C2_validate_lru_list(cache_ptr) < 0 ) {
+#if H5C_DO_EXTREME_SANITY_CHECKS
+    if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                         "LRU sanity check failed.\n");
     }
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-#if H5C2_PRINT_EXIT_POINTS
-    if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) {
+#if H5C_PRINT_EXIT_POINTS
+    if ( H5C_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) {
         HDfprintf(stdout, "%s: Exiting with result = %d.\n",
                   FUNC, (int)ret_value);
     }
-#endif /* H5C2_PRINT_EXIT_POINTS */
+#endif /* H5C_PRINT_EXIT_POINTS */
 
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_insert_entry() */
+} /* H5C_insert_entry() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2_mark_entries_as_clean
+ * Function:    H5C_mark_entries_as_clean
  *
- * Purpose:     When the H5C2 code is used to implement the metadata caches
+ * Purpose:     When the H5C code is used to implement the metadata caches
  *		in PHDF5, only the cache with MPI_rank 0 is allowed to
  *		actually write entries to disk -- all other caches must
  *		retain dirty entries until they are advised that the
  *		entries are clean.
  *
- *		This function exists to allow the H5C2 code to receive these
+ *		This function exists to allow the H5C code to receive these
  *		notifications.
  *
  *		The function receives a list of entry base addresses
@@ -2745,7 +2745,7 @@ done:
  *
  *		The function scans the list of entries and flushes all
  *		those that are currently unprotected with the
- *		H5C2__FLUSH_CLEAR_ONLY_FLAG.  Those that are currently
+ *		H5C__FLUSH_CLEAR_ONLY_FLAG.  Those that are currently
  *		protected are flagged for clearing when they are
  *		unprotected.
  *
@@ -2787,7 +2787,7 @@ done:
  *		situation will be even worse, as the changes will only
  *		exist on process 0.
  *
- *		Bottom line -- the calls to H5C2_flush_single_entry()
+ *		Bottom line -- the calls to H5C_flush_single_entry()
  *		in this function will not call serialize, thus no change
  *		in the LRU is possible.  Even if they did, the serialize()
  *		callbacks are banned from making such changes in the
@@ -2798,52 +2798,52 @@ done:
 
 #ifdef H5_HAVE_PARALLEL
 herr_t
-H5C2_mark_entries_as_clean(H5F_t *  f,
+H5C_mark_entries_as_clean(H5F_t *  f,
                            hid_t     dxpl_id,
                            int32_t   ce_array_len,
                            haddr_t * ce_array_ptr)
 {
-    H5C2_t *            cache_ptr;
+    H5C_t *            cache_ptr;
     herr_t		ret_value = SUCCEED;      /* Return value */
     int			entries_cleared;
     int			entries_examined;
     int                 i;
     int			initial_list_len;
     haddr_t		addr;
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
     int			pinned_entries_marked = 0;
     int			protected_entries_marked = 0;
     int			other_entries_marked = 0;
     haddr_t		last_addr;
-#endif /* H5C2_DO_SANITY_CHECKS */
-    H5C2_cache_entry_t *	clear_ptr = NULL;
-    H5C2_cache_entry_t *	entry_ptr = NULL;
+#endif /* H5C_DO_SANITY_CHECKS */
+    H5C_cache_entry_t *	clear_ptr = NULL;
+    H5C_cache_entry_t *	entry_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5C2_mark_entries_as_clean, FAIL)
+    FUNC_ENTER_NOAPI(H5C_mark_entries_as_clean, FAIL)
 
     HDassert( f );
     HDassert( f->shared );
-    cache_ptr = f->shared->cache2;
+    cache_ptr = f->shared->cache;
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     HDassert( ce_array_len > 0 );
     HDassert( ce_array_ptr != NULL );
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-        if ( H5C2_validate_lru_list(cache_ptr) < 0 ) {
+#if H5C_DO_EXTREME_SANITY_CHECKS
+        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
 
                 HDassert(0);
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                             "LRU sanity check failed.\n");
         }
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
     for ( i = 0; i < ce_array_len; i++ )
     {
         addr = ce_array_ptr[i];
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
         if ( i == 0 ) {
 
             last_addr = addr;
@@ -2862,37 +2862,37 @@ H5C2_mark_entries_as_clean(H5F_t *  f,
             }
         }
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-        if ( H5C2_validate_lru_list(cache_ptr) < 0 ) {
+#if H5C_DO_EXTREME_SANITY_CHECKS
+        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
 
                 HDassert(0);
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                             "LRU sanity check failed.\n");
         }
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
         HDassert( H5F_addr_defined(addr) );
 
-        H5C2__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
+        H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
 
         if ( entry_ptr == NULL ) {
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
 	    HDfprintf(stdout,
-                  "H5C2_mark_entries_as_clean: entry[%d] = %ld not in cache.\n",
+                  "H5C_mark_entries_as_clean: entry[%d] = %ld not in cache.\n",
                       (int)i,
                       (long)addr);
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                         "Listed entry not in cache?!?!?.")
 
         } else if ( ! entry_ptr->is_dirty ) {
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
 	    HDfprintf(stdout,
-                      "H5C2_mark_entries_as_clean: entry %ld is not dirty!?!\n",
+                      "H5C_mark_entries_as_clean: entry %ld is not dirty!?!\n",
                       (long)addr);
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                         "Listed entry not dirty?!?!?.")
 #if 0 /* original code */
@@ -2902,12 +2902,12 @@ H5C2_mark_entries_as_clean(H5F_t *  f,
 
         } else {
 
-            if ( H5C2_flush_single_entry(f,
+            if ( H5C_flush_single_entry(f,
                                          dxpl_id,
                                          cache_ptr,
                                          entry_ptr->type,
                                          addr,
-                                         H5C2__FLUSH_CLEAR_ONLY_FLAG,
+                                         H5C__FLUSH_CLEAR_ONLY_FLAG,
                                          TRUE) < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't clear entry.")
@@ -2920,7 +2920,7 @@ H5C2_mark_entries_as_clean(H5F_t *  f,
              * not currently protected.
              */
             entry_ptr->clear_on_unprotect = TRUE;
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
 	    if ( entry_ptr->is_protected ) {
 
 		protected_entries_marked++;
@@ -2933,7 +2933,7 @@ H5C2_mark_entries_as_clean(H5F_t *  f,
 
 		other_entries_marked++;
 	    }
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
         }
 #endif /* end modified code */
     }
@@ -2960,12 +2960,12 @@ H5C2_mark_entries_as_clean(H5F_t *  f,
             entry_ptr = entry_ptr->prev;
             entries_cleared++;
 
-            if ( H5C2_flush_single_entry(f,
+            if ( H5C_flush_single_entry(f,
                                          dxpl_id,
                                          cache_ptr,
                                          clear_ptr->type,
                                          clear_ptr->addr,
-                                         H5C2__FLUSH_CLEAR_ONLY_FLAG,
+                                         H5C__FLUSH_CLEAR_ONLY_FLAG,
                                          TRUE) < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't clear entry.")
@@ -2977,9 +2977,9 @@ H5C2_mark_entries_as_clean(H5F_t *  f,
         entries_examined++;
     }
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
     HDassert( entries_cleared == other_entries_marked );
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
     /* It is also possible that some of the cleared entries are on the
      * pinned list.  Must scan that also.
@@ -2996,12 +2996,12 @@ H5C2_mark_entries_as_clean(H5F_t *  f,
             entry_ptr = entry_ptr->next;
             entries_cleared++;
 
-            if ( H5C2_flush_single_entry(f,
+            if ( H5C_flush_single_entry(f,
                                          dxpl_id,
                                          cache_ptr,
                                          clear_ptr->type,
                                          clear_ptr->addr,
-                                         H5C2__FLUSH_CLEAR_ONLY_FLAG,
+                                         H5C__FLUSH_CLEAR_ONLY_FLAG,
                                          TRUE) < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't clear entry.")
@@ -3012,15 +3012,15 @@ H5C2_mark_entries_as_clean(H5F_t *  f,
         }
     }
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
     HDassert( entries_cleared == pinned_entries_marked + other_entries_marked );
     HDassert( entries_cleared + protected_entries_marked == ce_array_len );
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
     HDassert( ( entries_cleared == ce_array_len ) ||
               ( (ce_array_len - entries_cleared) <= cache_ptr->pl_len ) );
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
     i = 0;
     entry_ptr = cache_ptr->pl_head_ptr;
     while ( entry_ptr != NULL )
@@ -3032,28 +3032,28 @@ H5C2_mark_entries_as_clean(H5F_t *  f,
         entry_ptr = entry_ptr->next;
     }
     HDassert( (entries_cleared + i) == ce_array_len );
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 #endif /* modified code */
 
 done:
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-        if ( H5C2_validate_lru_list(cache_ptr) < 0 ) {
+#if H5C_DO_EXTREME_SANITY_CHECKS
+        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
 
                 HDassert(0);
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                             "LRU sanity check failed.\n");
         }
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_mark_entries_as_clean() */
+} /* H5C_mark_entries_as_clean() */
 #endif /* H5_HAVE_PARALLEL */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_mark_pinned_entry_dirty
+ * Function:    H5C_mark_pinned_entry_dirty
  *
  * Purpose:	Mark a pinned entry as dirty.  The target entry MUST be
  * 		be pinned, and MUST be unprotected.
@@ -3072,26 +3072,26 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C2_mark_pinned_entry_dirty(void *thing, hbool_t size_changed, size_t new_size)
+H5C_mark_pinned_entry_dirty(void *thing, hbool_t size_changed, size_t new_size)
 {
-    H5C2_t *            cache_ptr;
-    H5C2_cache_entry_t * entry_ptr = (H5C2_cache_entry_t *)thing;
+    H5C_t *            cache_ptr;
+    H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing;
     size_t              size_increase;
     herr_t              result;
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_mark_pinned_entry_dirty, FAIL)
+    FUNC_ENTER_NOAPI(H5C_mark_pinned_entry_dirty, FAIL)
 
     /* Sanity checks */
     HDassert(entry_ptr);
     HDassert(H5F_addr_defined(entry_ptr->addr));
     cache_ptr = entry_ptr->cache_ptr;
     HDassert(cache_ptr);
-    HDassert(cache_ptr->magic == H5C2__H5C2_T_MAGIC);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
     HDassert((!cache_ptr->mdj_enabled) || cache_ptr->trans_in_progress);
 
-#if H5C2_PRINT_ENTRY_POINTS
-    if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
+#if H5C_PRINT_ENTRY_POINTS
+    if(H5C_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
         HDfprintf(stdout,
                   "%s: addr = 0x%lX, size_changed = %d, new_size = %d.\n",
 	          FUNC, (unsigned long)(entry_ptr->addr), (int)size_changed,
@@ -3124,36 +3124,36 @@ H5C2_mark_pinned_entry_dirty(void *thing, hbool_t size_changed, size_t new_size)
 
                 if ( size_increase >=
                         cache_ptr->flash_size_increase_threshold ) {
-                    if(H5C2__flash_increase_cache_size(cache_ptr, entry_ptr->size, new_size) < 0)
+                    if(H5C__flash_increase_cache_size(cache_ptr, entry_ptr->size, new_size) < 0)
                         HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "flash cache increase failed")
                 }
             }
         }
 
         /* update the pinned entry list */
-        H5C2__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr->pel_len), \
+        H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr->pel_len), \
                                          (cache_ptr->pel_size), \
                                          (entry_ptr->size), (new_size));
 
         /* update the hash table */
-	H5C2__UPDATE_INDEX_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size),\
+	H5C__UPDATE_INDEX_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size),\
                                           (new_size));
 
         /* if the entry is in the skip list, update that too */
         if ( entry_ptr->in_slist ) {
 
-	    H5C2__UPDATE_SLIST_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size),\
+	    H5C__UPDATE_SLIST_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size),\
                                               (new_size));
         }
 
 	/* if journaling is enabled, and the entry is already in the
 	 * transaction list, update that list for the size change as well.
 	 */
-	H5C2__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \
+	H5C__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \
                                               (entry_ptr->size), (new_size));
 
         /* update statistics just before changing the entry size */
-	H5C2__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \
+	H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \
                                                  (new_size));
 
 	/* finally, update the entry size proper */
@@ -3162,29 +3162,29 @@ H5C2_mark_pinned_entry_dirty(void *thing, hbool_t size_changed, size_t new_size)
 
     if ( ! (entry_ptr->in_slist) ) {
 
-	H5C2__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+	H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
     }
 
     /* if journaling is enabled, check to see if the entry is in the
      * transaction list.  If it isn't, insert it.  If it is, move it to
      * the head of the list.
      */
-    H5C2__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL)
+    H5C__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL)
 
-    H5C2__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr)
+    H5C__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr)
 
 done:
-#if H5C2_PRINT_EXIT_POINTS
-    if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
+#if H5C_PRINT_EXIT_POINTS
+    if(H5C_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
         HDfprintf(stdout, "%s: Exiting with result = %d.\n", FUNC, (int)ret_value);
-#endif /* H5C2_PRINT_EXIT_POINTS */
+#endif /* H5C_PRINT_EXIT_POINTS */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C2_mark_pinned_entry_dirty() */
+} /* H5C_mark_pinned_entry_dirty() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_mark_pinned_or_protected_entry_dirty
+ * Function:    H5C_mark_pinned_or_protected_entry_dirty
  *
  * Purpose:	Mark a pinned or protected entry as dirty.  The target entry
  * 		MUST be either pinned or protected, and MAY be both.
@@ -3192,7 +3192,7 @@ done:
  * 		At present, this funtion does not support size change.
  *
  * 		In the protected case, this call is the functional
- * 		equivalent of setting the H5C2__DIRTIED_FLAG on an unprotect
+ * 		equivalent of setting the H5C__DIRTIED_FLAG on an unprotect
  * 		call.
  *
  * 		In the pinned but not protected case, if the entry is not
@@ -3207,23 +3207,23 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C2_mark_pinned_or_protected_entry_dirty(void *thing)
+H5C_mark_pinned_or_protected_entry_dirty(void *thing)
 {
-    H5C2_t *            cache_ptr;
-    H5C2_cache_entry_t * entry_ptr = (H5C2_cache_entry_t *)thing;
+    H5C_t *            cache_ptr;
+    H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing;
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_mark_pinned_or_protected_entry_dirty, FAIL)
+    FUNC_ENTER_NOAPI(H5C_mark_pinned_or_protected_entry_dirty, FAIL)
 
     /* Sanity checks */
     HDassert(entry_ptr);
     HDassert(H5F_addr_defined(entry_ptr->addr));
     cache_ptr = entry_ptr->cache_ptr;
     HDassert(cache_ptr);
-    HDassert(cache_ptr->magic == H5C2__H5C2_T_MAGIC);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-#if H5C2_PRINT_ENTRY_POINTS
-    if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
+#if H5C_PRINT_ENTRY_POINTS
+    if(H5C_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
         HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n", FUNC,
 	          (unsigned long)(entry_ptr->addr), entry_ptr->type->name);
 #endif /* JRM */
@@ -3249,14 +3249,14 @@ H5C2_mark_pinned_or_protected_entry_dirty(void *thing)
 	/* If journaling is enabled, must add the entry to the transaction
 	 * list, if it is not there already.
 	 */
-	H5C2__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL);
+	H5C__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL);
 
         if ( ! (entry_ptr->in_slist) ) {
 
-            H5C2__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+            H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
         }
 
-        H5C2__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr)
+        H5C__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr)
 
     } else {
 
@@ -3265,18 +3265,18 @@ H5C2_mark_pinned_or_protected_entry_dirty(void *thing)
     }
 
 done:
-#if H5C2_PRINT_EXIT_POINTS
-    if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
+#if H5C_PRINT_EXIT_POINTS
+    if(H5C_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
         HDfprintf(stdout, "%s: Exiting with result = %d.\n", FUNC, (int)ret_value);
-#endif /* H5C2_PRINT_EXIT_POINTS */
+#endif /* H5C_PRINT_EXIT_POINTS */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C2_mark_pinned_or_protected_entry_dirty() */
+} /* H5C_mark_pinned_or_protected_entry_dirty() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2_rename_entry
+ * Function:    H5C_rename_entry
  *
  * Purpose:     Use this function to notify the cache that an entry's
  *              file address changed.
@@ -3295,7 +3295,7 @@ done:
  *		Updated function to force all renamed entries to be
  *		dirty.  This is part of a series of code modifications
  *		moving management of the is_dirty field of
- *		H5C2_cache_entry_t into the H5C2 code.
+ *		H5C_cache_entry_t into the H5C code.
  *
  *		JRM -- 4/3/06
  *		Updated function to disallow renaming of pinned entries.
@@ -3309,12 +3309,12 @@ done:
  *              the function is called within the flush callback for the
  *              target entry and the target entry is being destroyed.
  *
- *              Note that in this case H5C2_flush_single_entry() will handle
+ *              Note that in this case H5C_flush_single_entry() will handle
  *              all these details for us.
  *
  *              JRM -- 10/13/07
  *              Renames of the target entry in a serialize callback are
- *              now handled by H5C2_flush_single_entry() -- hence the above
+ *              now handled by H5C_flush_single_entry() -- hence the above
  *              modification is now obsolete.
  *
  *              JRM -- 3/31/08
@@ -3332,24 +3332,24 @@ done:
  */
 
 herr_t
-H5C2_rename_entry(H5C2_t *	     cache_ptr,
-                 const H5C2_class_t * type,
+H5C_rename_entry(H5C_t *	     cache_ptr,
+                 const H5C_class_t * type,
                  haddr_t 	     old_addr,
 	         haddr_t 	     new_addr)
 {
     herr_t			ret_value = SUCCEED;      /* Return value */
     hbool_t			was_dirty;
     hbool_t			had_jwip;
-    H5C2_cache_entry_t *	entry_ptr = NULL;
-    H5C2_cache_entry_t *	test_entry_ptr = NULL;
-#if H5C2_DO_SANITY_CHECKS
+    H5C_cache_entry_t *	entry_ptr = NULL;
+    H5C_cache_entry_t *	test_entry_ptr = NULL;
+#if H5C_DO_SANITY_CHECKS
     hbool_t			removed_entry_from_slist = FALSE;
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
-    FUNC_ENTER_NOAPI(H5C2_rename_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5C_rename_entry, FAIL)
 
-#if H5C2_PRINT_ENTRY_POINTS
-    if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) )
+#if H5C_PRINT_ENTRY_POINTS
+    if ( H5C_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) )
     {
         HDfprintf(stdout, "%s: type = %s,  old_addr = 0x%lX, new_addr = 0x%lx.\n",
 	          FUNC, type->name, (unsigned long)old_addr,
@@ -3358,21 +3358,21 @@ H5C2_rename_entry(H5C2_t *	     cache_ptr,
 #endif /* JRM */
 
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( type );
     HDassert( H5F_addr_defined(old_addr) );
     HDassert( H5F_addr_defined(new_addr) );
     HDassert( H5F_addr_ne(old_addr, new_addr) );
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-        if ( H5C2_validate_lru_list(cache_ptr) < 0 ) {
+#if H5C_DO_EXTREME_SANITY_CHECKS
+        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                             "LRU sanity check failed.\n");
         }
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-    H5C2__SEARCH_INDEX(cache_ptr, old_addr, entry_ptr, FAIL)
+    H5C__SEARCH_INDEX(cache_ptr, old_addr, entry_ptr, FAIL)
 
     if ( ( entry_ptr == NULL ) || ( entry_ptr->type != type ) ) {
 
@@ -3403,7 +3403,7 @@ H5C2_rename_entry(H5C2_t *	     cache_ptr,
                     "rename on flush when journaling is enabled.\n");
     }
 
-    H5C2__SEARCH_INDEX(cache_ptr, new_addr, test_entry_ptr, FAIL)
+    H5C__SEARCH_INDEX(cache_ptr, new_addr, test_entry_ptr, FAIL)
 
     if ( test_entry_ptr != NULL ) { /* we are hosed */
 
@@ -3438,19 +3438,19 @@ H5C2_rename_entry(H5C2_t *	     cache_ptr,
 
     if ( ! ( entry_ptr->destroy_in_progress ) ) {
 
-        H5C2__DELETE_FROM_INDEX(cache_ptr, entry_ptr)
+        H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr)
 
         if ( entry_ptr->in_slist ) {
 
             HDassert( cache_ptr->slist_ptr );
 
-            H5C2__REMOVE_ENTRY_FROM_SLIST(cache_ptr, entry_ptr)
+            H5C__REMOVE_ENTRY_FROM_SLIST(cache_ptr, entry_ptr)
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
 
             removed_entry_from_slist = TRUE;
 
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
         }
     }
 
@@ -3467,13 +3467,13 @@ H5C2_rename_entry(H5C2_t *	     cache_ptr,
 	    entry_ptr->image_up_to_date = FALSE;
 	}
 
-        H5C2__INSERT_IN_INDEX(cache_ptr, entry_ptr, FAIL)
+        H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, FAIL)
 
 	if ( ! ( entry_ptr->flush_in_progress ) ) {
 
-            H5C2__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+            H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
 
             if ( removed_entry_from_slist ) {
 
@@ -3489,7 +3489,7 @@ H5C2_rename_entry(H5C2_t *	     cache_ptr,
 		cache_ptr->slist_size_increase -= entry_ptr->size;
 	    }
 
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
 	    /* make note of whether the target entry had a journal write
 	     * in progress -- will need this fact to update the replacement
@@ -3500,39 +3500,39 @@ H5C2_rename_entry(H5C2_t *	     cache_ptr,
 	    /* If journaling is enabled, add the entry to the transaction
 	     * list, if it isn't there already.
 	     */
-	    H5C2__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL);
+	    H5C__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL);
 
-            H5C2__UPDATE_RP_FOR_RENAME(cache_ptr, entry_ptr, was_dirty, \
+            H5C__UPDATE_RP_FOR_RENAME(cache_ptr, entry_ptr, was_dirty, \
 			               had_jwip, FAIL);
 	}
     }
 
-    H5C2__UPDATE_STATS_FOR_RENAME(cache_ptr, entry_ptr)
+    H5C__UPDATE_STATS_FOR_RENAME(cache_ptr, entry_ptr)
 
 done:
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-        if ( H5C2_validate_lru_list(cache_ptr) < 0 ) {
+#if H5C_DO_EXTREME_SANITY_CHECKS
+        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                             "LRU sanity check failed.\n");
         }
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-#if H5C2_PRINT_EXIT_POINTS
-    if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) {
+#if H5C_PRINT_EXIT_POINTS
+    if ( H5C_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) {
         HDfprintf(stdout, "%s: Exiting with result = %d.\n",
                   FUNC, (int)ret_value);
     }
-#endif /* H5C2_PRINT_EXIT_POINTS */
+#endif /* H5C_PRINT_EXIT_POINTS */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_rename_entry() */
+} /* H5C_rename_entry() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_resize_pinned_entry
+ * Function:    H5C_resize_pinned_entry
  *
  * Purpose:	Resize a pinned entry.  The target entry MUST be
  * 		be pinned, and MUST not be unprotected.
@@ -3549,25 +3549,25 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C2_resize_pinned_entry(void *thing, size_t new_size)
+H5C_resize_pinned_entry(void *thing, size_t new_size)
 {
-    H5C2_t *            cache_ptr;
-    H5C2_cache_entry_t * entry_ptr = (H5C2_cache_entry_t *)thing;
+    H5C_t *            cache_ptr;
+    H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing;
     size_t             	size_increase;
     herr_t              result;
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_resize_pinned_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5C_resize_pinned_entry, FAIL)
 
     /* Sanity checks */
     HDassert(entry_ptr);
     HDassert(H5F_addr_defined(entry_ptr->addr));
     cache_ptr = entry_ptr->cache_ptr;
     HDassert(cache_ptr);
-    HDassert(cache_ptr->magic == H5C2__H5C2_T_MAGIC);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-#if H5C2_PRINT_ENTRY_POINTS
-    if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
+#if H5C_PRINT_ENTRY_POINTS
+    if(H5C_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
         HDfprintf(stdout, "%s: type = %s, addr = 0x%lX, new_size = %d.\n",
 	          FUNC, entry_ptr->type->name, (unsigned long)(entry_ptr->addr),
 		  (int)new_size);
@@ -3604,44 +3604,44 @@ H5C2_resize_pinned_entry(void *thing, size_t new_size)
                 if ( size_increase >=
                      cache_ptr->flash_size_increase_threshold ) {
 
-                    result = H5C2__flash_increase_cache_size(cache_ptr,
+                    result = H5C__flash_increase_cache_size(cache_ptr,
                                                              entry_ptr->size,
                                                              new_size);
 
                     if ( result < 0 ) {
 
                         HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, \
-                                    "H5C2__flash_increase_cache_size failed.")
+                                    "H5C__flash_increase_cache_size failed.")
                     }
                 }
             }
         }
 
         /* update the protected entry list */
-        H5C2__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr->pel_len), \
+        H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr->pel_len), \
                                         (cache_ptr->pel_size), \
                                         (entry_ptr->size), (new_size));
 
         /* update the hash table */
-	H5C2__UPDATE_INDEX_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size),\
+	H5C__UPDATE_INDEX_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size),\
                                           (new_size));
 
         /* if the entry is in the skip list, update that too */
         if ( entry_ptr->in_slist ) {
 
-	    H5C2__UPDATE_SLIST_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size),\
+	    H5C__UPDATE_SLIST_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size),\
                                               (new_size));
         }
 
 	/* if journaling is enabled, and the entry is already in the
 	 * transaction list, update that list for the size change as well.
 	 */
-	H5C2__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \
+	H5C__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \
                                               (entry_ptr->size), (new_size));
 
 
         /* update statistics just before changing the entry size */
-	H5C2__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \
+	H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \
                                                 (new_size));
 
 	/* finally, update the entry size proper */
@@ -3650,29 +3650,29 @@ H5C2_resize_pinned_entry(void *thing, size_t new_size)
 
     if ( ! (entry_ptr->in_slist) ) {
 
-	H5C2__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+	H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
     }
 
     /* if journaling is enabled, check to see if the entry is in the
      * transaction list.  If it isn't, insert it.  If it is, move it to
      * the head of the list.
      */
-    H5C2__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL)
+    H5C__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL)
 
-    H5C2__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr)
+    H5C__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr)
 
 done:
-#if H5C2_PRINT_EXIT_POINTS
-    if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
+#if H5C_PRINT_EXIT_POINTS
+    if(H5C_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
         HDfprintf(stdout, "%s: Exiting with result = %d.\n", FUNC, (int)ret_value);
-#endif /* H5C2_PRINT_EXIT_POINTS */
+#endif /* H5C_PRINT_EXIT_POINTS */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C2_resize_pinned_entry() */
+} /* H5C_resize_pinned_entry() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_pin_protected_entry()
+ * Function:    H5C_pin_protected_entry()
  *
  * Purpose:	Pin a protected cache entry.  The entry must be protected
  * 		at the time of call, and must be unpinned.
@@ -3685,16 +3685,16 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C2_pin_protected_entry(void *thing)
+H5C_pin_protected_entry(void *thing)
 {
-    H5C2_t *             cache_ptr;
-    H5C2_cache_entry_t * entry_ptr = (H5C2_cache_entry_t *)thing;
+    H5C_t *             cache_ptr;
+    H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing;
     herr_t               ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_pin_protected_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5C_pin_protected_entry, FAIL)
 
-#if H5C2_PRINT_ENTRY_POINTS
-    if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
+#if H5C_PRINT_ENTRY_POINTS
+    if(H5C_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
         HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n", FUNC,
 	          (unsigned long)(entry_ptr->addr), entry_ptr->type->name);
 #endif /* JRM */
@@ -3704,7 +3704,7 @@ H5C2_pin_protected_entry(void *thing)
     HDassert(H5F_addr_defined(entry_ptr->addr));
     cache_ptr = entry_ptr->cache_ptr;
     HDassert(cache_ptr);
-    HDassert(cache_ptr->magic == H5C2__H5C2_T_MAGIC);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
     /* Check for usage errors */
     if(!entry_ptr->is_protected)
@@ -3716,32 +3716,32 @@ H5C2_pin_protected_entry(void *thing)
     entry_ptr->is_pinned = TRUE;
 
     /* Update statistics for entry */
-    H5C2__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)
+    H5C__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)
 
 done:
-#if H5C2_PRINT_EXIT_POINTS
-    if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
+#if H5C_PRINT_EXIT_POINTS
+    if(H5C_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
         HDfprintf(stdout, "%s: Exiting with result = %d.\n", FUNC, (int)ret_value);
-#endif /* H5C2_PRINT_EXIT_POINTS */
+#endif /* H5C_PRINT_EXIT_POINTS */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C2_pin_protected_entry() */
+} /* H5C_pin_protected_entry() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_protect
+ * Function:    H5C_protect
  *
  * Purpose:     If the target entry is not in the cache, load it.  If
  *		necessary, attempt to evict one or more entries to keep
  *		the cache within its maximum size.
  *
  *		Mark the target entry as protected, and return its address
- *		to the caller.  The caller must call H5C2_unprotect() when
+ *		to the caller.  The caller must call H5C_unprotect() when
  *		finished with the entry.
  *
  *		While it is protected, the entry may not be either evicted
  *		or flushed -- nor may it be accessed by another call to
- *		H5C2_protect.  Any attempt to do so will result in a failure.
+ *		H5C_protect.  Any attempt to do so will result in a failure.
  *
  *		The primary_dxpl_id and secondary_dxpl_id parameters
  *		specify the dxpl_ids used on the first write occasioned
@@ -3771,25 +3771,25 @@ done:
  *		make space in the cache.
  *
  *		JRM -- 11/12/04
- *		Added code to call to H5C2_make_space_in_cache()
- *		after the call to H5C2__auto_adjust_cache_size() if that
+ *		Added code to call to H5C_make_space_in_cache()
+ *		after the call to H5C__auto_adjust_cache_size() if that
  *		function sets the size_decreased flag is TRUE.
  *
  *		JRM -- 4/25/05
  *		The size_decreased flag can also be set to TRUE in
- *		H5C2_set_cache_auto_resize_config() if a new configuration
+ *		H5C_set_cache_auto_resize_config() if a new configuration
  *		forces an immediate reduction in cache size.  Modified
  *		the code to deal with this eventuallity.
  *
  *		JRM -- 6/24/05
- *		Added support for the new write_permitted field of H5C2_t.
+ *		Added support for the new write_permitted field of H5C_t.
  *
  *		JRM -- 10/22/05
  *		Hand optimizations.
  *
  *		JRM -- 5/3/06
  *		Added code to set the new dirtied field in
- *		H5C2_cache_entry_t to FALSE prior to return.
+ *		H5C_cache_entry_t to FALSE prior to return.
  *
  *		JRM -- 6/23/06
  *		Modified code to allow dirty entries to be loaded from
@@ -3806,7 +3806,7 @@ done:
  *
  *              JRM -- 7/27/07
  *              Added code supporting the new evictions_enabled field
- *              in H5C2_t.
+ *              in H5C_t.
  *
  *		JRM -- 7/11/07
  *		Revised function for the new metadata cache API.  The
@@ -3828,15 +3828,15 @@ done:
  */
 
 void *
-H5C2_protect(H5F_t *		  f,
+H5C_protect(H5F_t *		  f,
              hid_t	          dxpl_id,
-             const H5C2_class_t * type,
+             const H5C_class_t * type,
              haddr_t 	          addr,
 	     size_t		  len,
              void *               udata,
 	     unsigned		  flags)
 {
-    H5C2_t *		cache_ptr;
+    H5C_t *		cache_ptr;
     hbool_t		hit;
     hbool_t		first_flush;
     hbool_t		have_write_permitted = FALSE;
@@ -3844,13 +3844,13 @@ H5C2_protect(H5F_t *		  f,
     hbool_t		write_permitted;
     herr_t		result;
     void *		thing;
-    H5C2_cache_entry_t *	entry_ptr;
+    H5C_cache_entry_t *	entry_ptr;
     void *		ret_value;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_protect, NULL)
+    FUNC_ENTER_NOAPI(H5C_protect, NULL)
 
-#if H5C2_PRINT_ENTRY_POINTS
-    if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) )
+#if H5C_PRINT_ENTRY_POINTS
+    if ( H5C_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) )
     {
         HDfprintf(stdout,
 		  "%s: addr = 0x%lX, len = %d, type = %s, flags = 0x%x.\n",
@@ -3862,31 +3862,31 @@ H5C2_protect(H5F_t *		  f,
     HDassert( f );
     HDassert( f->shared );
 
-    cache_ptr = f->shared->cache2;
+    cache_ptr = f->shared->cache;
 
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->skip_file_checks || f );
     HDassert( type );
     HDassert( H5F_addr_defined(addr) );
     HDassert( len > 0 );
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-    if ( H5C2_validate_lru_list(cache_ptr) < 0 ) {
+#if H5C_DO_EXTREME_SANITY_CHECKS
+    if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
 
 	HDassert(0);
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, NULL, \
                     "LRU sanity check failed.\n");
     }
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-    if ( (flags & H5C2__READ_ONLY_FLAG) != 0 )
+    if ( (flags & H5C__READ_ONLY_FLAG) != 0 )
     {
 	read_only = TRUE;
     }
 
     /* first check to see if the target is in cache */
-    H5C2__SEARCH_INDEX(cache_ptr, addr, entry_ptr, NULL)
+    H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, NULL)
 
     if ( entry_ptr != NULL ) {
 
@@ -3899,14 +3899,14 @@ H5C2_protect(H5F_t *		  f,
 
         hit = FALSE;
 
-        thing = H5C2_load_entry(f, dxpl_id, type, addr, len, udata);
+        thing = H5C_load_entry(f, dxpl_id, type, addr, len, udata);
 
         if ( thing == NULL ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTLOAD, NULL, "can't load entry")
         }
 
-        entry_ptr = (H5C2_cache_entry_t *)thing;
+        entry_ptr = (H5C_cache_entry_t *)thing;
 
         /* If the entry is very large, and we are configured to allow it,
          * we may wish to perform a flash cache size increase.
@@ -3914,13 +3914,13 @@ H5C2_protect(H5F_t *		  f,
         if ( ( cache_ptr->flash_size_increase_possible ) &&
              ( entry_ptr->size > cache_ptr->flash_size_increase_threshold ) ) {
 
-            result = H5C2__flash_increase_cache_size(cache_ptr, 0,
+            result = H5C__flash_increase_cache_size(cache_ptr, 0,
                                                      entry_ptr->size);
 
             if ( result < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, \
-                            "H5C2__flash_increase_cache_size failed.")
+                            "H5C__flash_increase_cache_size failed.")
              }
         }
 
@@ -3961,7 +3961,7 @@ H5C2_protect(H5F_t *		  f,
                 first_flush = TRUE;
             }
 
-            HDassert( entry_ptr->size <= H5C2_MAX_ENTRY_SIZE );
+            HDassert( entry_ptr->size <= H5C_MAX_ENTRY_SIZE );
 
             space_needed = entry_ptr->size;
 
@@ -3972,7 +3972,7 @@ H5C2_protect(H5F_t *		  f,
 
             /* Note that space_needed is just the amount of space that
              * needed to insert the new entry without exceeding the cache
-             * size limit.  The subsequent call to H5C2_make_space_in_cache()
+             * size limit.  The subsequent call to H5C_make_space_in_cache()
              * may evict the entries required to free more or less space
              * depending on conditions.  It MAY be less if the cache is
              * currently undersized, or more if the cache is oversized.
@@ -3999,13 +3999,13 @@ H5C2_protect(H5F_t *		  f,
              * see no point in worrying about the fourth.
              */
 
-            result = H5C2_make_space_in_cache(f, dxpl_id, cache_ptr,
+            result = H5C_make_space_in_cache(f, dxpl_id, cache_ptr,
                                               space_needed, write_permitted);
 
             if ( result < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, \
-                            "H5C2_make_space_in_cache failed 1.")
+                            "H5C_make_space_in_cache failed 1.")
             }
         }
 
@@ -4015,11 +4015,11 @@ H5C2_protect(H5F_t *		  f,
          * This is no longer true -- due to a bug fix, we may modify
          * data on load to repair a file.
          */
-        H5C2__INSERT_IN_INDEX(cache_ptr, entry_ptr, NULL)
+        H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, NULL)
 
         if ( ( entry_ptr->is_dirty ) && ( ! (entry_ptr->in_slist) ) ) {
 
-            H5C2__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, NULL)
+            H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, NULL)
         }
 
 	/* under rare (we hope) circumstances, the load routine will
@@ -4029,7 +4029,7 @@ H5C2_protect(H5F_t *		  f,
 	 */
 	if ( entry_ptr->is_dirty ) {
 
-	    H5C2__INSERT_ENTRY_IN_TL(cache_ptr, entry_ptr, NULL);
+	    H5C__INSERT_ENTRY_IN_TL(cache_ptr, entry_ptr, NULL);
 	}
 
 	/* load the entry into the data structures used by the replacement
@@ -4043,7 +4043,7 @@ H5C2_protect(H5F_t *		  f,
 	 * avoids the problem.
 	 */
 
-        H5C2__UPDATE_RP_FOR_LOAD(cache_ptr, entry_ptr, NULL)
+        H5C__UPDATE_RP_FOR_LOAD(cache_ptr, entry_ptr, NULL)
     }
 
     HDassert( entry_ptr->addr == addr );
@@ -4064,7 +4064,7 @@ H5C2_protect(H5F_t *		  f,
 	}
     } else {
 
-    	H5C2__UPDATE_RP_FOR_PROTECT(cache_ptr, entry_ptr, NULL)
+    	H5C__UPDATE_RP_FOR_PROTECT(cache_ptr, entry_ptr, NULL)
 
     	entry_ptr->is_protected = TRUE;
 
@@ -4077,9 +4077,9 @@ H5C2_protect(H5F_t *		  f,
     	entry_ptr->dirtied = FALSE;
     }
 
-    H5C2__UPDATE_CACHE_HIT_RATE_STATS(cache_ptr, hit)
+    H5C__UPDATE_CACHE_HIT_RATE_STATS(cache_ptr, hit)
 
-    H5C2__UPDATE_STATS_FOR_PROTECT(cache_ptr, entry_ptr, hit)
+    H5C__UPDATE_STATS_FOR_PROTECT(cache_ptr, entry_ptr, hit)
 
     ret_value = thing;
 
@@ -4122,7 +4122,7 @@ H5C2_protect(H5F_t *		  f,
              ( cache_ptr->cache_accesses >=
                (cache_ptr->resize_ctl).epoch_length ) ) {
 
-            result = H5C2__auto_adjust_cache_size(f,
+            result = H5C__auto_adjust_cache_size(f,
                                                   dxpl_id,
                                                   cache_ptr,
                                                   write_permitted);
@@ -4145,7 +4145,7 @@ H5C2_protect(H5F_t *		  f,
 
                 cache_ptr->cache_full = TRUE;
 
-                result = H5C2_make_space_in_cache(f,
+                result = H5C_make_space_in_cache(f,
                                                   dxpl_id,
                                                   cache_ptr,
                                                   (size_t)0,
@@ -4154,7 +4154,7 @@ H5C2_protect(H5F_t *		  f,
                 if ( result < 0 ) {
 
                     HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, NULL, \
-                                "H5C2_make_space_in_cache failed 2.")
+                                "H5C_make_space_in_cache failed 2.")
                 }
             }
         }
@@ -4162,29 +4162,29 @@ H5C2_protect(H5F_t *		  f,
 
 done:
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-        if ( H5C2_validate_lru_list(cache_ptr) < 0 ) {
+#if H5C_DO_EXTREME_SANITY_CHECKS
+        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, NULL, \
                             "LRU sanity check failed.\n");
         }
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-#if H5C2_PRINT_EXIT_POINTS
-    if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) {
+#if H5C_PRINT_EXIT_POINTS
+    if ( H5C_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) {
         HDfprintf(stdout, "%s: Exiting with result = 0x%lX.\n",
                   FUNC, (unsigned long)ret_value);
     }
-#endif /* H5C2_PRINT_EXIT_POINTS */
+#endif /* H5C_PRINT_EXIT_POINTS */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_protect() */
+} /* H5C_protect() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2_reset_cache_hit_rate_stats()
+ * Function:    H5C_reset_cache_hit_rate_stats()
  *
  * Purpose:     Reset the cache hit rate computation fields.
  *
@@ -4200,13 +4200,13 @@ done:
  */
 
 herr_t
-H5C2_reset_cache_hit_rate_stats(H5C2_t * cache_ptr)
+H5C_reset_cache_hit_rate_stats(H5C_t * cache_ptr)
 {
     herr_t	ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_reset_cache_hit_rate_stats, FAIL)
+    FUNC_ENTER_NOAPI(H5C_reset_cache_hit_rate_stats, FAIL)
 
-    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) {
+    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
     }
@@ -4218,11 +4218,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_reset_cache_hit_rate_stats() */
+} /* H5C_reset_cache_hit_rate_stats() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_set_cache_auto_resize_config
+ * Function:    H5C_set_cache_auto_resize_config
  *
  * Purpose:	Set the cache automatic resize configuration to the
  *		provided values if they are in range, and fail if they
@@ -4242,7 +4242,7 @@ done:
  *
  *		JRM -- 11/18/04
  *		Reworked function to match major changes in
- *		H5C2_auto_size_ctl_t.
+ *		H5C_auto_size_ctl_t.
  *
  *		JRM -- 4/25/05
  *		Added code to set cache_ptr->size_decreased to TRUE
@@ -4257,17 +4257,17 @@ done:
  */
 
 herr_t
-H5C2_set_cache_auto_resize_config(H5C2_t * cache_ptr,
-                                 H5C2_auto_size_ctl_t *config_ptr)
+H5C_set_cache_auto_resize_config(H5C_t * cache_ptr,
+                                 H5C_auto_size_ctl_t *config_ptr)
 {
     herr_t	result;
     size_t      new_max_cache_size;
     size_t      new_min_clean_size;
     herr_t	ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_set_cache_auto_resize_config, FAIL)
+    FUNC_ENTER_NOAPI(H5C_set_cache_auto_resize_config, FAIL)
 
-    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) {
+    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
     }
@@ -4277,38 +4277,38 @@ H5C2_set_cache_auto_resize_config(H5C2_t * cache_ptr,
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "NULL config_ptr on entry.")
     }
 
-    if ( config_ptr->version != H5C2__CURR_AUTO_SIZE_CTL_VER ) {
+    if ( config_ptr->version != H5C__CURR_AUTO_SIZE_CTL_VER ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown config version.")
     }
 
     /* check general configuration section of the config: */
-    if ( SUCCEED != H5C2_validate_resize_config(config_ptr,
-                                   H5C2_RESIZE_CFG__VALIDATE_GENERAL) ) {
+    if ( SUCCEED != H5C_validate_resize_config(config_ptr,
+                                   H5C_RESIZE_CFG__VALIDATE_GENERAL) ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, \
                     "error in general configuration fields of new config.")
     }
 
     /* check size increase control fields of the config: */
-    if ( SUCCEED != H5C2_validate_resize_config(config_ptr,
-                                   H5C2_RESIZE_CFG__VALIDATE_INCREMENT) ) {
+    if ( SUCCEED != H5C_validate_resize_config(config_ptr,
+                                   H5C_RESIZE_CFG__VALIDATE_INCREMENT) ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, \
                     "error in the size increase control fields of new config.")
     }
 
     /* check size decrease control fields of the config: */
-    if ( SUCCEED != H5C2_validate_resize_config(config_ptr,
-                                   H5C2_RESIZE_CFG__VALIDATE_DECREMENT) ) {
+    if ( SUCCEED != H5C_validate_resize_config(config_ptr,
+                                   H5C_RESIZE_CFG__VALIDATE_DECREMENT) ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, \
                     "error in the size decrease control fields of new config.")
     }
 
     /* check for conflicts between size increase and size decrease controls: */
-    if ( SUCCEED != H5C2_validate_resize_config(config_ptr,
-                                   H5C2_RESIZE_CFG__VALIDATE_INTERACTIONS) ) {
+    if ( SUCCEED != H5C_validate_resize_config(config_ptr,
+                                   H5C_RESIZE_CFG__VALIDATE_INTERACTIONS) ) {
 
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, \
                     "conflicting threshold fields in new config.")
@@ -4321,11 +4321,11 @@ H5C2_set_cache_auto_resize_config(H5C2_t * cache_ptr,
 
     switch ( config_ptr->incr_mode )
     {
-        case H5C2_incr__off:
+        case H5C_incr__off:
             cache_ptr->size_increase_possible = FALSE;
             break;
 
-        case H5C2_incr__threshold:
+        case H5C_incr__threshold:
             if ( ( config_ptr->lower_hr_threshold <= 0.0 ) ||
                  ( config_ptr->increment <= 1.0 ) ||
                  ( ( config_ptr->apply_max_increment ) &&
@@ -4346,11 +4346,11 @@ H5C2_set_cache_auto_resize_config(H5C2_t * cache_ptr,
 
     switch ( config_ptr->decr_mode )
     {
-        case H5C2_decr__off:
+        case H5C_decr__off:
             cache_ptr->size_decrease_possible = FALSE;
             break;
 
-        case H5C2_decr__threshold:
+        case H5C_decr__threshold:
             if ( ( config_ptr->upper_hr_threshold >= 1.0 ) ||
                  ( config_ptr->decrement >= 1.0 ) ||
                  ( ( config_ptr->apply_max_decrement ) &&
@@ -4360,7 +4360,7 @@ H5C2_set_cache_auto_resize_config(H5C2_t * cache_ptr,
             }
             break;
 
-        case H5C2_decr__age_out:
+        case H5C_decr__age_out:
             if ( ( ( config_ptr->apply_empty_reserve ) &&
                    ( config_ptr->empty_reserve >= 1.0 ) ) ||
                  ( ( config_ptr->apply_max_decrement ) &&
@@ -4370,7 +4370,7 @@ H5C2_set_cache_auto_resize_config(H5C2_t * cache_ptr,
             }
             break;
 
-        case H5C2_decr__age_out_with_threshold:
+        case H5C_decr__age_out_with_threshold:
             if ( ( ( config_ptr->apply_empty_reserve ) &&
                    ( config_ptr->empty_reserve >= 1.0 ) ) ||
                  ( ( config_ptr->apply_max_decrement ) &&
@@ -4449,22 +4449,22 @@ H5C2_set_cache_auto_resize_config(H5C2_t * cache_ptr,
     cache_ptr->max_cache_size = new_max_cache_size;
     cache_ptr->min_clean_size = new_min_clean_size;
 
-    if ( H5C2_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED ) {
+    if ( H5C_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED ) {
 
         /* this should be impossible... */
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_reset_cache_hit_rate_stats failed.")
+                    "H5C_reset_cache_hit_rate_stats failed.")
     }
 
     /* remove excess epoch markers if any */
-    if ( ( config_ptr->decr_mode == H5C2_decr__age_out_with_threshold ) ||
-         ( config_ptr->decr_mode == H5C2_decr__age_out ) ) {
+    if ( ( config_ptr->decr_mode == H5C_decr__age_out_with_threshold ) ||
+         ( config_ptr->decr_mode == H5C_decr__age_out ) ) {
 
         if ( cache_ptr->epoch_markers_active >
              (cache_ptr->resize_ctl).epochs_before_eviction ) {
 
             result =
-                H5C2__autoadjust__ageout__remove_excess_markers(cache_ptr);
+                H5C__autoadjust__ageout__remove_excess_markers(cache_ptr);
 
             if ( result != SUCCEED ) {
 
@@ -4474,7 +4474,7 @@ H5C2_set_cache_auto_resize_config(H5C2_t * cache_ptr,
         }
     } else if ( cache_ptr->epoch_markers_active > 0 ) {
 
-        result = H5C2__autoadjust__ageout__remove_all_markers(cache_ptr);
+        result = H5C__autoadjust__ageout__remove_all_markers(cache_ptr);
 
         if ( result != SUCCEED ) {
 
@@ -4495,11 +4495,11 @@ H5C2_set_cache_auto_resize_config(H5C2_t * cache_ptr,
 
         switch ( config_ptr->flash_incr_mode )
         {
-            case H5C2_flash_incr__off:
+            case H5C_flash_incr__off:
                 cache_ptr->flash_size_increase_possible = FALSE;
                 break;
 
-            case H5C2_flash_incr__add_space:
+            case H5C_flash_incr__add_space:
                 cache_ptr->flash_size_increase_possible = TRUE;
                 cache_ptr->flash_size_increase_threshold =
                     (size_t)
@@ -4518,11 +4518,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_set_cache_auto_resize_config() */
+} /* H5C_set_cache_auto_resize_config() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_set_evictions_enabled()
+ * Function:    H5C_set_evictions_enabled()
  *
  * Purpose:     Set cache_ptr->evictions_enabled to the value of the
  *              evictions enabled parameter.
@@ -4540,14 +4540,14 @@ done:
  */
 
 herr_t
-H5C2_set_evictions_enabled(H5C2_t * cache_ptr,
+H5C_set_evictions_enabled(H5C_t * cache_ptr,
                            hbool_t evictions_enabled)
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_set_evictions_enabled, FAIL)
+    FUNC_ENTER_NOAPI(H5C_set_evictions_enabled, FAIL)
 
-    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) {
+    if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr on entry.")
     }
@@ -4565,9 +4565,9 @@ H5C2_set_evictions_enabled(H5C2_t * cache_ptr,
      * the feature.  Hence the following:
      */
     if ( ( evictions_enabled != TRUE ) &&
-         ( ( cache_ptr->resize_ctl.incr_mode != H5C2_incr__off ) ||
-           ( cache_ptr->resize_ctl.flash_incr_mode != H5C2_flash_incr__off ) ||
-           ( cache_ptr->resize_ctl.decr_mode != H5C2_decr__off ) ) ) {
+         ( ( cache_ptr->resize_ctl.incr_mode != H5C_incr__off ) ||
+           ( cache_ptr->resize_ctl.flash_incr_mode != H5C_flash_incr__off ) ||
+           ( cache_ptr->resize_ctl.decr_mode != H5C_decr__off ) ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                     "Can't disable evictions when auto resize enabled.")
@@ -4579,13 +4579,13 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_set_evictions_enabled() */
+} /* H5C_set_evictions_enabled() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_set_prefix
+ * Function:    H5C_set_prefix
  *
- * Purpose:     Set the values of the prefix field of H5C2_t.  This
+ * Purpose:     Set the values of the prefix field of H5C_t.  This
  *		filed is used to label some debugging output.
  *
  * Return:      Non-negative on success/Negative on failure
@@ -4599,34 +4599,34 @@ done:
  */
 
 herr_t
-H5C2_set_prefix(H5C2_t * cache_ptr,
+H5C_set_prefix(H5C_t * cache_ptr,
                char * prefix)
 {
     herr_t		ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_set_prefix, FAIL)
+    FUNC_ENTER_NOAPI(H5C_set_prefix, FAIL)
 
     /* This would normally be an assert, but we need to use an HGOTO_ERROR
      * call to shut up the compiler.
      */
-    if ( ( ! cache_ptr ) || ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) {
+    if ( ( ! cache_ptr ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr")
     }
 
     HDassert( prefix );
-    HDassert( HDstrlen(prefix) < H5C2__PREFIX_LEN ) ;
+    HDassert( HDstrlen(prefix) < H5C__PREFIX_LEN ) ;
 
     HDstrcpy(&(cache_ptr->prefix[0]), prefix);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_set_prefix() */
+} /* H5C_set_prefix() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_set_skip_flags
+ * Function:    H5C_set_skip_flags
  *
  * Purpose:     Set the values of the skip sanity check flags.
  *
@@ -4645,18 +4645,18 @@ done:
  */
 
 herr_t
-H5C2_set_skip_flags(H5C2_t * cache_ptr,
+H5C_set_skip_flags(H5C_t * cache_ptr,
                    hbool_t skip_file_checks,
                    hbool_t skip_dxpl_id_checks)
 {
     herr_t		ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_set_skip_flags, FAIL)
+    FUNC_ENTER_NOAPI(H5C_set_skip_flags, FAIL)
 
     /* This would normally be an assert, but we need to use an HGOTO_ERROR
      * call to shut up the compiler.
      */
-    if ( ( ! cache_ptr ) || ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) {
+    if ( ( ! cache_ptr ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr")
     }
@@ -4667,11 +4667,11 @@ H5C2_set_skip_flags(H5C2_t * cache_ptr,
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_set_skip_flags() */
+} /* H5C_set_skip_flags() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_set_trace_file_ptr
+ * Function:    H5C_set_trace_file_ptr
  *
  * Purpose:     Set the trace_file_ptr field for the cache.
  *
@@ -4690,17 +4690,17 @@ done:
  */
 
 herr_t
-H5C2_set_trace_file_ptr(H5C2_t * cache_ptr,
+H5C_set_trace_file_ptr(H5C_t * cache_ptr,
                        FILE * trace_file_ptr)
 {
     herr_t		ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_set_trace_file_ptr, FAIL)
+    FUNC_ENTER_NOAPI(H5C_set_trace_file_ptr, FAIL)
 
     /* This would normally be an assert, but we need to use an HGOTO_ERROR
      * call to shut up the compiler.
      */
-    if ( ( ! cache_ptr ) || ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) {
+    if ( ( ! cache_ptr ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr")
     }
@@ -4710,11 +4710,11 @@ H5C2_set_trace_file_ptr(H5C2_t * cache_ptr,
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_set_trace_file_ptr() */
+} /* H5C_set_trace_file_ptr() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_stats
+ * Function:    H5C_stats
  *
  * Purpose:     Prints statistics about the cache.
  *
@@ -4733,7 +4733,7 @@ done:
  *		change statistics.
  *
  *		JRM -- 1/13/06
- *		Added code to use the prefix field of H5C2_t to allow
+ *		Added code to use the prefix field of H5C_t to allow
  *		tagging of statistics output.
  *
  *		JRM -- 3/21/06
@@ -4753,17 +4753,17 @@ done:
  */
 
 herr_t
-H5C2_stats(H5C2_t * cache_ptr,
+H5C_stats(H5C_t * cache_ptr,
           const char *  cache_name,
           hbool_t
-#if !H5C2_COLLECT_CACHE_STATS
+#if !H5C_COLLECT_CACHE_STATS
           UNUSED
-#endif /* H5C2_COLLECT_CACHE_STATS */
+#endif /* H5C_COLLECT_CACHE_STATS */
           display_detailed_stats)
 {
     herr_t	ret_value = SUCCEED;   /* Return value */
 
-#if H5C2_COLLECT_CACHE_STATS
+#if H5C_COLLECT_CACHE_STATS
     int		i;
     int64_t     total_hits = 0;
     int64_t     total_misses = 0;
@@ -4796,21 +4796,21 @@ H5C2_stats(H5C2_t * cache_ptr,
     double      hit_rate;
     double	average_successful_search_depth = 0.0;
     double	average_failed_search_depth = 0.0;
-#endif /* H5C2_COLLECT_CACHE_STATS */
+#endif /* H5C_COLLECT_CACHE_STATS */
 
-    FUNC_ENTER_NOAPI(H5C2_stats, FAIL)
+    FUNC_ENTER_NOAPI(H5C_stats, FAIL)
 
     /* This would normally be an assert, but we need to use an HGOTO_ERROR
      * call to shut up the compiler.
      */
     if ( ( ! cache_ptr ) ||
-         ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ||
+         ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ||
          ( !cache_name ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad cache_ptr or cache_name")
     }
 
-#if H5C2_COLLECT_CACHE_STATS
+#if H5C_COLLECT_CACHE_STATS
 
     for ( i = 0; i <= cache_ptr->max_type_id; i++ ) {
 
@@ -4842,7 +4842,7 @@ H5C2_stats(H5C2_t * cache_ptr,
 	total_dirty_pins        += cache_ptr->dirty_pins[i];
 	total_pinned_flushes    += cache_ptr->pinned_flushes[i];
 	total_pinned_clears     += cache_ptr->pinned_clears[i];
-#if H5C2_COLLECT_CACHE_ENTRY_STATS
+#if H5C_COLLECT_CACHE_ENTRY_STATS
     if ( aggregate_max_accesses < cache_ptr->max_accesses[i] )
         aggregate_max_accesses = cache_ptr->max_accesses[i];
     if ( aggregate_min_accesses > aggregate_max_accesses )
@@ -4857,7 +4857,7 @@ H5C2_stats(H5C2_t * cache_ptr,
         aggregate_max_size = cache_ptr->max_size[i];
     if ( aggregate_max_pins < cache_ptr->max_pins[i] )
         aggregate_max_pins = cache_ptr->max_pins[i];
-#endif /* H5C2_COLLECT_CACHE_ENTRY_STATS */
+#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
     }
 
     if ( ( total_hits > 0 ) || ( total_misses > 0 ) ) {
@@ -4883,7 +4883,7 @@ H5C2_stats(H5C2_t * cache_ptr,
     }
 
 
-    HDfprintf(stdout, "\n%sH5C2: cache statistics for %s\n",
+    HDfprintf(stdout, "\n%sH5C: cache statistics for %s\n",
               cache_ptr->prefix, cache_name);
 
     HDfprintf(stdout, "\n");
@@ -5012,7 +5012,7 @@ H5C2_stats(H5C2_t * cache_ptr,
               (long)total_pinned_flushes,
               (long)total_pinned_clears);
 
-#if H5C2_COLLECT_CACHE_ENTRY_STATS
+#if H5C_COLLECT_CACHE_ENTRY_STATS
 
     HDfprintf(stdout, "%s  aggregate max / min accesses       = %d / %d\n",
               cache_ptr->prefix,
@@ -5029,7 +5029,7 @@ H5C2_stats(H5C2_t * cache_ptr,
               (int)aggregate_max_size,
 	      (int)aggregate_max_pins);
 
-#endif /* H5C2_COLLECT_CACHE_ENTRY_STATS */
+#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
 
     if ( display_detailed_stats )
     {
@@ -5109,7 +5109,7 @@ H5C2_stats(H5C2_t * cache_ptr,
                       (long)(cache_ptr->dirty_pins[i]),
                       (long)(cache_ptr->pinned_flushes[i]));
 
-#if H5C2_COLLECT_CACHE_ENTRY_STATS
+#if H5C_COLLECT_CACHE_ENTRY_STATS
 
             HDfprintf(stdout,
                       "%s    entry max / min accesses       = %d / %d\n",
@@ -5130,24 +5130,24 @@ H5C2_stats(H5C2_t * cache_ptr,
 		      (int)(cache_ptr->max_pins[i]));
 
 
-#endif /* H5C2_COLLECT_CACHE_ENTRY_STATS */
+#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
 
         }
     }
 
     HDfprintf(stdout, "\n");
 
-#endif /* H5C2_COLLECT_CACHE_STATS */
+#endif /* H5C_COLLECT_CACHE_STATS */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_stats() */
+} /* H5C_stats() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2_stats__reset
+ * Function:    H5C_stats__reset
  *
  * Purpose:     Reset the stats fields to their initial values.
  *
@@ -5185,23 +5185,23 @@ done:
 
 void
 #ifndef NDEBUG
-H5C2_stats__reset(H5C2_t * cache_ptr)
+H5C_stats__reset(H5C_t * cache_ptr)
 #else /* NDEBUG */
-#if H5C2_COLLECT_CACHE_STATS
-H5C2_stats__reset(H5C2_t * cache_ptr)
-#else /* H5C2_COLLECT_CACHE_STATS */
-H5C2_stats__reset(H5C2_t UNUSED * cache_ptr)
-#endif /* H5C2_COLLECT_CACHE_STATS */
+#if H5C_COLLECT_CACHE_STATS
+H5C_stats__reset(H5C_t * cache_ptr)
+#else /* H5C_COLLECT_CACHE_STATS */
+H5C_stats__reset(H5C_t UNUSED * cache_ptr)
+#endif /* H5C_COLLECT_CACHE_STATS */
 #endif /* NDEBUG */
 {
-#if H5C2_COLLECT_CACHE_STATS
+#if H5C_COLLECT_CACHE_STATS
     int i;
-#endif /* H5C2_COLLECT_CACHE_STATS */
+#endif /* H5C_COLLECT_CACHE_STATS */
 
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
-#if H5C2_COLLECT_CACHE_STATS
+#if H5C_COLLECT_CACHE_STATS
     for ( i = 0; i <= cache_ptr->max_type_id; i++ )
     {
         cache_ptr->hits[i]			= 0;
@@ -5247,7 +5247,7 @@ H5C2_stats__reset(H5C2_t UNUSED * cache_ptr)
     cache_ptr->max_pel_len			= 0;
     cache_ptr->max_pel_size			= (size_t)0;
 
-#if H5C2_COLLECT_CACHE_ENTRY_STATS
+#if H5C_COLLECT_CACHE_ENTRY_STATS
 
     for ( i = 0; i <= cache_ptr->max_type_id; i++ )
     {
@@ -5259,16 +5259,16 @@ H5C2_stats__reset(H5C2_t UNUSED * cache_ptr)
         cache_ptr->max_pins[i]			= 0;
     }
 
-#endif /* H5C2_COLLECT_CACHE_ENTRY_STATS */
-#endif /* H5C2_COLLECT_CACHE_STATS */
+#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
+#endif /* H5C_COLLECT_CACHE_STATS */
 
     return;
 
-} /* H5C2_stats__reset() */
+} /* H5C_stats__reset() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_unpin_entry()
+ * Function:    H5C_unpin_entry()
  *
  * Purpose:	Unpin a cache entry.  The entry must be unprotected at
  * 		the time of call, and must be pinned.
@@ -5281,24 +5281,24 @@ H5C2_stats__reset(H5C2_t UNUSED * cache_ptr)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C2_unpin_entry(void *_entry_ptr)
+H5C_unpin_entry(void *_entry_ptr)
 {
-    H5C2_t      *cache_ptr;
-    H5C2_cache_entry_t *entry_ptr = (H5C2_cache_entry_t *)_entry_ptr;
+    H5C_t      *cache_ptr;
+    H5C_cache_entry_t *entry_ptr = (H5C_cache_entry_t *)_entry_ptr;
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_unpin_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5C_unpin_entry, FAIL)
 
     /* Sanity check */
     HDassert(entry_ptr);
     cache_ptr = entry_ptr->cache_ptr;
     HDassert(cache_ptr);
-    HDassert(cache_ptr->magic == H5C2__H5C2_T_MAGIC);
+    HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-#if H5C2_PRINT_ENTRY_POINTS
-    if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
+#if H5C_PRINT_ENTRY_POINTS
+    if(H5C_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
         HDfprintf(stdout, "%s: addr = 0x%lX, type = %s.\n", FUNC, (unsigned long)(entry_ptr->addr), entry_ptr->type->name);
-#endif /* H5C2_PRINT_ENTRY_POINTS */
+#endif /* H5C_PRINT_ENTRY_POINTS */
 
     /* Error checking */
     if(!entry_ptr->is_pinned)
@@ -5306,35 +5306,35 @@ H5C2_unpin_entry(void *_entry_ptr)
 
     /* Update unprotected entry */
     if(!entry_ptr->is_protected)
-        H5C2__UPDATE_RP_FOR_UNPIN(cache_ptr, entry_ptr, FAIL)
+        H5C__UPDATE_RP_FOR_UNPIN(cache_ptr, entry_ptr, FAIL)
 
     /* Mark entry unpinned */
     entry_ptr->is_pinned = FALSE;
 
     /* Update statistics for unpin operation */
-    H5C2__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr)
+    H5C__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr)
 
 done:
-#if H5C2_PRINT_EXIT_POINTS
-    if(H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
+#if H5C_PRINT_EXIT_POINTS
+    if(H5C_PRINT_ENTRY_POINT_TARGET_TYPE(entry_ptr->type->id))
         HDfprintf(stdout, "%s: Exiting with result = %d.\n", FUNC, (int)ret_value);
-#endif /* H5C2_PRINT_EXIT_POINTS */
+#endif /* H5C_PRINT_EXIT_POINTS */
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C2_unpin_entry() */
+} /* H5C_unpin_entry() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_unprotect
+ * Function:    H5C_unprotect
  *
- * Purpose:	Undo an H5C2_protect() call -- specifically, mark the
+ * Purpose:	Undo an H5C_protect() call -- specifically, mark the
  *		entry as unprotected, remove it from the protected list,
  *		and give it back to the replacement policy.
  *
  *		The TYPE and ADDR arguments must be the same as those in
- *		the corresponding call to H5C2_protect() and the THING
+ *		the corresponding call to H5C_protect() and the THING
  *		argument must be the value returned by that call to
- *		H5C2_protect().
+ *		H5C_protect().
  *
  *		The primary_dxpl_id and secondary_dxpl_id parameters
  *		specify the dxpl_ids used on the first write occasioned
@@ -5342,7 +5342,7 @@ done:
  *		writes (secondary_dxpl_id).  Since an uprotect cannot
  *		occasion a write at present, all this is moot for now.
  *		However, things change, and in any case,
- *		H5C2_flush_single_entry() needs primary_dxpl_id and
+ *		H5C_flush_single_entry() needs primary_dxpl_id and
  *		secondary_dxpl_id in its parameter list.
  *
  *		The function can't cause a read either, so the dxpl_id
@@ -5368,7 +5368,7 @@ done:
  *
  *		JRM -- 1/6/05
  *		Added the flags parameter, and code supporting
- *		H5C2__SET_FLUSH_MARKER_FLAG.  Note that this flag is
+ *		H5C__SET_FLUSH_MARKER_FLAG.  Note that this flag is
  *		ignored unless the new entry is dirty.  Also note that
  *		once the flush_marker field of an entry is set, the
  *		only way it can be reset is by being flushed.
@@ -5381,7 +5381,7 @@ done:
  *
  *		JRM -- 7/5/05
  *		Added code supporting the new clear_on_unprotect field
- *		of H5C2_cache_entry_t.  This change is also part of the
+ *		of H5C_cache_entry_t.  This change is also part of the
  *		above mentioned cache coherency bug fix in PHDF5.
  *
  *		JRM -- 9/8/05
@@ -5402,12 +5402,12 @@ done:
  *
  *		JRM -- 3/21/06
  *		Unpdated function to pin and unpin entries as directed via
- *		the new H5C2__PIN_ENTRY_FLAG and H5C2__UNPIN_ENTRY_FLAG flags.
+ *		the new H5C__PIN_ENTRY_FLAG and H5C__UNPIN_ENTRY_FLAG flags.
  *
  *		JRM -- 5/3/06
  *		Added code to make use of the new dirtied field in
- *		H5C2_cache_entry_t.  If this field is TRUE, it is the
- *		equivalent of setting the H5C2__DIRTIED_FLAG.
+ *		H5C_cache_entry_t.  If this field is TRUE, it is the
+ *		equivalent of setting the H5C__DIRTIED_FLAG.
  *
  *		JRM -- 3/29/07
  *		Modified function to allow a entry to be protected
@@ -5428,15 +5428,15 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C2_unprotect(H5F_t *		    f,
+H5C_unprotect(H5F_t *		    f,
                hid_t		    dxpl_id,
-               const H5C2_class_t * type,
+               const H5C_class_t * type,
                haddr_t		    addr,
                void *		    thing,
                unsigned int         flags,
                size_t               new_size)
 {
-    H5C2_t *            cache_ptr;
+    H5C_t *            cache_ptr;
     hbool_t		deleted;
     hbool_t		dirtied;
     hbool_t             set_flush_marker;
@@ -5449,13 +5449,13 @@ H5C2_unprotect(H5F_t *		    f,
     herr_t              ret_value = SUCCEED;    /* Return value */
     herr_t              result;
     size_t              size_increase = 0;
-    H5C2_cache_entry_t *	entry_ptr;
-    H5C2_cache_entry_t *	test_entry_ptr;
+    H5C_cache_entry_t *	entry_ptr;
+    H5C_cache_entry_t *	test_entry_ptr;
 
-    FUNC_ENTER_NOAPI(H5C2_unprotect, FAIL)
+    FUNC_ENTER_NOAPI(H5C_unprotect, FAIL)
 
-#if H5C2_PRINT_ENTRY_POINTS
-    if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) )
+#if H5C_PRINT_ENTRY_POINTS
+    if ( H5C_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) )
     {
     HDfprintf(stdout,
 	      "%s: addr = 0x%lX, type = %s, flags = 0x%x, new_size = %d.\n",
@@ -5463,12 +5463,12 @@ H5C2_unprotect(H5F_t *		    f,
     }
 #endif /* JRM */
 
-    deleted          = ( (flags & H5C2__DELETED_FLAG) != 0 );
-    dirtied          = ( (flags & H5C2__DIRTIED_FLAG) != 0 );
-    set_flush_marker = ( (flags & H5C2__SET_FLUSH_MARKER_FLAG) != 0 );
-    size_changed     = ( (flags & H5C2__SIZE_CHANGED_FLAG) != 0 );
-    pin_entry        = ( (flags & H5C2__PIN_ENTRY_FLAG) != 0 );
-    unpin_entry      = ( (flags & H5C2__UNPIN_ENTRY_FLAG) != 0 );
+    deleted          = ( (flags & H5C__DELETED_FLAG) != 0 );
+    dirtied          = ( (flags & H5C__DIRTIED_FLAG) != 0 );
+    set_flush_marker = ( (flags & H5C__SET_FLUSH_MARKER_FLAG) != 0 );
+    size_changed     = ( (flags & H5C__SIZE_CHANGED_FLAG) != 0 );
+    pin_entry        = ( (flags & H5C__PIN_ENTRY_FLAG) != 0 );
+    unpin_entry      = ( (flags & H5C__UNPIN_ENTRY_FLAG) != 0 );
 
     /* Changing the size of an entry dirties it.  Thus, set the
      * dirtied flag if the size_changed flag is set.
@@ -5479,10 +5479,10 @@ H5C2_unprotect(H5F_t *		    f,
     HDassert( f );
     HDassert( f->shared );
 
-    cache_ptr = f->shared->cache2;
+    cache_ptr = f->shared->cache;
 
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->skip_file_checks || f );
     HDassert( type );
     HDassert( H5F_addr_defined(addr) );
@@ -5492,7 +5492,7 @@ H5C2_unprotect(H5F_t *		    f,
     HDassert( ( ! size_changed ) || ( new_size > 0 ) );
     HDassert( ! ( pin_entry && unpin_entry ) );
 
-    entry_ptr = (H5C2_cache_entry_t *)thing;
+    entry_ptr = (H5C_cache_entry_t *)thing;
 
     HDassert( entry_ptr->addr == addr );
     HDassert( entry_ptr->type == type );
@@ -5502,13 +5502,13 @@ H5C2_unprotect(H5F_t *		    f,
      */
     dirtied |= entry_ptr->dirtied;
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-        if ( H5C2_validate_lru_list(cache_ptr) < 0 ) {
+#if H5C_DO_EXTREME_SANITY_CHECKS
+        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                             "LRU sanity check failed.\n");
         }
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
 
     /* if the entry has multiple read only protects, just decrement
@@ -5537,7 +5537,7 @@ H5C2_unprotect(H5F_t *		    f,
                             "Entry already pinned???")
             }
 	    entry_ptr->is_pinned = TRUE;
-	    H5C2__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)
+	    H5C__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)
 
         } else if ( unpin_entry ) {
 
@@ -5547,7 +5547,7 @@ H5C2_unprotect(H5F_t *		    f,
 			    "Entry already unpinned???")
             }
 	    entry_ptr->is_pinned = FALSE;
-	    H5C2__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr)
+	    H5C__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr)
 
         }
 
@@ -5568,16 +5568,16 @@ H5C2_unprotect(H5F_t *		    f,
 	}
 
 #ifdef H5_HAVE_PARALLEL
-        /* When the H5C2 code is used to implement the metadata cache in the
+        /* When the H5C code is used to implement the metadata cache in the
          * PHDF5 case, only the cache on process 0 is allowed to write to file.
          * All the other metadata caches must hold dirty entries until they
          * are told that the entries are clean.
          *
-         * The clear_on_unprotect flag in the H5C2_cache_entry_t structure
+         * The clear_on_unprotect flag in the H5C_cache_entry_t structure
          * exists to deal with the case in which an entry is protected when
          * its cache receives word that the entry is now clean.  In this case,
          * the clear_on_unprotect flag is set, and the entry is flushed with
-         * the H5C2__FLUSH_CLEAR_ONLY_FLAG.
+         * the H5C__FLUSH_CLEAR_ONLY_FLAG.
          *
          * All this is a bit awkward, but until the metadata cache entries
          * are contiguous, with only one dirty flag, we have to let the supplied
@@ -5608,7 +5608,7 @@ H5C2_unprotect(H5F_t *		    f,
             entry_ptr->is_dirty = ( (entry_ptr->is_dirty) || dirtied );
 	    entry_ptr->image_up_to_date = FALSE;
 
-	    H5C2__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL)
+	    H5C__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, FAIL)
 	}
 
         /* update for change in entry size if necessary */
@@ -5628,32 +5628,32 @@ H5C2_unprotect(H5F_t *		    f,
                     if ( size_increase >=
                          cache_ptr->flash_size_increase_threshold ) {
 
-                        result = H5C2__flash_increase_cache_size(cache_ptr,
+                        result = H5C__flash_increase_cache_size(cache_ptr,
                                                               entry_ptr->size,
                                                               new_size);
 
                         if ( result < 0 ) {
 
                             HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, \
-                                     "H5C2__flash_increase_cache_size failed.")
+                                     "H5C__flash_increase_cache_size failed.")
                         }
                     }
                 }
             }
 
             /* update the protected list */
-            H5C2__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr->pl_len), \
+            H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr->pl_len), \
                                             (cache_ptr->pl_size), \
                                             (entry_ptr->size), (new_size));
 
             /* update the hash table */
-	    H5C2__UPDATE_INDEX_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size),\
+	    H5C__UPDATE_INDEX_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size),\
                                               (new_size));
 
             /* if the entry is in the skip list, update that too */
             if ( entry_ptr->in_slist ) {
 
-	        H5C2__UPDATE_SLIST_FOR_SIZE_CHANGE((cache_ptr), \
+	        H5C__UPDATE_SLIST_FOR_SIZE_CHANGE((cache_ptr), \
 				                  (entry_ptr->size),\
                                                   (new_size));
             }
@@ -5661,12 +5661,12 @@ H5C2_unprotect(H5F_t *		    f,
 	    /* if journaling is enabled, and the entry is on the transaction
 	     * list, update that list for the size changed.
 	     */
-	    H5C2__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \
+	    H5C__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \
 			                          (entry_ptr->size), \
 						  (new_size));
 
             /* update statistics just before changing the entry size */
-	    H5C2__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \
+	    H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE((cache_ptr), (entry_ptr), \
                                                     (new_size));
 
 	    /* finally, update the entry size proper */
@@ -5682,7 +5682,7 @@ H5C2_unprotect(H5F_t *		    f,
                             "Entry already pinned???")
             }
 	    entry_ptr->is_pinned = TRUE;
-	    H5C2__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)
+	    H5C__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)
 
         } else if ( unpin_entry ) {
 
@@ -5692,14 +5692,14 @@ H5C2_unprotect(H5F_t *		    f,
 			    "Entry already unpinned???")
             }
 	    entry_ptr->is_pinned = FALSE;
-	    H5C2__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr)
+	    H5C__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr)
 
         }
 
-        /* H5C2__UPDATE_RP_FOR_UNPROTECT will places the unprotected entry on
+        /* H5C__UPDATE_RP_FOR_UNPROTECT will places the unprotected entry on
          * the pinned entry list if entry_ptr->is_pined is TRUE.
          */
-        H5C2__UPDATE_RP_FOR_UNPROTECT(cache_ptr, entry_ptr, FAIL)
+        H5C__UPDATE_RP_FOR_UNPROTECT(cache_ptr, entry_ptr, FAIL)
 
         entry_ptr->is_protected = FALSE;
 
@@ -5713,7 +5713,7 @@ H5C2_unprotect(H5F_t *		    f,
 
             if ( ! (entry_ptr->in_slist) ) {
 
-                H5C2__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
+                H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, FAIL)
             }
         }
 
@@ -5733,7 +5733,7 @@ H5C2_unprotect(H5F_t *		    f,
 
             /* verify that the target entry is in the cache. */
 
-            H5C2__SEARCH_INDEX(cache_ptr, addr, test_entry_ptr, FAIL)
+            H5C__SEARCH_INDEX(cache_ptr, addr, test_entry_ptr, FAIL)
 
             if ( test_entry_ptr == NULL ) {
 
@@ -5764,7 +5764,7 @@ H5C2_unprotect(H5F_t *		    f,
 
                 if ( cache_ptr->trans_in_progress ) {
 
-	            H5C2__UPDATE_TL_FOR_ENTRY_CLEAR((cache_ptr), \
+	            H5C__UPDATE_TL_FOR_ENTRY_CLEAR((cache_ptr), \
 				                    (entry_ptr), \
 						    FAIL)
 		}
@@ -5772,19 +5772,19 @@ H5C2_unprotect(H5F_t *		    f,
 		if ( entry_on_jwip_list ) {
 
 		    entry_ptr->last_trans = 0;
-                    H5C2__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE((cache_ptr), \
+                    H5C__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE((cache_ptr), \
 				                               (entry_ptr), \
 							       FAIL)
                 }
 	    }
 
-            if ( H5C2_flush_single_entry(f,
+            if ( H5C_flush_single_entry(f,
                                          dxpl_id,
                                          cache_ptr,
                                          type,
                                          addr,
-                                         (H5C2__FLUSH_CLEAR_ONLY_FLAG |
-                                          H5C2__FLUSH_INVALIDATE_FLAG),
+                                         (H5C__FLUSH_CLEAR_ONLY_FLAG |
+                                          H5C__FLUSH_INVALIDATE_FLAG),
                                          TRUE) < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "Can't flush.")
@@ -5795,7 +5795,7 @@ H5C2_unprotect(H5F_t *		    f,
 
             /* verify that the target entry is in the cache. */
 
-            H5C2__SEARCH_INDEX(cache_ptr, addr, test_entry_ptr, FAIL)
+            H5C__SEARCH_INDEX(cache_ptr, addr, test_entry_ptr, FAIL)
 
             if ( test_entry_ptr == NULL ) {
 
@@ -5808,12 +5808,12 @@ H5C2_unprotect(H5F_t *		    f,
                             "hash table contains multiple entries for addr?!?.")
             }
 
-            if ( H5C2_flush_single_entry(f,
+            if ( H5C_flush_single_entry(f,
                                          dxpl_id,
                                          cache_ptr,
                                          type,
                                          addr,
-                                         H5C2__FLUSH_CLEAR_ONLY_FLAG,
+                                         H5C__FLUSH_CLEAR_ONLY_FLAG,
                                          TRUE) < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "Can't clear.")
@@ -5822,35 +5822,35 @@ H5C2_unprotect(H5F_t *		    f,
 #endif /* H5_HAVE_PARALLEL */
     }
 
-    H5C2__UPDATE_STATS_FOR_UNPROTECT(cache_ptr)
+    H5C__UPDATE_STATS_FOR_UNPROTECT(cache_ptr)
 
 done:
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
-        if ( H5C2_validate_lru_list(cache_ptr) < 0 ) {
+#if H5C_DO_EXTREME_SANITY_CHECKS
+        if ( H5C_validate_lru_list(cache_ptr) < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                             "LRU sanity check failed.\n");
         }
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
-#if H5C2_PRINT_EXIT_POINTS
-    if ( H5C2_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) {
+#if H5C_PRINT_EXIT_POINTS
+    if ( H5C_PRINT_ENTRY_POINT_TARGET_TYPE(type->id) ) {
         HDfprintf(stdout, "%s: Exiting with result = %d.\n",
                   FUNC, (int)ret_value);
     }
-#endif /* H5C2_PRINT_EXIT_POINTS */
+#endif /* H5C_PRINT_EXIT_POINTS */
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_unprotect() */
+} /* H5C_unprotect() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_validate_resize_config()
+ * Function:    H5C_validate_resize_config()
  *
  * Purpose:	Run a sanity check on the specified sections of the
- *		provided instance of struct H5C2_auto_size_ctl_t.
+ *		provided instance of struct H5C_auto_size_ctl_t.
  *
  *		Do nothing and return SUCCEED if no errors are detected,
  *		and flag an error and return FAIL otherwise.
@@ -5870,25 +5870,25 @@ done:
  */
 
 herr_t
-H5C2_validate_resize_config(H5C2_auto_size_ctl_t * config_ptr,
+H5C_validate_resize_config(H5C_auto_size_ctl_t * config_ptr,
                            unsigned int tests)
 {
     herr_t              ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_validate_resize_config, FAIL)
+    FUNC_ENTER_NOAPI(H5C_validate_resize_config, FAIL)
 
     if ( config_ptr == NULL ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "NULL config_ptr on entry.")
     }
 
-    if ( config_ptr->version != H5C2__CURR_AUTO_SIZE_CTL_VER ) {
+    if ( config_ptr->version != H5C__CURR_AUTO_SIZE_CTL_VER ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Unknown config version.")
     }
 
 
-    if ( (tests & H5C2_RESIZE_CFG__VALIDATE_GENERAL) != 0 ) {
+    if ( (tests & H5C_RESIZE_CFG__VALIDATE_GENERAL) != 0 ) {
 
         if ( ( config_ptr->set_initial_size != TRUE ) &&
              ( config_ptr->set_initial_size != FALSE ) ) {
@@ -5897,12 +5897,12 @@ H5C2_validate_resize_config(H5C2_auto_size_ctl_t * config_ptr,
                         "set_initial_size must be either TRUE or FALSE");
         }
 
-        if ( config_ptr->max_size > H5C2__MAX_MAX_CACHE_SIZE ) {
+        if ( config_ptr->max_size > H5C__MAX_MAX_CACHE_SIZE ) {
 
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "max_size too big");
         }
 
-        if ( config_ptr->min_size < H5C2__MIN_MAX_CACHE_SIZE ) {
+        if ( config_ptr->min_size < H5C__MIN_MAX_CACHE_SIZE ) {
 
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "min_size too small");
         }
@@ -5927,27 +5927,27 @@ H5C2_validate_resize_config(H5C2_auto_size_ctl_t * config_ptr,
                   "min_clean_fraction must be in the interval [0.0, 1.0]");
         }
 
-        if ( config_ptr->epoch_length < H5C2__MIN_AR_EPOCH_LENGTH ) {
+        if ( config_ptr->epoch_length < H5C__MIN_AR_EPOCH_LENGTH ) {
 
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "epoch_length too small");
         }
 
-        if ( config_ptr->epoch_length > H5C2__MAX_AR_EPOCH_LENGTH ) {
+        if ( config_ptr->epoch_length > H5C__MAX_AR_EPOCH_LENGTH ) {
 
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "epoch_length too big");
         }
-    } /* H5C2_RESIZE_CFG__VALIDATE_GENERAL */
+    } /* H5C_RESIZE_CFG__VALIDATE_GENERAL */
 
 
-    if ( (tests & H5C2_RESIZE_CFG__VALIDATE_INCREMENT) != 0 ) {
+    if ( (tests & H5C_RESIZE_CFG__VALIDATE_INCREMENT) != 0 ) {
 
-        if ( ( config_ptr->incr_mode != H5C2_incr__off ) &&
-             ( config_ptr->incr_mode != H5C2_incr__threshold ) ) {
+        if ( ( config_ptr->incr_mode != H5C_incr__off ) &&
+             ( config_ptr->incr_mode != H5C_incr__threshold ) ) {
 
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Invalid incr_mode");
         }
 
-        if ( config_ptr->incr_mode == H5C2_incr__threshold ) {
+        if ( config_ptr->incr_mode == H5C_incr__threshold ) {
 
             if ( ( config_ptr->lower_hr_threshold < 0.0 ) ||
                  ( config_ptr->lower_hr_threshold > 1.0 ) ) {
@@ -5972,15 +5972,15 @@ H5C2_validate_resize_config(H5C2_auto_size_ctl_t * config_ptr,
             /* no need to check max_increment, as it is a size_t,
              * and thus must be non-negative.
              */
-        } /* H5C2_incr__threshold */
+        } /* H5C_incr__threshold */
 
         switch ( config_ptr->flash_incr_mode )
         {
-            case H5C2_flash_incr__off:
+            case H5C_flash_incr__off:
                 /* nothing to do here */
                 break;
 
-            case H5C2_flash_incr__add_space:
+            case H5C_flash_incr__add_space:
                 if ( ( config_ptr->flash_multiple < 0.1 ) ||
                      ( config_ptr->flash_multiple > 10.0 ) ) {
 
@@ -6001,21 +6001,21 @@ H5C2_validate_resize_config(H5C2_auto_size_ctl_t * config_ptr,
                             "Invalid flash_incr_mode");
                 break;
         }
-    } /* H5C2_RESIZE_CFG__VALIDATE_INCREMENT */
+    } /* H5C_RESIZE_CFG__VALIDATE_INCREMENT */
 
 
-    if ( (tests & H5C2_RESIZE_CFG__VALIDATE_DECREMENT) != 0 ) {
+    if ( (tests & H5C_RESIZE_CFG__VALIDATE_DECREMENT) != 0 ) {
 
-        if ( ( config_ptr->decr_mode != H5C2_decr__off ) &&
-             ( config_ptr->decr_mode != H5C2_decr__threshold ) &&
-             ( config_ptr->decr_mode != H5C2_decr__age_out ) &&
-             ( config_ptr->decr_mode != H5C2_decr__age_out_with_threshold )
+        if ( ( config_ptr->decr_mode != H5C_decr__off ) &&
+             ( config_ptr->decr_mode != H5C_decr__threshold ) &&
+             ( config_ptr->decr_mode != H5C_decr__age_out ) &&
+             ( config_ptr->decr_mode != H5C_decr__age_out_with_threshold )
            ) {
 
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Invalid decr_mode");
         }
 
-        if ( config_ptr->decr_mode == H5C2_decr__threshold ) {
+        if ( config_ptr->decr_mode == H5C_decr__threshold ) {
 
             if ( config_ptr->upper_hr_threshold > 1.0 ) {
 
@@ -6033,10 +6033,10 @@ H5C2_validate_resize_config(H5C2_auto_size_ctl_t * config_ptr,
             /* no need to check max_decrement as it is a size_t
              * and thus must be non-negative.
              */
-        } /* H5C2_decr__threshold */
+        } /* H5C_decr__threshold */
 
-        if ( ( config_ptr->decr_mode == H5C2_decr__age_out ) ||
-             ( config_ptr->decr_mode == H5C2_decr__age_out_with_threshold )
+        if ( ( config_ptr->decr_mode == H5C_decr__age_out ) ||
+             ( config_ptr->decr_mode == H5C_decr__age_out_with_threshold )
            ) {
 
             if ( config_ptr->epochs_before_eviction < 1 ) {
@@ -6045,7 +6045,7 @@ H5C2_validate_resize_config(H5C2_auto_size_ctl_t * config_ptr,
                             "epochs_before_eviction must be positive");
             }
 
-            if ( config_ptr->epochs_before_eviction > H5C2__MAX_EPOCH_MARKERS ) {
+            if ( config_ptr->epochs_before_eviction > H5C__MAX_EPOCH_MARKERS ) {
 
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
                             "epochs_before_eviction too big");
@@ -6069,9 +6069,9 @@ H5C2_validate_resize_config(H5C2_auto_size_ctl_t * config_ptr,
             /* no need to check max_decrement as it is a size_t
              * and thus must be non-negative.
              */
-        } /* H5C2_decr__age_out || H5C2_decr__age_out_with_threshold */
+        } /* H5C_decr__age_out || H5C_decr__age_out_with_threshold */
 
-        if ( config_ptr->decr_mode == H5C2_decr__age_out_with_threshold ) {
+        if ( config_ptr->decr_mode == H5C_decr__age_out_with_threshold ) {
 
             if ( ( config_ptr->upper_hr_threshold > 1.0 ) ||
                  ( config_ptr->upper_hr_threshold < 0.0 ) ) {
@@ -6079,18 +6079,18 @@ H5C2_validate_resize_config(H5C2_auto_size_ctl_t * config_ptr,
                 HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
                        "upper_hr_threshold must be in the interval [0.0, 1.0]");
             }
-        } /* H5C2_decr__age_out_with_threshold */
+        } /* H5C_decr__age_out_with_threshold */
 
-    } /* H5C2_RESIZE_CFG__VALIDATE_DECREMENT */
+    } /* H5C_RESIZE_CFG__VALIDATE_DECREMENT */
 
 
-    if ( (tests & H5C2_RESIZE_CFG__VALIDATE_INTERACTIONS) != 0 ) {
+    if ( (tests & H5C_RESIZE_CFG__VALIDATE_INTERACTIONS) != 0 ) {
 
-        if ( ( config_ptr->incr_mode == H5C2_incr__threshold )
+        if ( ( config_ptr->incr_mode == H5C_incr__threshold )
              &&
-             ( ( config_ptr->decr_mode == H5C2_decr__threshold )
+             ( ( config_ptr->decr_mode == H5C_decr__threshold )
                ||
-               ( config_ptr->decr_mode == H5C2_decr__age_out_with_threshold )
+               ( config_ptr->decr_mode == H5C_decr__age_out_with_threshold )
              )
              &&
              ( config_ptr->lower_hr_threshold
@@ -6102,13 +6102,13 @@ H5C2_validate_resize_config(H5C2_auto_size_ctl_t * config_ptr,
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, \
                         "conflicting threshold fields in config.")
         }
-    } /* H5C2_RESIZE_CFG__VALIDATE_INTERACTIONS */
+    } /* H5C_RESIZE_CFG__VALIDATE_INTERACTIONS */
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_validate_resize_config() */
+} /* H5C_validate_resize_config() */
 
 
 /*************************************************************************/
@@ -6117,7 +6117,7 @@ done:
 
 /*-------------------------------------------------------------------------
  *
- * Function:	H5C2__auto_adjust_cache_size
+ * Function:	H5C__auto_adjust_cache_size
  *
  * Purpose:    	Obtain the current full cache hit rate, and compare it
  *		with the hit rate thresholds for modifying cache size.
@@ -6138,7 +6138,7 @@ done:
  *		JRM -- 11/18/04
  *		Major re-write to support ageout method of cache size
  *		reduction, and to adjust to changes in the
- *		H5C2_auto_size_ctl_t structure.
+ *		H5C_auto_size_ctl_t structure.
  *
  *		JRM -- 9/8/07
  *		Reworked to accomodate cache API changes needed to
@@ -6154,9 +6154,9 @@ done:
  */
 
 static herr_t
-H5C2__auto_adjust_cache_size(H5F_t * f,
+H5C__auto_adjust_cache_size(H5F_t * f,
                              hid_t dxpl_id,
-                             H5C2_t * cache_ptr,
+                             H5C_t * cache_ptr,
                              hbool_t write_permitted)
 {
     herr_t			result;
@@ -6166,14 +6166,14 @@ H5C2__auto_adjust_cache_size(H5F_t * f,
     size_t			new_min_clean_size = 0;
     size_t			old_min_clean_size = 0;
     double			hit_rate;
-    enum H5C2_resize_status	status = in_spec2; /* will change if needed */
+    enum H5C_resize_status	status = in_spec2; /* will change if needed */
     herr_t			ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2__auto_adjust_cache_size)
+    FUNC_ENTER_NOAPI_NOINIT(H5C__auto_adjust_cache_size)
 
     HDassert( f );
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->cache_accesses >=
               (cache_ptr->resize_ctl).epoch_length );
     HDassert( 0.0 <= (cache_ptr->resize_ctl).min_clean_fraction );
@@ -6184,10 +6184,10 @@ H5C2__auto_adjust_cache_size(H5F_t * f,
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Auto cache resize disabled.")
     }
 
-    HDassert( ( (cache_ptr->resize_ctl).incr_mode != H5C2_incr__off ) || \
-              ( (cache_ptr->resize_ctl).decr_mode != H5C2_decr__off ) );
+    HDassert( ( (cache_ptr->resize_ctl).incr_mode != H5C_incr__off ) || \
+              ( (cache_ptr->resize_ctl).decr_mode != H5C_decr__off ) );
 
-    if ( H5C2_get_cache_hit_rate(cache_ptr, &hit_rate) != SUCCEED ) {
+    if ( H5C_get_cache_hit_rate(cache_ptr, &hit_rate) != SUCCEED ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't get hit rate.")
     }
@@ -6196,15 +6196,15 @@ H5C2__auto_adjust_cache_size(H5F_t * f,
 
     switch ( (cache_ptr->resize_ctl).incr_mode )
     {
-        case H5C2_incr__off:
+        case H5C_incr__off:
             if ( cache_ptr->size_increase_possible ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                           "size_increase_possible but H5C2_incr__off?!?!?")
+                           "size_increase_possible but H5C_incr__off?!?!?")
             }
             break;
 
-        case H5C2_incr__threshold:
+        case H5C_incr__threshold:
             if ( hit_rate < (cache_ptr->resize_ctl).lower_hr_threshold ) {
 
                 if ( ! cache_ptr->size_increase_possible ) {
@@ -6266,10 +6266,10 @@ H5C2__auto_adjust_cache_size(H5F_t * f,
      * entry.  The inserted_epoch_marker flag is used to track this.
      */
 
-    if ( ( ( (cache_ptr->resize_ctl).decr_mode == H5C2_decr__age_out )
+    if ( ( ( (cache_ptr->resize_ctl).decr_mode == H5C_decr__age_out )
            ||
            ( (cache_ptr->resize_ctl).decr_mode ==
-              H5C2_decr__age_out_with_threshold
+              H5C_decr__age_out_with_threshold
            )
          )
          &&
@@ -6278,7 +6278,7 @@ H5C2__auto_adjust_cache_size(H5F_t * f,
          )
        ) {
 
-        result = H5C2__autoadjust__ageout__insert_new_marker(cache_ptr);
+        result = H5C__autoadjust__ageout__insert_new_marker(cache_ptr);
 
         if ( result != SUCCEED ) {
 
@@ -6300,10 +6300,10 @@ H5C2__auto_adjust_cache_size(H5F_t * f,
 
         switch ( (cache_ptr->resize_ctl).decr_mode )
         {
-            case H5C2_decr__off:
+            case H5C_decr__off:
                 break;
 
-            case H5C2_decr__threshold:
+            case H5C_decr__threshold:
                 if ( hit_rate > (cache_ptr->resize_ctl).upper_hr_threshold ) {
 
                     if ( ! cache_ptr->size_decrease_possible ) {
@@ -6346,8 +6346,8 @@ H5C2__auto_adjust_cache_size(H5F_t * f,
                 }
                 break;
 
-            case H5C2_decr__age_out_with_threshold:
-            case H5C2_decr__age_out:
+            case H5C_decr__age_out_with_threshold:
+            case H5C_decr__age_out:
                 if ( ! inserted_epoch_marker ) {
 
                     if ( ! cache_ptr->size_decrease_possible ) {
@@ -6356,7 +6356,7 @@ H5C2__auto_adjust_cache_size(H5F_t * f,
 
                     } else {
 
-                        result = H5C2__autoadjust__ageout(f,
+                        result = H5C__autoadjust__ageout(f,
                                                           dxpl_id,
                                                           cache_ptr,
                                                           hit_rate,
@@ -6379,10 +6379,10 @@ H5C2__auto_adjust_cache_size(H5F_t * f,
     }
 
     /* cycle the epoch markers here if appropriate */
-    if ( ( ( (cache_ptr->resize_ctl).decr_mode == H5C2_decr__age_out )
+    if ( ( ( (cache_ptr->resize_ctl).decr_mode == H5C_decr__age_out )
            ||
            ( (cache_ptr->resize_ctl).decr_mode ==
-              H5C2_decr__age_out_with_threshold
+              H5C_decr__age_out_with_threshold
            )
          )
          &&
@@ -6390,7 +6390,7 @@ H5C2__auto_adjust_cache_size(H5F_t * f,
        ) {
 
         /* move last epoch marker to the head of the LRU list */
-        result = H5C2__autoadjust__ageout__cycle_epoch_marker(cache_ptr);
+        result = H5C__autoadjust__ageout__cycle_epoch_marker(cache_ptr);
 
         if ( result != SUCCEED ) {
 
@@ -6436,13 +6436,13 @@ H5C2__auto_adjust_cache_size(H5F_t * f,
 
             switch ( (cache_ptr->resize_ctl).flash_incr_mode )
             {
-                case H5C2_flash_incr__off:
+                case H5C_flash_incr__off:
 
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                     "flash_size_increase_possible but H5C2_flash_incr__off?!")
+                     "flash_size_increase_possible but H5C_flash_incr__off?!")
                     break;
 
-                case H5C2_flash_incr__add_space:
+                case H5C_flash_incr__add_space:
                     cache_ptr->flash_size_increase_threshold =
                         (size_t)
                         (((double)(cache_ptr->max_cache_size)) *
@@ -6461,7 +6461,7 @@ H5C2__auto_adjust_cache_size(H5F_t * f,
 
         (*((cache_ptr->resize_ctl).rpt_fcn))
             (cache_ptr,
-             H5C2__CURR_AUTO_RESIZE_RPT_FCN_VER,
+             H5C__CURR_AUTO_RESIZE_RPT_FCN_VER,
              hit_rate,
              status,
              old_max_cache_size,
@@ -6470,23 +6470,23 @@ H5C2__auto_adjust_cache_size(H5F_t * f,
              new_min_clean_size);
     }
 
-    if ( H5C2_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED ) {
+    if ( H5C_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED ) {
 
         /* this should be impossible... */
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_reset_cache_hit_rate_stats failed.")
+                    "H5C_reset_cache_hit_rate_stats failed.")
     }
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2__auto_adjust_cache_size() */
+} /* H5C__auto_adjust_cache_size() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2__autoadjust__ageout
+ * Function:    H5C__autoadjust__ageout
  *
  * Purpose:     Implement the ageout automatic cache size decrement
  *		algorithm.  Note that while this code evicts aged out
@@ -6513,11 +6513,11 @@ done:
  */
 
 static herr_t
-H5C2__autoadjust__ageout(H5F_t * f,
+H5C__autoadjust__ageout(H5F_t * f,
                         hid_t dxpl_id,
-                        H5C2_t * cache_ptr,
+                        H5C_t * cache_ptr,
                         double hit_rate,
-                        enum H5C2_resize_status * status_ptr,
+                        enum H5C_resize_status * status_ptr,
                         size_t * new_max_cache_size_ptr,
                         hbool_t write_permitted)
 {
@@ -6525,11 +6525,11 @@ H5C2__autoadjust__ageout(H5F_t * f,
     herr_t	result;
     size_t	test_size;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2__autoadjust__ageout)
+    FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout)
 
     HDassert( f );
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( ( status_ptr ) && ( *status_ptr == in_spec2 ) );
     HDassert( ( new_max_cache_size_ptr ) && ( *new_max_cache_size_ptr == 0 ) );
 
@@ -6537,7 +6537,7 @@ H5C2__autoadjust__ageout(H5F_t * f,
     if ( cache_ptr->epoch_markers_active >
          (cache_ptr->resize_ctl).epochs_before_eviction ) {
 
-        result = H5C2__autoadjust__ageout__remove_excess_markers(cache_ptr);
+        result = H5C__autoadjust__ageout__remove_excess_markers(cache_ptr);
 
         if ( result != SUCCEED ) {
 
@@ -6546,10 +6546,10 @@ H5C2__autoadjust__ageout(H5F_t * f,
         }
     }
 
-    if ( ( (cache_ptr->resize_ctl).decr_mode == H5C2_decr__age_out )
+    if ( ( (cache_ptr->resize_ctl).decr_mode == H5C_decr__age_out )
          ||
          ( ( (cache_ptr->resize_ctl).decr_mode ==
-              H5C2_decr__age_out_with_threshold
+              H5C_decr__age_out_with_threshold
                )
            &&
            ( hit_rate >= (cache_ptr->resize_ctl).upper_hr_threshold )
@@ -6559,7 +6559,7 @@ H5C2__autoadjust__ageout(H5F_t * f,
         if ( cache_ptr->max_cache_size > (cache_ptr->resize_ctl).min_size ){
 
             /* evict aged out cache entries if appropriate... */
-            result = H5C2__autoadjust__ageout__evict_aged_out_entries
+            result = H5C__autoadjust__ageout__evict_aged_out_entries
                      (
                        f,
                        dxpl_id,
@@ -6623,12 +6623,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2__autoadjust__ageout() */
+} /* H5C__autoadjust__ageout() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2__autoadjust__ageout__cycle_epoch_marker
+ * Function:    H5C__autoadjust__ageout__cycle_epoch_marker
  *
  * Purpose:     Remove the oldest epoch marker from the LRU list,
  *		and reinsert it at the head of the LRU list.  Also
@@ -6648,15 +6648,15 @@ done:
  */
 
 static herr_t
-H5C2__autoadjust__ageout__cycle_epoch_marker(H5C2_t * cache_ptr)
+H5C__autoadjust__ageout__cycle_epoch_marker(H5C_t * cache_ptr)
 {
     herr_t                      ret_value = SUCCEED;      /* Return value */
     int i;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2__autoadjust__ageout__cycle_epoch_marker)
+    FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__cycle_epoch_marker)
 
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     if ( cache_ptr->epoch_markers_active <= 0 ) {
 
@@ -6670,7 +6670,7 @@ H5C2__autoadjust__ageout__cycle_epoch_marker(H5C2_t * cache_ptr)
 
     cache_ptr->epoch_marker_ringbuf_first =
             (cache_ptr->epoch_marker_ringbuf_first + 1) %
-            (H5C2__MAX_EPOCH_MARKERS + 1);
+            (H5C__MAX_EPOCH_MARKERS + 1);
 
     cache_ptr->epoch_marker_ringbuf_size -= 1;
 
@@ -6684,7 +6684,7 @@ H5C2__autoadjust__ageout__cycle_epoch_marker(H5C2_t * cache_ptr)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "unused marker in LRU?!?")
     }
 
-    H5C2__DLL_REMOVE((&((cache_ptr->epoch_markers)[i])), \
+    H5C__DLL_REMOVE((&((cache_ptr->epoch_markers)[i])), \
                     (cache_ptr)->LRU_head_ptr, \
                     (cache_ptr)->LRU_tail_ptr, \
                     (cache_ptr)->LRU_list_len, \
@@ -6701,18 +6701,18 @@ H5C2__autoadjust__ageout__cycle_epoch_marker(H5C2_t * cache_ptr)
 
     cache_ptr->epoch_marker_ringbuf_last =
         (cache_ptr->epoch_marker_ringbuf_last + 1) %
-        (H5C2__MAX_EPOCH_MARKERS + 1);
+        (H5C__MAX_EPOCH_MARKERS + 1);
 
     (cache_ptr->epoch_marker_ringbuf)[cache_ptr->epoch_marker_ringbuf_last] = i;
 
     cache_ptr->epoch_marker_ringbuf_size += 1;
 
-    if ( cache_ptr->epoch_marker_ringbuf_size > H5C2__MAX_EPOCH_MARKERS ) {
+    if ( cache_ptr->epoch_marker_ringbuf_size > H5C__MAX_EPOCH_MARKERS ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "ring buffer overflow.")
     }
 
-    H5C2__DLL_PREPEND((&((cache_ptr->epoch_markers)[i])), \
+    H5C__DLL_PREPEND((&((cache_ptr->epoch_markers)[i])), \
                      (cache_ptr)->LRU_head_ptr, \
                      (cache_ptr)->LRU_tail_ptr, \
                      (cache_ptr)->LRU_list_len, \
@@ -6722,12 +6722,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2__autoadjust__ageout__cycle_epoch_marker() */
+} /* H5C__autoadjust__ageout__cycle_epoch_marker() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2__autoadjust__ageout__evict_aged_out_entries
+ * Function:    H5C__autoadjust__ageout__evict_aged_out_entries
  *
  * Purpose:     Evict clean entries in the cache that haven't
  *		been accessed for at least
@@ -6797,25 +6797,25 @@ done:
  */
 
 static herr_t
-H5C2__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
+H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
                                                  hid_t    dxpl_id,
-                                                 H5C2_t * cache_ptr,
+                                                 H5C_t * cache_ptr,
                                                  hbool_t write_permitted)
 {
     herr_t               result;
     size_t		 eviction_size_limit;
     size_t		 bytes_evicted = 0;
     hbool_t		 prev_is_dirty = FALSE;
-    H5C2_cache_entry_t * entry_ptr;
-    H5C2_cache_entry_t * next_ptr;
-    H5C2_cache_entry_t * prev_ptr;
+    H5C_cache_entry_t * entry_ptr;
+    H5C_cache_entry_t * next_ptr;
+    H5C_cache_entry_t * prev_ptr;
     herr_t               ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2__autoadjust__ageout__evict_aged_out_entries)
+    FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__evict_aged_out_entries)
 
     HDassert( f );
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     /* if there is a limit on the amount that the cache size can be decrease
      * in any one round of the cache size reduction algorithm, load that
@@ -6837,7 +6837,7 @@ H5C2__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
         entry_ptr = cache_ptr->LRU_tail_ptr;
 
         while ( ( entry_ptr != NULL ) &&
-                ( (entry_ptr->type)->id != H5C2__EPOCH_MARKER_TYPE ) &&
+                ( (entry_ptr->type)->id != H5C__EPOCH_MARKER_TYPE ) &&
                 ( bytes_evicted < eviction_size_limit ) )
         {
             HDassert( ! (entry_ptr->is_protected) );
@@ -6852,23 +6852,23 @@ H5C2__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
 
             if ( entry_ptr->is_dirty ) {
 
-                result = H5C2_flush_single_entry(f,
+                result = H5C_flush_single_entry(f,
                                                  dxpl_id,
                                                  cache_ptr,
                                                  entry_ptr->type,
                                                  entry_ptr->addr,
-                                                 H5C2__NO_FLAGS_SET,
+                                                 H5C__NO_FLAGS_SET,
                                                  FALSE);
             } else {
 
                 bytes_evicted += entry_ptr->size;
 
-                result = H5C2_flush_single_entry(f,
+                result = H5C_flush_single_entry(f,
                                                  dxpl_id,
                                                  cache_ptr,
                                                  entry_ptr->type,
                                                  entry_ptr->addr,
-                                                 H5C2__FLUSH_INVALIDATE_FLAG,
+                                                 H5C__FLUSH_INVALIDATE_FLAG,
                                                  TRUE);
             }
 
@@ -6880,7 +6880,7 @@ H5C2__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
 
             if ( prev_ptr != NULL ) {
 #ifndef NDEBUG
-                if ( prev_ptr->magic != H5C2__H5C2_CACHE_ENTRY_T_MAGIC ) {
+                if ( prev_ptr->magic != H5C__H5C_CACHE_ENTRY_T_MAGIC ) {
 
                     /* something horrible has happened to *prev_ptr --
                      * scream and die.
@@ -6946,12 +6946,12 @@ H5C2__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
          * slowdown.
          */
 
-        HDassert( H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS );
+        HDassert( H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS );
 
         entry_ptr = cache_ptr->LRU_tail_ptr;
 
         while ( ( entry_ptr != NULL ) &&
-                ( (entry_ptr->type)->id != H5C2__EPOCH_MARKER_TYPE ) &&
+                ( (entry_ptr->type)->id != H5C__EPOCH_MARKER_TYPE ) &&
                 ( bytes_evicted < eviction_size_limit ) )
         {
             HDassert( ! (entry_ptr->is_protected) );
@@ -6960,12 +6960,12 @@ H5C2__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
 
             if ( ! (entry_ptr->is_dirty) ) {
 
-                result = H5C2_flush_single_entry(f,
+                result = H5C_flush_single_entry(f,
                                                  dxpl_id,
                                                  cache_ptr,
                                                  entry_ptr->type,
                                                  entry_ptr->addr,
-                                                 H5C2__FLUSH_INVALIDATE_FLAG,
+                                                 H5C__FLUSH_INVALIDATE_FLAG,
                                                  TRUE);
 
                 if ( result < 0 ) {
@@ -6996,12 +6996,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2__autoadjust__ageout__evict_aged_out_entries() */
+} /* H5C__autoadjust__ageout__evict_aged_out_entries() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2__autoadjust__ageout__insert_new_marker
+ * Function:    H5C__autoadjust__ageout__insert_new_marker
  *
  * Purpose:     Find an unused marker cache entry, mark it as used, and
  *		insert it at the head of the LRU list.  Also add the
@@ -7019,15 +7019,15 @@ done:
  */
 
 static herr_t
-H5C2__autoadjust__ageout__insert_new_marker(H5C2_t * cache_ptr)
+H5C__autoadjust__ageout__insert_new_marker(H5C_t * cache_ptr)
 {
     herr_t                      ret_value = SUCCEED;      /* Return value */
     int i;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2__autoadjust__ageout__insert_new_marker)
+    FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__insert_new_marker)
 
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     if ( cache_ptr->epoch_markers_active >=
          (cache_ptr->resize_ctl).epochs_before_eviction ) {
@@ -7039,12 +7039,12 @@ H5C2__autoadjust__ageout__insert_new_marker(H5C2_t * cache_ptr)
     /* find an unused marker */
     i = 0;
     while ( ( (cache_ptr->epoch_marker_active)[i] ) &&
-            ( i < H5C2__MAX_EPOCH_MARKERS ) )
+            ( i < H5C__MAX_EPOCH_MARKERS ) )
     {
         i++;
     }
 
-    HDassert( i < H5C2__MAX_EPOCH_MARKERS );
+    HDassert( i < H5C__MAX_EPOCH_MARKERS );
 
     if ( (cache_ptr->epoch_marker_active)[i] != FALSE ) {
 
@@ -7059,18 +7059,18 @@ H5C2__autoadjust__ageout__insert_new_marker(H5C2_t * cache_ptr)
 
     cache_ptr->epoch_marker_ringbuf_last =
         (cache_ptr->epoch_marker_ringbuf_last + 1) %
-        (H5C2__MAX_EPOCH_MARKERS + 1);
+        (H5C__MAX_EPOCH_MARKERS + 1);
 
     (cache_ptr->epoch_marker_ringbuf)[cache_ptr->epoch_marker_ringbuf_last] = i;
 
     cache_ptr->epoch_marker_ringbuf_size += 1;
 
-    if ( cache_ptr->epoch_marker_ringbuf_size > H5C2__MAX_EPOCH_MARKERS ) {
+    if ( cache_ptr->epoch_marker_ringbuf_size > H5C__MAX_EPOCH_MARKERS ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "ring buffer overflow.")
     }
 
-    H5C2__DLL_PREPEND((&((cache_ptr->epoch_markers)[i])), \
+    H5C__DLL_PREPEND((&((cache_ptr->epoch_markers)[i])), \
                      (cache_ptr)->LRU_head_ptr, \
                      (cache_ptr)->LRU_tail_ptr, \
                      (cache_ptr)->LRU_list_len, \
@@ -7083,12 +7083,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2__autoadjust__ageout__insert_new_marker() */
+} /* H5C__autoadjust__ageout__insert_new_marker() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2__autoadjust__ageout__remove_all_markers
+ * Function:    H5C__autoadjust__ageout__remove_all_markers
  *
  * Purpose:     Remove all epoch markers from the LRU list and mark them
  *		as inactive.
@@ -7105,16 +7105,16 @@ done:
  */
 
 static herr_t
-H5C2__autoadjust__ageout__remove_all_markers(H5C2_t * cache_ptr)
+H5C__autoadjust__ageout__remove_all_markers(H5C_t * cache_ptr)
 {
     herr_t                      ret_value = SUCCEED;      /* Return value */
     int i;
     int ring_buf_index;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2__autoadjust__ageout__remove_all_markers)
+    FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__remove_all_markers)
 
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     while ( cache_ptr->epoch_markers_active > 0 )
     {
@@ -7127,7 +7127,7 @@ H5C2__autoadjust__ageout__remove_all_markers(H5C2_t * cache_ptr)
 
         cache_ptr->epoch_marker_ringbuf_first =
             (cache_ptr->epoch_marker_ringbuf_first + 1) %
-            (H5C2__MAX_EPOCH_MARKERS + 1);
+            (H5C__MAX_EPOCH_MARKERS + 1);
 
         cache_ptr->epoch_marker_ringbuf_size -= 1;
 
@@ -7142,7 +7142,7 @@ H5C2__autoadjust__ageout__remove_all_markers(H5C2_t * cache_ptr)
         }
 
         /* remove the epoch marker from the LRU list */
-        H5C2__DLL_REMOVE((&((cache_ptr->epoch_markers)[i])), \
+        H5C__DLL_REMOVE((&((cache_ptr->epoch_markers)[i])), \
                         (cache_ptr)->LRU_head_ptr, \
                         (cache_ptr)->LRU_tail_ptr, \
                         (cache_ptr)->LRU_list_len, \
@@ -7167,12 +7167,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2__autoadjust__ageout__remove_all_markers() */
+} /* H5C__autoadjust__ageout__remove_all_markers() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2__autoadjust__ageout__remove_excess_markers
+ * Function:    H5C__autoadjust__ageout__remove_excess_markers
  *
  * Purpose:     Remove epoch markers from the end of the LRU list and
  *		mark them as inactive until the number of active markers
@@ -7191,16 +7191,16 @@ done:
  */
 
 static herr_t
-H5C2__autoadjust__ageout__remove_excess_markers(H5C2_t * cache_ptr)
+H5C__autoadjust__ageout__remove_excess_markers(H5C_t * cache_ptr)
 {
     herr_t	ret_value = SUCCEED;      /* Return value */
     int		i;
     int		ring_buf_index;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2__autoadjust__ageout__remove_excess_markers)
+    FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__remove_excess_markers)
 
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     if ( cache_ptr->epoch_markers_active <=
          (cache_ptr->resize_ctl).epochs_before_eviction ) {
@@ -7220,7 +7220,7 @@ H5C2__autoadjust__ageout__remove_excess_markers(H5C2_t * cache_ptr)
 
         cache_ptr->epoch_marker_ringbuf_first =
             (cache_ptr->epoch_marker_ringbuf_first + 1) %
-            (H5C2__MAX_EPOCH_MARKERS + 1);
+            (H5C__MAX_EPOCH_MARKERS + 1);
 
         cache_ptr->epoch_marker_ringbuf_size -= 1;
 
@@ -7235,7 +7235,7 @@ H5C2__autoadjust__ageout__remove_excess_markers(H5C2_t * cache_ptr)
         }
 
         /* remove the epoch marker from the LRU list */
-        H5C2__DLL_REMOVE((&((cache_ptr->epoch_markers)[i])), \
+        H5C__DLL_REMOVE((&((cache_ptr->epoch_markers)[i])), \
                         (cache_ptr)->LRU_head_ptr, \
                         (cache_ptr)->LRU_tail_ptr, \
                         (cache_ptr)->LRU_list_len, \
@@ -7260,12 +7260,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2__autoadjust__ageout__remove_excess_markers() */
+} /* H5C__autoadjust__ageout__remove_excess_markers() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2__flash_increase_cache_size
+ * Function:    H5C__flash_increase_cache_size
  *
  * Purpose:     If there is not at least new_entry_size - old_entry_size
  *              bytes of free space in the cache and the current
@@ -7285,7 +7285,7 @@ done:
  */
 
 static herr_t
-H5C2__flash_increase_cache_size(H5C2_t * cache_ptr,
+H5C__flash_increase_cache_size(H5C_t * cache_ptr,
                                 size_t old_entry_size,
                                 size_t new_entry_size)
 {
@@ -7294,13 +7294,13 @@ H5C2__flash_increase_cache_size(H5C2_t * cache_ptr,
     size_t                      new_min_clean_size = 0;
     size_t                      old_min_clean_size = 0;
     size_t                      space_needed;
-    enum H5C2_resize_status     status = flash_increase2; /* may change */
+    enum H5C_resize_status     status = flash_increase2; /* may change */
     double                      hit_rate;
     herr_t                      ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2__flash_increase_cache_size)
+    FUNC_ENTER_NOAPI_NOINIT(H5C__flash_increase_cache_size)
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->flash_size_increase_possible );
     HDassert( new_entry_size > cache_ptr->flash_size_increase_threshold );
     HDassert( old_entry_size < new_entry_size );
@@ -7321,12 +7321,12 @@ H5C2__flash_increase_cache_size(H5C2_t * cache_ptr,
 
         switch ( (cache_ptr->resize_ctl).flash_incr_mode )
         {
-            case H5C2_flash_incr__off:
+            case H5C_flash_incr__off:
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                   "flash_size_increase_possible but H5C2_flash_incr__off?!")
+                   "flash_size_increase_possible but H5C_flash_incr__off?!")
                 break;
 
-            case H5C2_flash_incr__add_space:
+            case H5C_flash_incr__add_space:
                 if ( cache_ptr->index_size < cache_ptr->max_cache_size ) {
 
                     HDassert( (cache_ptr->max_cache_size -
@@ -7373,12 +7373,12 @@ H5C2__flash_increase_cache_size(H5C2_t * cache_ptr,
 
         switch ( (cache_ptr->resize_ctl).flash_incr_mode )
         {
-            case H5C2_flash_incr__off:
+            case H5C_flash_incr__off:
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "flash_size_increase_possible but H5C2_flash_incr__off?!")
+                    "flash_size_increase_possible but H5C_flash_incr__off?!")
                 break;
 
-            case H5C2_flash_incr__add_space:
+            case H5C_flash_incr__add_space:
                 cache_ptr->flash_size_increase_threshold =
                     (size_t)
                     (((double)(cache_ptr->max_cache_size)) *
@@ -7401,14 +7401,14 @@ H5C2__flash_increase_cache_size(H5C2_t * cache_ptr,
             /* get the hit rate for the reporting function.  Should still
              * be good as we havent reset the hit rate statistics.
              */
-            if ( H5C2_get_cache_hit_rate(cache_ptr, &hit_rate) != SUCCEED ) {
+            if ( H5C_get_cache_hit_rate(cache_ptr, &hit_rate) != SUCCEED ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Can't get hit rate.")
             }
 
             (*((cache_ptr->resize_ctl).rpt_fcn))
                 (cache_ptr,
-                 H5C2__CURR_AUTO_RESIZE_RPT_FCN_VER,
+                 H5C__CURR_AUTO_RESIZE_RPT_FCN_VER,
                  hit_rate,
                  status,
                  old_max_cache_size,
@@ -7417,11 +7417,11 @@ H5C2__flash_increase_cache_size(H5C2_t * cache_ptr,
                  new_min_clean_size);
         }
 
-        if ( H5C2_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED ) {
+        if ( H5C_reset_cache_hit_rate_stats(cache_ptr) != SUCCEED ) {
 
             /* this should be impossible... */
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C2_reset_cache_hit_rate_stats failed.")
+                        "H5C_reset_cache_hit_rate_stats failed.")
         }
     }
 
@@ -7429,12 +7429,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2__flash_increase_cache_size() */
+} /* H5C__flash_increase_cache_size() */
 
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_flush_invalidate_cache
+ * Function:    H5C_flush_invalidate_cache
  *
  * Purpose:	Flush and destroy the entries contained in the target
  *		cache.
@@ -7476,7 +7476,7 @@ done:
  *
  *		 Reworked argument list and code to reflect the
  *		 removal of the secondary dxpl id, and the decision
- *		 to store f in H5C2_t, removing the need to pass it
+ *		 to store f in H5C_t, removing the need to pass it
  *		 in all the time.
  *		                                     -- JRM 8/27/06
  *
@@ -7499,9 +7499,9 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5C2_flush_invalidate_cache(const H5F_t * f,
+H5C_flush_invalidate_cache(const H5F_t * f,
                             hid_t    dxpl_id,
-                            H5C2_t * cache_ptr,
+                            H5C_t * cache_ptr,
 			    unsigned flags)
 {
     herr_t              status;
@@ -7513,33 +7513,33 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
     int32_t		passes = 0;
     unsigned		cooked_flags;
     H5SL_node_t * 	node_ptr = NULL;
-    H5C2_cache_entry_t *	entry_ptr = NULL;
-    H5C2_cache_entry_t *	next_entry_ptr = NULL;
-#if H5C2_DO_SANITY_CHECKS
+    H5C_cache_entry_t *	entry_ptr = NULL;
+    H5C_cache_entry_t *	next_entry_ptr = NULL;
+#if H5C_DO_SANITY_CHECKS
     int64_t		actual_slist_len = 0;
     int64_t		initial_slist_len = 0;
     size_t              actual_slist_size = 0;
     size_t              initial_slist_size = 0;
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
     herr_t		ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_flush_invalidate_cache, FAIL)
+    FUNC_ENTER_NOAPI(H5C_flush_invalidate_cache, FAIL)
 
     HDassert( f );
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->skip_file_checks || f );
     HDassert( cache_ptr->slist_ptr );
 
     /* Filter out the flags that are not relevant to the flush/invalidate.
-     * At present, only the H5C2__FLUSH_CLEAR_ONLY_FLAG is kept.
+     * At present, only the H5C__FLUSH_CLEAR_ONLY_FLAG is kept.
      */
-    cooked_flags = flags & H5C2__FLUSH_CLEAR_ONLY_FLAG;
+    cooked_flags = flags & H5C__FLUSH_CLEAR_ONLY_FLAG;
 
     /* remove ageout markers if present */
     if ( cache_ptr->epoch_markers_active > 0 ) {
 
-        status = H5C2__autoadjust__ageout__remove_all_markers(cache_ptr);
+        status = H5C__autoadjust__ageout__remove_all_markers(cache_ptr);
 
         if ( status != SUCCEED ) {
 
@@ -7558,7 +7558,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
      * Since the fractal heap can dirty, resize, and/or rename entries
      * in is flush callback, it is possible that the cache will still
      * contain dirty entries at this point.  If so, we must make up to
-     * H5C2__MAX_PASSES_ON_FLUSH more passes through the skip list
+     * H5C__MAX_PASSES_ON_FLUSH more passes through the skip list
      * to allow it to empty.  If is is not empty at this point, we again
      * scream and die.
      *
@@ -7605,7 +7605,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 			    "slist_len != 0 && node_ptr == NULL");
 	    }
 
-            next_entry_ptr = (H5C2_cache_entry_t *)H5SL_item(node_ptr);
+            next_entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
 
             if ( next_entry_ptr == NULL ) {
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
@@ -7613,15 +7613,15 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
             }
 #ifndef NDEBUG
             HDassert( next_entry_ptr->magic ==
-			    H5C2__H5C2_CACHE_ENTRY_T_MAGIC );
+			    H5C__H5C_CACHE_ENTRY_T_MAGIC );
 #endif /* NDEBUG */
             HDassert( next_entry_ptr->is_dirty );
             HDassert( next_entry_ptr->in_slist );
 
         }
 
-#if H5C2_DO_SANITY_CHECKS
-        /* Depending on circumstances, H5C2_flush_single_entry() will
+#if H5C_DO_SANITY_CHECKS
+        /* Depending on circumstances, H5C_flush_single_entry() will
          * remove dirty entries from the slist as it flushes them.
          * Thus for sanity checks we must make note of the initial
          * slist length and size before we do any flushes.
@@ -7632,7 +7632,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
         /* There is also the possibility that entries will be
          * dirtied, resized, and/or renamed as the result of
          * calls to the flush callbacks.  We use the slist_len_increase
-         * and slist_size_increase increase fields in struct H5C2_t
+         * and slist_size_increase increase fields in struct H5C_t
          * to track these changes for purpose of sanity checking.
          * To this end, we must zero these fields before we start
          * the pass through the slist.
@@ -7647,7 +7647,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 	 */
 	actual_slist_len = 0;
 	actual_slist_size = 0;
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
         while ( node_ptr != NULL )
         {
@@ -7682,7 +7682,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
              * exit.
 	     */
 #ifndef NDEBUG
-            if ( entry_ptr->magic != H5C2__H5C2_CACHE_ENTRY_T_MAGIC ) {
+            if ( entry_ptr->magic != H5C__H5C_CACHE_ENTRY_T_MAGIC ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                             "entry_ptr->magic is invalid ?!?!");
@@ -7705,7 +7705,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 
             if ( node_ptr != NULL ) {
 
-	        next_entry_ptr = (H5C2_cache_entry_t *)H5SL_item(node_ptr);
+	        next_entry_ptr = (H5C_cache_entry_t *)H5SL_item(node_ptr);
 
 	        if ( next_entry_ptr == NULL ) {
                     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
@@ -7713,7 +7713,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 	        }
 #ifndef NDEBUG
 	        HDassert( next_entry_ptr->magic ==
-				H5C2__H5C2_CACHE_ENTRY_T_MAGIC );
+				H5C__H5C_CACHE_ENTRY_T_MAGIC );
 #endif /* NDEBUG */
                 HDassert( next_entry_ptr->is_dirty );
                 HDassert( next_entry_ptr->in_slist );
@@ -7737,7 +7737,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
             HDassert( entry_ptr != NULL );
             HDassert( entry_ptr->in_slist );
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
             /* update actual_slist_len & actual_slist_size before
 	     * the flush.  Note that the entry will be removed
 	     * from the slist after the flush, and thus may be
@@ -7750,7 +7750,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 	     */
             actual_slist_len++;
             actual_slist_size += entry_ptr->size;
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
             if ( entry_ptr->is_protected ) {
 
@@ -7763,7 +7763,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 
 		/* Test to see if we are can flush the entry now.
                  * If we can, go ahead and flush, but don't tell
-                 * H5C2_flush_single_entry() to destroy the entry
+                 * H5C_flush_single_entry() to destroy the entry
                  * as pinned entries can't be evicted.
                  */
 		if ( TRUE ) { /* When we get to multithreaded cache,
@@ -7772,12 +7772,12 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 			       * condition here.
 			       */
 
-                    status = H5C2_flush_single_entry(f,
+                    status = H5C_flush_single_entry(f,
                                                      dxpl_id,
                                                      cache_ptr,
                                                      entry_ptr->type,
                                                      entry_ptr->addr,
-                                                     H5C2__NO_FLAGS_SET,
+                                                     H5C__NO_FLAGS_SET,
                                                      FALSE);
                     if ( status < 0 ) {
 
@@ -7791,13 +7791,13 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
                 }
             } else {
 
-                status = H5C2_flush_single_entry(f,
+                status = H5C_flush_single_entry(f,
                                                  dxpl_id,
                                                  cache_ptr,
                                                  entry_ptr->type,
                                                  entry_ptr->addr,
                                                  (cooked_flags |
-						  H5C2__FLUSH_INVALIDATE_FLAG),
+						  H5C__FLUSH_INVALIDATE_FLAG),
                                                  TRUE);
                 if ( status < 0 ) {
 
@@ -7812,7 +7812,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 
         } /* end while loop scanning skip list */
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
 	/* It is possible that entries were added to the slist during
 	 * the scan, either before or after scan pointer.  The following
 	 * asserts take this into account.
@@ -7829,7 +7829,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
             HDassert( (actual_slist_size + cache_ptr->slist_size) ==
 		      (initial_slist_size + cache_ptr->slist_size_increase) );
 	}
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
         /* Since we are doing a destroy, we must make a pass through
          * the hash table and try to flush - destroy all entries that
@@ -7842,7 +7842,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 	 *
 	 * Writes to disk are possible here.
          */
-        for ( i = 0; i < H5C2__HASH_TABLE_LEN; i++ )
+        for ( i = 0; i < H5C__HASH_TABLE_LEN; i++ )
         {
 	    next_entry_ptr = cache_ptr->index[i];
 
@@ -7850,13 +7850,13 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
             {
                 entry_ptr = next_entry_ptr;
 #ifndef NDEBUG
-		HDassert( entry_ptr->magic == H5C2__H5C2_CACHE_ENTRY_T_MAGIC );
+		HDassert( entry_ptr->magic == H5C__H5C_CACHE_ENTRY_T_MAGIC );
 #endif /* NDEBUG */
                 next_entry_ptr = entry_ptr->ht_next;
 #ifndef NDEBUG
 		HDassert ( ( next_entry_ptr == NULL ) ||
 			   ( next_entry_ptr->magic ==
-			     H5C2__H5C2_CACHE_ENTRY_T_MAGIC ) );
+			     H5C__H5C_CACHE_ENTRY_T_MAGIC ) );
 #endif /* NDEBUG */
                 if ( entry_ptr->is_protected ) {
 
@@ -7872,13 +7872,13 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
                 } else if ( ! ( entry_ptr->is_pinned ) ) {
 
                     status =
-		        H5C2_flush_single_entry(f,
+		        H5C_flush_single_entry(f,
                                                 dxpl_id,
                                                 cache_ptr,
                                                 entry_ptr->type,
                                                 entry_ptr->addr,
                                                 (cooked_flags |
-						 H5C2__FLUSH_INVALIDATE_FLAG),
+						 H5C__FLUSH_INVALIDATE_FLAG),
                                                 TRUE);
                     if ( status < 0 ) {
 
@@ -7912,7 +7912,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 #ifndef NDEBUG
 		if ( ( next_entry_ptr != NULL ) &&
                      ( next_entry_ptr->magic !=
-		       H5C2__H5C2_CACHE_ENTRY_T_MAGIC ) ) {
+		       H5C__H5C_CACHE_ENTRY_T_MAGIC ) ) {
 
 		    /* Something horrible has happened to
                      * *next_entry_ptr -- scream and die.
@@ -7942,7 +7942,7 @@ H5C2_flush_invalidate_cache(const H5F_t * f,
 	    passes++;
 	}
 
-	if ( passes >= H5C2__MAX_PASSES_ON_FLUSH ) {
+	if ( passes >= H5C__MAX_PASSES_ON_FLUSH ) {
 
 	    /* we have exceeded the maximum number of passes through the
 	     * cache to flush and destroy all entries.  Scream and die.
@@ -7986,12 +7986,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_flush_invalidate_cache() */
+} /* H5C_flush_invalidate_cache() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2_flush_single_entry
+ * Function:    H5C_flush_single_entry
  *
  * Purpose:     Flush or clear (and evict if requested) the cache entry
  *		with the specified address and type.  If the type is NULL,
@@ -8013,7 +8013,7 @@ done:
  *		secondary_dxpl_id is used in any subsequent flush where
  *		*first_flush_ptr is FALSE on entry.
  *
- *		If the H5C2__FLUSH_INVALIDATE_FLAG flag is set, the entry will
+ *		If the H5C__FLUSH_INVALIDATE_FLAG flag is set, the entry will
  *		be cleared and not flushed -- in the case *first_flush_ptr,
  *		primary_dxpl_id, and secondary_dxpl_id are all irrelevent,
  *		and the call can't be part of a sequence of flushes.
@@ -8045,7 +8045,7 @@ done:
  *		Updated function to reset the flush_marker field.
  *		Also replace references to H5F_FLUSH_INVALIDATE and
  *		H5F_FLUSH_CLEAR_ONLY with references to
- *		H5C2__FLUSH_INVALIDATE_FLAG and H5C2__FLUSH_CLEAR_ONLY_FLAG
+ *		H5C__FLUSH_INVALIDATE_FLAG and H5C__FLUSH_CLEAR_ONLY_FLAG
  *		respectively.
  *
  *		JRM -- 6/24/05
@@ -8057,12 +8057,12 @@ done:
  *		JRM -- 7/5/05
  *		Added code to call the new log_flush callback whenever
  *		a dirty entry is written to disk.  Note that the callback
- *		is not called if the H5C2__FLUSH_CLEAR_ONLY_FLAG is set,
+ *		is not called if the H5C__FLUSH_CLEAR_ONLY_FLAG is set,
  *		as there is no write to file in this case.
  *
  *		JRM -- 8/21/06
  *		Added code maintaining the flush_in_progress and
- *		destroy_in_progress fields in H5C2_cache_entry_t.
+ *		destroy_in_progress fields in H5C_cache_entry_t.
  *
  *		Also added flush_flags parameter to the call to
  *		type_ptr->flush() so that the flush routine can report
@@ -8081,24 +8081,24 @@ done:
  *		functions.  These functions move all metadata file I/O into
  *		the cache proper, which is necessary for metadata journaling.
  *
- *		To date, the functions of the H5C2__FLUSH_INVALIDATE_FLAG
- *		and H5C2__FLUSH_CLEAR_ONLY_FLAG have not been documented
- *		in H5C2, as these flags were just passed through to the
+ *		To date, the functions of the H5C__FLUSH_INVALIDATE_FLAG
+ *		and H5C__FLUSH_CLEAR_ONLY_FLAG have not been documented
+ *		in H5C, as these flags were just passed through to the
  *		client callbacks.  As much of the callback functionality
  *		is now in the cache, the function of these flags should
- *		be documented explicitly here in H5C2.
+ *		be documented explicitly here in H5C.
  *
- *		If the H5C2__FLUSH_INVALIDATE_FLAG is set, the entry is to
+ *		If the H5C__FLUSH_INVALIDATE_FLAG is set, the entry is to
  *		be written to disk if dirty, and then evicted from the
  *		cache and discarded.  As an optimization, the destroyed
  *		is deleted from the slist only on request.
  *
- *		If the H5C2__FLUSH_CLEAR_ONLY_FLAG is set, the entry is
+ *		If the H5C__FLUSH_CLEAR_ONLY_FLAG is set, the entry is
  *		to be marked clean if it is dirty.  Under no circumstances
  *		will it be written to disk.
  *
- *		If both the H5C2__FLUSH_INVALIDATE_FLAG and the
- *		H5C2__FLUSH_CLEAR_ONLY_FLAG are set, the entry is marked
+ *		If both the H5C__FLUSH_INVALIDATE_FLAG and the
+ *		H5C__FLUSH_CLEAR_ONLY_FLAG are set, the entry is marked
  *		clean and then evicted from the cache without writing
  *		to disk.  If dirty, the entry is removed from the slist
  *		or not as requested.
@@ -8112,10 +8112,10 @@ done:
  */
 
 static herr_t
-H5C2_flush_single_entry(const H5F_t *	     f,
+H5C_flush_single_entry(const H5F_t *	     f,
                         hid_t 		     dxpl_id,
-                        H5C2_t *	     cache_ptr,
-                        const H5C2_class_t * type_ptr,
+                        H5C_t *	     cache_ptr,
+                        const H5C_class_t * type_ptr,
                         haddr_t		     addr,
                         unsigned	     flags,
                         hbool_t		     del_entry_from_slist_on_destroy)
@@ -8130,25 +8130,25 @@ H5C2_flush_single_entry(const H5F_t *	     f,
     haddr_t		 new_addr;
     size_t		 new_len;
     void *		 new_image_ptr;
-    H5C2_cache_entry_t * entry_ptr = NULL;
+    H5C_cache_entry_t * entry_ptr = NULL;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2_flush_single_entry)
+    FUNC_ENTER_NOAPI_NOINIT(H5C_flush_single_entry)
 
     HDassert( f );
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( type_ptr );
     HDassert( H5F_addr_defined(addr) );
 
-    destroy = ( (flags & H5C2__FLUSH_INVALIDATE_FLAG) != 0 );
-    clear_only = ( (flags & H5C2__FLUSH_CLEAR_ONLY_FLAG) != 0);
+    destroy = ( (flags & H5C__FLUSH_INVALIDATE_FLAG) != 0 );
+    clear_only = ( (flags & H5C__FLUSH_CLEAR_ONLY_FLAG) != 0);
 
 
     /* attempt to find the target entry in the hash table */
-    H5C2__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
+    H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL)
 
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
     if ( entry_ptr != NULL ) {
 
         HDassert( ! ( ( destroy ) && ( entry_ptr->is_pinned ) ) );
@@ -8179,12 +8179,12 @@ H5C2_flush_single_entry(const H5F_t *	     f,
      */
     else {
         HDfprintf(stdout,
-               "H5C2_flush_single_entry(): non-existant entry. addr = 0x%lx\n",
+               "H5C_flush_single_entry(): non-existant entry. addr = 0x%lx\n",
                (long)addr);
         HDfflush(stdout);
     }
 #endif
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
 
     if ( ( entry_ptr != NULL ) && ( entry_ptr->is_protected ) )
@@ -8254,13 +8254,13 @@ H5C2_flush_single_entry(const H5F_t *	     f,
         entry_ptr->flush_marker = FALSE;
 
         if ( clear_only ) {
-            H5C2__UPDATE_STATS_FOR_CLEAR(cache_ptr, entry_ptr)
+            H5C__UPDATE_STATS_FOR_CLEAR(cache_ptr, entry_ptr)
         } else {
-            H5C2__UPDATE_STATS_FOR_FLUSH(cache_ptr, entry_ptr)
+            H5C__UPDATE_STATS_FOR_FLUSH(cache_ptr, entry_ptr)
         }
 
         if ( destroy ) {
-            H5C2__UPDATE_STATS_FOR_EVICTION(cache_ptr, entry_ptr)
+            H5C__UPDATE_STATS_FOR_EVICTION(cache_ptr, entry_ptr)
         }
 
         /* Always remove the entry from the hash table on a destroy.  On a
@@ -8269,7 +8269,7 @@ H5C2_flush_single_entry(const H5F_t *	     f,
          * from the slist only if requested.
          *
 	 * Note that it is possible that the entry will be renamed during
-	 * its call to flush.  This will upset H5C2_rename_entry() if we
+	 * its call to flush.  This will upset H5C_rename_entry() if we
 	 * don't tell it that it doesn't have to worry about updating the
 	 * index and SLIST.  Use the destroy_in_progress field for this
 	 * purpose.
@@ -8278,12 +8278,12 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 
             entry_ptr->destroy_in_progress = TRUE;
 
-            H5C2__DELETE_FROM_INDEX(cache_ptr, entry_ptr)
+            H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr)
 
             if ( ( entry_ptr->in_slist ) &&
                  ( del_entry_from_slist_on_destroy ) ) {
 
-                H5C2__REMOVE_ENTRY_FROM_SLIST(cache_ptr, entry_ptr)
+                H5C__REMOVE_ENTRY_FROM_SLIST(cache_ptr, entry_ptr)
             }
         }
 
@@ -8418,7 +8418,7 @@ H5C2_flush_single_entry(const H5F_t *	     f,
             }
 #endif /* JRM */
 
-            H5C2__UPDATE_RP_FOR_EVICTION(cache_ptr, entry_ptr, FAIL)
+            H5C__UPDATE_RP_FOR_EVICTION(cache_ptr, entry_ptr, FAIL)
 
         } else {
 
@@ -8426,12 +8426,12 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 	     * and it is on the transaction list, remove it from the transaction
 	     * list and set its last_trans field to zero.
 	     *
-	     * Must do this now, as otherwise H5C2__UPDATE_RP_FOR_FLUSH may
+	     * Must do this now, as otherwise H5C__UPDATE_RP_FOR_FLUSH may
 	     * scream incorrectly about flushing an entry with a pending
 	     * journal write.
 	     */
 	    if ( clear_only ) {
-                H5C2__UPDATE_TL_FOR_ENTRY_CLEAR(cache_ptr, entry_ptr, FAIL);
+                H5C__UPDATE_TL_FOR_ENTRY_CLEAR(cache_ptr, entry_ptr, FAIL);
             }
 
             /* We are either doing a flush or a clear.
@@ -8442,11 +8442,11 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 	     * 					JRM -- 7/7/07
 	     */
 
-            H5C2__UPDATE_RP_FOR_FLUSH(cache_ptr, entry_ptr, FAIL)
+            H5C__UPDATE_RP_FOR_FLUSH(cache_ptr, entry_ptr, FAIL)
 
             if ( entry_ptr->in_slist )
             {
-                H5C2__REMOVE_ENTRY_FROM_SLIST(cache_ptr, entry_ptr)
+                H5C__REMOVE_ENTRY_FROM_SLIST(cache_ptr, entry_ptr)
             }
         }
 
@@ -8486,14 +8486,14 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 	     * change(s).
 	     */
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
             if ( ( cache_ptr->check_write_permitted == NULL ) &&
                  ( ! (cache_ptr->write_permitted) ) ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                             "Write when writes are always forbidden!?!?!")
             }
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
 	    if ( entry_ptr->image_ptr == NULL )
             {
@@ -8529,7 +8529,7 @@ H5C2_flush_single_entry(const H5F_t *	     f,
                 {
 
                     /* Check for unexpected flags from serialize callback */
-                    if(serialize_flags & ~(H5C2__SERIALIZE_RESIZED_FLAG | H5C2__SERIALIZE_RENAMED_FLAG))
+                    if(serialize_flags & ~(H5C__SERIALIZE_RESIZED_FLAG | H5C__SERIALIZE_RENAMED_FLAG))
                         HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unknown serialize flag(s)")
 
                     if ( destroy )
@@ -8552,14 +8552,14 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 		         * deallocate the old image, and allocate a new.
 		         */
 
-                        if(serialize_flags & H5C2__SERIALIZE_RESIZED_FLAG) {
-                            H5C2__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(cache_ptr, \
+                        if(serialize_flags & H5C__SERIALIZE_RESIZED_FLAG) {
+                            H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(cache_ptr, \
                                                               entry_ptr, \
                                                               new_len)
 
                             /* Check for resize+rename */
-                            if(serialize_flags & H5C2__SERIALIZE_RENAMED_FLAG) {
-                                H5C2__UPDATE_STATS_FOR_RENAME(cache_ptr, \
+                            if(serialize_flags & H5C__SERIALIZE_RENAMED_FLAG) {
+                                H5C__UPDATE_STATS_FOR_RENAME(cache_ptr, \
                                                               entry_ptr)
 			        entry_ptr->addr = new_addr;
                             } /* end if */
@@ -8568,9 +8568,9 @@ H5C2_flush_single_entry(const H5F_t *	     f,
                             entry_ptr->image_ptr = new_image_ptr;
                         } /* end if */
                         else {
-                            HDassert(serialize_flags & H5C2__SERIALIZE_RENAMED_FLAG);
+                            HDassert(serialize_flags & H5C__SERIALIZE_RENAMED_FLAG);
 
-                            H5C2__UPDATE_STATS_FOR_RENAME(cache_ptr, \
+                            H5C__UPDATE_STATS_FOR_RENAME(cache_ptr, \
                                                           entry_ptr)
                             entry_ptr->addr = new_addr;
                         } /* end else */
@@ -8591,9 +8591,9 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 		         * cache data structures.
 		         */
 
-                        if(serialize_flags & H5C2__SERIALIZE_RESIZED_FLAG) {
+                        if(serialize_flags & H5C__SERIALIZE_RESIZED_FLAG) {
 
-                            H5C2__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(     \
+                            H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(     \
                                                                cache_ptr, \
                                                                entry_ptr, \
                                                                new_len)
@@ -8605,19 +8605,19 @@ H5C2_flush_single_entry(const H5F_t *	     f,
                             entry_ptr->is_dirty = FALSE;
 
                             /* Check for resize+rename */
-                            if(serialize_flags & H5C2__SERIALIZE_RENAMED_FLAG) {
-                                H5C2__UPDATE_STATS_FOR_RENAME(cache_ptr, \
+                            if(serialize_flags & H5C__SERIALIZE_RENAMED_FLAG) {
+                                H5C__UPDATE_STATS_FOR_RENAME(cache_ptr, \
                                                               entry_ptr)
 
 			        /* update the hash table for the rename */
-			        H5C2__DELETE_FROM_INDEX(cache_ptr, entry_ptr)
+			        H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr)
 		                entry_ptr->addr = new_addr;
-			        H5C2__INSERT_IN_INDEX(cache_ptr, entry_ptr, \
+			        H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, \
 						      FAIL)
                             } /* end if */
 
                             /* update the hash table for the size change*/
-                            H5C2__UPDATE_INDEX_FOR_SIZE_CHANGE(           \
+                            H5C__UPDATE_INDEX_FOR_SIZE_CHANGE(           \
                                                         (cache_ptr),      \
                                                         (entry_ptr->size),\
                                                         (new_len));
@@ -8628,7 +8628,7 @@ H5C2_flush_single_entry(const H5F_t *	     f,
                              * structures for the size change.  The macro
                              * deals with the pinned case.
                              */
-                            H5C2__UPDATE_RP_FOR_SIZE_CHANGE(cache_ptr, \
+                            H5C__UPDATE_RP_FOR_SIZE_CHANGE(cache_ptr, \
                                                             entry_ptr, \
                                                             new_len);
 
@@ -8644,7 +8644,7 @@ H5C2_flush_single_entry(const H5F_t *	     f,
                             entry_ptr->image_ptr = new_image_ptr;
                         } /* end if */
                         else {
-                            HDassert(serialize_flags & H5C2__SERIALIZE_RENAMED_FLAG);
+                            HDassert(serialize_flags & H5C__SERIALIZE_RENAMED_FLAG);
 
                             /* The replacement policy code thinks the
                              * entry is already clean, so modify is_dirty
@@ -8652,13 +8652,13 @@ H5C2_flush_single_entry(const H5F_t *	     f,
                              */
                             entry_ptr->is_dirty = FALSE;
 
-                            H5C2__UPDATE_STATS_FOR_RENAME(cache_ptr, \
+                            H5C__UPDATE_STATS_FOR_RENAME(cache_ptr, \
                                                           entry_ptr)
 
                             /* first update the hash table for the rename */
-                            H5C2__DELETE_FROM_INDEX(cache_ptr, entry_ptr)
+                            H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr)
                             entry_ptr->addr = new_addr;
-                            H5C2__INSERT_IN_INDEX(cache_ptr, entry_ptr, \
+                            H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, \
                                                   FAIL)
 
                             /* finally, set is_dirty to TRUE again */
@@ -8745,7 +8745,7 @@ H5C2_flush_single_entry(const H5F_t *	     f,
 	     * Also reset the pointer to the cache the entry is within. -QAK
 	     */
 #ifndef NDEBUG
-	    entry_ptr->magic = H5C2__H5C2_CACHE_ENTRY_T_BAD_MAGIC;
+	    entry_ptr->magic = H5C__H5C_CACHE_ENTRY_T_BAD_MAGIC;
 #endif /* NDEBUG */
             entry_ptr->cache_ptr = NULL;
 
@@ -8781,12 +8781,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_flush_single_entry() */
+} /* H5C_flush_single_entry() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2_load_entry
+ * Function:    H5C_load_entry
  *
  * Purpose:     Attempt to load the entry at the specified disk address
  *		and with the specified type into memory.  If successful.
@@ -8835,9 +8835,9 @@ done:
  */
 
 static void *
-H5C2_load_entry(H5F_t *              f,
+H5C_load_entry(H5F_t *              f,
                 hid_t                dxpl_id,
-                const H5C2_class_t * type,
+                const H5C_class_t * type,
                 haddr_t              addr,
 		size_t		     len,
                 void *         udata_ptr)
@@ -8845,14 +8845,14 @@ H5C2_load_entry(H5F_t *              f,
     hbool_t			dirty = FALSE;
     void *			image_ptr = NULL;
     void *			thing = NULL;
-    H5C2_cache_entry_t *	entry_ptr = NULL;
+    H5C_cache_entry_t *	entry_ptr = NULL;
     void *			ret_value = NULL;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2_load_entry)
+    FUNC_ENTER_NOAPI_NOINIT(H5C_load_entry)
 
     HDassert( f );
     HDassert( f->shared );
-    HDassert( f->shared->cache2 );
+    HDassert( f->shared->cache );
     HDassert( type );
     HDassert( H5F_addr_defined(addr) );
     HDassert( len > 0 );
@@ -8970,7 +8970,7 @@ H5C2_load_entry(H5F_t *              f,
 	}
     }
 
-    entry_ptr = (H5C2_cache_entry_t *)thing;
+    entry_ptr = (H5C_cache_entry_t *)thing;
 
     /* In general, an entry should be clean just after it is loaded.
      *
@@ -8986,17 +8986,17 @@ H5C2_load_entry(H5F_t *              f,
      * note that type ids 5 & 6 are associated with object headers in the metadata
      * cache.
      *
-     * When we get to using H5C2 for other purposes, we may wish to
+     * When we get to using H5C for other purposes, we may wish to
      * tighten up the assert so that the loophole only applies to the
      * metadata cache.
      */
 
     HDassert( ( dirty == FALSE ) || ( type->id == 5 || type->id == 6) );
-    HDassert( entry_ptr->size < H5C2_MAX_ENTRY_SIZE );
+    HDassert( entry_ptr->size < H5C_MAX_ENTRY_SIZE );
 #ifndef NDEBUG
-    entry_ptr->magic                = H5C2__H5C2_CACHE_ENTRY_T_MAGIC;
+    entry_ptr->magic                = H5C__H5C_CACHE_ENTRY_T_MAGIC;
 #endif /* NDEBUG */
-    entry_ptr->cache_ptr            = f->shared->cache2;
+    entry_ptr->cache_ptr            = f->shared->cache;
     entry_ptr->addr                 = addr;
     entry_ptr->size                 = len;
     entry_ptr->image_ptr            = image_ptr;
@@ -9029,7 +9029,7 @@ H5C2_load_entry(H5F_t *              f,
     entry_ptr->trans_next           = NULL;
     entry_ptr->trans_prev           = NULL;
 
-    H5C2__RESET_CACHE_ENTRY_STATS(entry_ptr);
+    H5C__RESET_CACHE_ENTRY_STATS(entry_ptr);
 
     ret_value = thing;
 
@@ -9037,12 +9037,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_load_entry() */
+} /* H5C_load_entry() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2_make_space_in_cache
+ * Function:    H5C_make_space_in_cache
  *
  * Purpose:     Attempt to evict cache entries until the index_size
  *		is at least needed_space below max_cache_size.
@@ -9110,30 +9110,30 @@ done:
  */
 
 static herr_t
-H5C2_make_space_in_cache(H5F_t * f,
+H5C_make_space_in_cache(H5F_t * f,
                         hid_t	 dxpl_id,
-                        H5C2_t * cache_ptr,
+                        H5C_t * cache_ptr,
 		        size_t	 space_needed,
                         hbool_t	 write_permitted)
 {
     herr_t		result;
     int32_t		entries_examined = 0;
     int32_t		initial_list_len;
-#if H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
+#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
     size_t		empty_space;
-#endif /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
     hbool_t			prev_is_dirty = FALSE;
     hbool_t             	entry_is_epoch_maker = FALSE;
-    H5C2_cache_entry_t *	entry_ptr;
-    H5C2_cache_entry_t *	prev_ptr;
-    H5C2_cache_entry_t *	next_ptr;
+    H5C_cache_entry_t *	entry_ptr;
+    H5C_cache_entry_t *	prev_ptr;
+    H5C_cache_entry_t *	next_ptr;
     herr_t		ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2_make_space_in_cache)
+    FUNC_ENTER_NOAPI_NOINIT(H5C_make_space_in_cache)
 
     HDassert( f );
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     if ( write_permitted ) {
 
@@ -9162,28 +9162,28 @@ H5C2_make_space_in_cache(H5F_t * f,
 		prev_is_dirty = prev_ptr->is_dirty;
 	    }
 
-            if ( (entry_ptr->type)->id != H5C2__EPOCH_MARKER_TYPE ) {
+            if ( (entry_ptr->type)->id != H5C__EPOCH_MARKER_TYPE ) {
 
                 entry_is_epoch_maker = FALSE;
 
                 if ( entry_ptr->is_dirty ) {
 
-                    result = H5C2_flush_single_entry(f,
+                    result = H5C_flush_single_entry(f,
                                                      dxpl_id,
                                                      cache_ptr,
                                                      entry_ptr->type,
                                                      entry_ptr->addr,
-                                                     H5C2__NO_FLAGS_SET,
+                                                     H5C__NO_FLAGS_SET,
                                                      FALSE);
                 } else {
 
                     result =
-		        H5C2_flush_single_entry(f,
+		        H5C_flush_single_entry(f,
                                                 dxpl_id,
                                                 cache_ptr,
                                                 entry_ptr->type,
                                                 entry_ptr->addr,
-                                                H5C2__FLUSH_INVALIDATE_FLAG,
+                                                H5C__FLUSH_INVALIDATE_FLAG,
                                                 TRUE);
                 }
             } else {
@@ -9203,7 +9203,7 @@ H5C2_make_space_in_cache(H5F_t * f,
 
 	    if ( prev_ptr != NULL ) {
 #ifndef NDEBUG
-		if ( prev_ptr->magic != H5C2__H5C2_CACHE_ENTRY_T_MAGIC ) {
+		if ( prev_ptr->magic != H5C__H5C_CACHE_ENTRY_T_MAGIC ) {
 
 		    /* something horrible has happened to *prev_ptr --
 		     * scream and die.
@@ -9249,7 +9249,7 @@ H5C2_make_space_in_cache(H5F_t * f,
 
         }
 
-#if H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
+#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
 
 	entries_examined = 0;
         initial_list_len = cache_ptr->dLRU_list_len;
@@ -9285,12 +9285,12 @@ H5C2_make_space_in_cache(H5F_t * f,
 		HDassert( prev_ptr->is_dirty );
 	    }
 
-            result = H5C2_flush_single_entry(f,
+            result = H5C_flush_single_entry(f,
                                              dxpl_id,
                                              cache_ptr,
                                              entry_ptr->type,
                                              entry_ptr->addr,
-                                             H5C2__NO_FLAGS_SET,
+                                             H5C__NO_FLAGS_SET,
                                              FALSE);
 
             if ( result < 0 ) {
@@ -9301,7 +9301,7 @@ H5C2_make_space_in_cache(H5F_t * f,
 
 	    if ( prev_ptr != NULL ) {
 #ifndef NDEBUG
-		if (prev_ptr->magic != H5C2__H5C2_CACHE_ENTRY_T_MAGIC) {
+		if (prev_ptr->magic != H5C__H5C_CACHE_ENTRY_T_MAGIC) {
 
 		    /* something horrible has happened to *prev_ptr --
 		     * scream and die.
@@ -9361,11 +9361,11 @@ H5C2_make_space_in_cache(H5F_t * f,
 	    entries_examined++;
         }
 
-#endif /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
     } else {
 
-        HDassert( H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS );
+        HDassert( H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS );
 
         initial_list_len = cache_ptr->cLRU_list_len;
         entry_ptr = cache_ptr->cLRU_tail_ptr;
@@ -9387,12 +9387,12 @@ H5C2_make_space_in_cache(H5F_t * f,
 
             prev_ptr = entry_ptr->aux_prev;
 
-            result = H5C2_flush_single_entry(f,
+            result = H5C_flush_single_entry(f,
                                              dxpl_id,
                                              cache_ptr,
                                              entry_ptr->type,
                                              entry_ptr->addr,
-                                             H5C2__FLUSH_INVALIDATE_FLAG,
+                                             H5C__FLUSH_INVALIDATE_FLAG,
                                              TRUE);
 
             if ( result < 0 ) {
@@ -9416,12 +9416,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_make_space_in_cache() */
+} /* H5C_make_space_in_cache() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2_validate_lru_list
+ * Function:    H5C_validate_lru_list
  *
  * Purpose:     Debugging function that scans the LRU list for errors.
  *
@@ -9438,20 +9438,20 @@ done:
  *-------------------------------------------------------------------------
  */
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
+#if H5C_DO_EXTREME_SANITY_CHECKS
 
 static herr_t
-H5C2_validate_lru_list(H5C2_t * cache_ptr)
+H5C_validate_lru_list(H5C_t * cache_ptr)
 {
     herr_t		ret_value = SUCCEED;      /* Return value */
     int32_t             len = 0;
     size_t              size = 0;
-    H5C2_cache_entry_t *	entry_ptr = NULL;
+    H5C_cache_entry_t *	entry_ptr = NULL;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2_validate_lru_list)
+    FUNC_ENTER_NOAPI_NOINIT(H5C_validate_lru_list)
 
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     if ( ( ( cache_ptr->LRU_head_ptr == NULL )
            ||
@@ -9535,17 +9535,17 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_validate_lru_list() */
+} /* H5C_validate_lru_list() */
 
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2_verify_not_in_index
+ * Function:    H5C_verify_not_in_index
  *
  * Purpose:     Debugging function that scans the hash table to verify
- *		that the specified instance of H5C2_cache_entry_t is not
+ *		that the specified instance of H5C_cache_entry_t is not
  *		present.
  *
  *		If an error is detected, the function generates a
@@ -9561,24 +9561,24 @@ done:
  *-------------------------------------------------------------------------
  */
 
-#if H5C2_DO_EXTREME_SANITY_CHECKS
+#if H5C_DO_EXTREME_SANITY_CHECKS
 
 static herr_t
-H5C2_verify_not_in_index(H5C2_t * cache_ptr,
-                        H5C2_cache_entry_t * entry_ptr)
+H5C_verify_not_in_index(H5C_t * cache_ptr,
+                        H5C_cache_entry_t * entry_ptr)
 {
     herr_t		ret_value = SUCCEED;      /* Return value */
     int32_t             i;
     int32_t             depth;
-    H5C2_cache_entry_t *	scan_ptr = NULL;
+    H5C_cache_entry_t *	scan_ptr = NULL;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2_verify_not_in_index)
+    FUNC_ENTER_NOAPI_NOINIT(H5C_verify_not_in_index)
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( entry_ptr != NULL );
 
-    for ( i = 0; i < H5C2__HASH_TABLE_LEN; i++ )
+    for ( i = 0; i < H5C__HASH_TABLE_LEN; i++ )
     {
         depth = 0;
         scan_ptr = cache_ptr->index[i];
@@ -9604,6 +9604,6 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_verify_not_in_index() */
+} /* H5C_verify_not_in_index() */
 
-#endif /* H5C2_DO_EXTREME_SANITY_CHECKS */
+#endif /* H5C_DO_EXTREME_SANITY_CHECKS */
diff --git a/src/H5C2journal.c b/src/H5Cjournal.c
index a550cbd..028f485 100644
--- a/src/H5C2journal.c
+++ b/src/H5Cjournal.c
@@ -15,7 +15,7 @@
 
 /*-------------------------------------------------------------------------
  *
- * Created:     H5C2journal.c
+ * Created:     H5Cjournal.c
  *              Dec 6 2007
  *              John Mainzer
  *
@@ -37,14 +37,14 @@
  */
 
 #define H5F_PACKAGE             /* suppress error about including H5Fpkg  */
-#define H5C2_PACKAGE            /* suppress error about including H5C2pkg */
+#define H5C_PACKAGE             /* suppress error about including H5Cpkg */
 
 #include "H5private.h"          /* Generic Functions                    */
+#include "H5Cpkg.h"             /* Cache                                */
 #include "H5Eprivate.h"         /* Error handling                       */
-#include "H5MMprivate.h"        /* Memory management                    */
-#include "H5MFprivate.h"        /* File memory management               */
 #include "H5Fpkg.h"		/* File access                          */
-#include "H5C2pkg.h"            /* Cache                                */
+#include "H5MFprivate.h"        /* File memory management               */
+#include "H5MMprivate.h"        /* Memory management                    */
 #include "H5Pprivate.h"		/* Property lists			*/
 
 /**************************************************************************/
@@ -53,165 +53,165 @@
 
 /* In the test code, it is sometimes useful to skip the check for journaling
  * in progress on open.  The check_for_journaling global is used to support
- * this.  Note that we can't tuck this variable into H5C2_t, as the test
+ * this.  Note that we can't tuck this variable into H5C_t, as the test
  * takes place before H5Fopen() returns.
  */
 
-hbool_t H5C2__check_for_journaling = TRUE;
+hbool_t H5C__check_for_journaling = TRUE;
 
 /**************************************************************************/
 /******************************* local macros *****************************/
 /**************************************************************************/
-#define H5C2__TRANS_NUM_SIZE 8
-#define H5C2__CHECKSUM_SIZE  4
+#define H5C__TRANS_NUM_SIZE 8
+#define H5C__CHECKSUM_SIZE  4
 
 /**************************************************************************/
 /***************************** local prototypes ***************************/
 /**************************************************************************/
 
-static herr_t H5C2_call_mdjsc_callbacks(H5C2_t * cache_ptr,
+static herr_t H5C_call_mdjsc_callbacks(H5C_t * cache_ptr,
                                         hid_t dxpl_id,
-                                        H5C2_mdj_config_t * config_ptr);
+                                        H5C_mdj_config_t * config_ptr);
 
-static herr_t H5C2_get_journaling_in_progress(const H5F_t * f,
-					      H5C2_t * cache_ptr);
+static herr_t H5C_get_journaling_in_progress(const H5F_t * f,
+					      H5C_t * cache_ptr);
 
-static herr_t H5C2_grow_mdjsc_callback_table(H5C2_t * cache_ptr);
+static herr_t H5C_grow_mdjsc_callback_table(H5C_t * cache_ptr);
 
-static herr_t H5C2_jb_aio__await_buffer_write_completion(
-						H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_aio__await_buffer_write_completion(
+						H5C_jbrb_t * struct_ptr,
                                                int buf_num);
 
-static herr_t H5C2_jb_aio__await_async_fsync_completion(
-						H5C2_jbrb_t * struct_ptr);
+static herr_t H5C_jb_aio__await_async_fsync_completion(
+						H5C_jbrb_t * struct_ptr);
 
-static herr_t H5C2_jb_aio__flush(H5C2_jbrb_t * struct_ptr);
+static herr_t H5C_jb_aio__flush(H5C_jbrb_t * struct_ptr);
 
-static herr_t H5C2_jb_aio__get_last_transaction_on_disk(
-					H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_aio__get_last_transaction_on_disk(
+					H5C_jbrb_t * struct_ptr,
                                         uint64_t * trans_num_ptr);
 
-static herr_t H5C2_jb_aio__make_space_in_ring_buffer(H5C2_jbrb_t * struct_ptr);
+static herr_t H5C_jb_aio__make_space_in_ring_buffer(H5C_jbrb_t * struct_ptr);
 
-static herr_t H5C2_jb_aio__note_completed_async_buffer_writes(
-						H5C2_jbrb_t * struct_ptr);
+static herr_t H5C_jb_aio__note_completed_async_buffer_writes(
+						H5C_jbrb_t * struct_ptr);
 
-static herr_t H5C2_jb_aio__note_completed_async_fsyncs(
-						H5C2_jbrb_t * struct_ptr);
+static herr_t H5C_jb_aio__note_completed_async_fsyncs(
+						H5C_jbrb_t * struct_ptr);
 
-static herr_t H5C2_jb_aio__prep_next_buf_for_use(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_aio__prep_next_buf_for_use(H5C_jbrb_t * struct_ptr,
                                             uint64_t last_trans_in_ring_buffer);
 
-static herr_t H5C2_jb_aio__queue_async_fsync(H5C2_jbrb_t * struct_ptr);
+static herr_t H5C_jb_aio__queue_async_fsync(H5C_jbrb_t * struct_ptr);
 
-static herr_t H5C2_jb_aio__queue_buffer_write(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_aio__queue_buffer_write(H5C_jbrb_t * struct_ptr,
                                               int buf_num,
                                               hbool_t partial_write_ok);
 
-static herr_t H5C2_jb_aio__sync_file(H5C2_jbrb_t * struct_ptr);
+static herr_t H5C_jb_aio__sync_file(H5C_jbrb_t * struct_ptr);
 
-static herr_t H5C2_jb_aio__sync_q__append(H5C2_jbrb_t * struct_ptr,
-                               struct H5C2_jbrb_sync_q_entry_t * entry_ptr);
+static herr_t H5C_jb_aio__sync_q__append(H5C_jbrb_t * struct_ptr,
+                               struct H5C_jbrb_sync_q_entry_t * entry_ptr);
 
-static herr_t H5C2_jb_aio__sync_q__discard_head(H5C2_jbrb_t * struct_ptr);
+static herr_t H5C_jb_aio__sync_q__discard_head(H5C_jbrb_t * struct_ptr);
 
-static herr_t H5C2_jb_aio__test_buffer_write_complete(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_aio__test_buffer_write_complete(H5C_jbrb_t * struct_ptr,
                                                       int buf_num,
                                                       hbool_t *complete_ptr);
 
-static herr_t H5C2_jb_aio__test_next_async_fsync_complete(
-						H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_aio__test_next_async_fsync_complete(
+						H5C_jbrb_t * struct_ptr,
                                                 hbool_t *sync_complete_ptr);
 
-herr_t H5C2_jb_aio__write_to_buffer(H5C2_jbrb_t * struct_ptr,	
+herr_t H5C_jb_aio__write_to_buffer(H5C_jbrb_t * struct_ptr,	
                                     size_t size,			
                                     const char * data,
                                     hbool_t is_end_trans,
                                     uint64_t trans_num);
 
-static herr_t H5C2_jb_bjf__comment(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_bjf__comment(H5C_jbrb_t * struct_ptr,
                                    const char * comment_ptr);
 
-static herr_t H5C2_jb_bjf__end_transaction(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_bjf__end_transaction(H5C_jbrb_t * struct_ptr,
                                            uint64_t trans_num);
 
-static herr_t H5C2_jb_bjf__eoa(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_bjf__eoa(H5C_jbrb_t * struct_ptr,
                                haddr_t eoa);
 
-static herr_t H5C2_jb_bjf__journal_entry(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_bjf__journal_entry(H5C_jbrb_t * struct_ptr,
                                          uint64_t trans_num,
                                          haddr_t base_addr,
                                          size_t length,
                                          const uint8_t * body);
 
-static herr_t H5C2_jb_bjf__start_transaction(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_bjf__start_transaction(H5C_jbrb_t * struct_ptr,
                                              uint64_t trans_num);
 
-static herr_t H5C2_jb_bjf__write_buffer(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_bjf__write_buffer(H5C_jbrb_t * struct_ptr,
                                         size_t buf_size,
                                         const char * buf_ptr,
                                         hbool_t is_end_trans,
                                         uint64_t trans_num);
 
-static herr_t H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_bjf__write_chksum(H5C_jbrb_t * struct_ptr,
                                         hbool_t is_end_trans,
                                         uint64_t trans_num);
 
-static herr_t H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_bjf__write_length(H5C_jbrb_t * struct_ptr,
                                         size_t length,
                                         hbool_t is_end_trans, 
                                         uint64_t trans_num);
 
-static herr_t H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_bjf__write_offset(H5C_jbrb_t * struct_ptr,
                                         haddr_t offset,
                                         hbool_t is_end_trans,
                                         uint64_t trans_num);
 
-static herr_t H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_bjf__write_sig_and_ver(H5C_jbrb_t * struct_ptr,
                                              const char * sig_ptr,
                                              const uint8_t version,
                                              hbool_t keep_chksum,
                                              hbool_t is_end_trans,
                                              uint64_t trans_num);
 
-static herr_t H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_bjf__write_trans_num(H5C_jbrb_t * struct_ptr,
                                            hbool_t is_end_trans,
                                            uint64_t trans_num);
 
-static herr_t H5C2_jb_hrjf__comment(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_hrjf__comment(H5C_jbrb_t * struct_ptr,
  		                    const char * comment_ptr);
 
-static herr_t H5C2_jb_hrjf__end_transaction(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_hrjf__end_transaction(H5C_jbrb_t * struct_ptr,
                                             uint64_t trans_num);
 
-static herr_t H5C2_jb_hrjf__eoa(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_hrjf__eoa(H5C_jbrb_t * struct_ptr,
                                 haddr_t eoa);
 
-static herr_t H5C2_jb_hrjf__journal_entry(H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_hrjf__journal_entry(H5C_jbrb_t * struct_ptr,
                                           uint64_t trans_num,
                                           haddr_t base_addr,
                                           size_t length,
                                           const uint8_t * body);
 
-static herr_t H5C2_jb_sio__flush(H5C2_jbrb_t * struct_ptr);
+static herr_t H5C_jb_sio__flush(H5C_jbrb_t * struct_ptr);
 
-static herr_t H5C2_jb_sio__flush_full_buffers(H5C2_jbrb_t * struct_ptr);
+static herr_t H5C_jb_sio__flush_full_buffers(H5C_jbrb_t * struct_ptr);
 
-static herr_t H5C2_jb_sio__get_last_transaction_on_disk(
-					H5C2_jbrb_t * struct_ptr,
+static herr_t H5C_jb_sio__get_last_transaction_on_disk(
+					H5C_jbrb_t * struct_ptr,
 				        uint64_t * trans_num_ptr);
 
-static herr_t H5C2_jb_sio__write_to_buffer(H5C2_jbrb_t * struct_ptr,	
+static herr_t H5C_jb_sio__write_to_buffer(H5C_jbrb_t * struct_ptr,	
                                            size_t size,			
                                            const char * data,
                                            hbool_t is_end_trans,
                                            uint64_t trans_num);
 
-herr_t H5C2_jb_stats__dump(H5C2_jbrb_t * struct_ptr);
+herr_t H5C_jb_stats__dump(H5C_jbrb_t * struct_ptr);
 
-herr_t H5C2_jb_stats__reset(H5C2_jbrb_t * struct_ptr);
+herr_t H5C_jb_stats__reset(H5C_jbrb_t * struct_ptr);
 
-static herr_t H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr);
+static herr_t H5C_shrink_mdjsc_callback_table(H5C_t * cache_ptr);
 
 
 
@@ -220,7 +220,7 @@ static herr_t H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr);
 /**************************************************************************/
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_begin_journaling
+ * Function:    H5C_begin_journaling
  *
  * Purpose:     Setup the metadata cache to begin journaling.
  *
@@ -231,7 +231,7 @@ static herr_t H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr);
  *              March 26, 2008
  *
  * Changes:	JRM -- 8/14/08
- *              Reworked the function to use the H5C2_mdj_config_t
+ *              Reworked the function to use the H5C_mdj_config_t
  *              structure.
  *
  *		JRM -- 8/18/08
@@ -251,17 +251,17 @@ static herr_t H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr);
  */
 
 herr_t
-H5C2_begin_journaling(H5F_t * f,
+H5C_begin_journaling(H5F_t * f,
 		      hid_t dxpl_id,
-		      H5C2_t * cache_ptr,
-		      H5C2_mdj_config_t * config_ptr)
+		      H5C_t * cache_ptr,
+		      H5C_mdj_config_t * config_ptr)
 {
     herr_t result;
     herr_t ret_value = SUCCEED;      /* Return value */
     int32_t journal_magic;
-    H5C2_mdj_config_t config;
+    H5C_mdj_config_t config;
 
-    FUNC_ENTER_NOAPI(H5C2_begin_journaling, FAIL)
+    FUNC_ENTER_NOAPI(H5C_begin_journaling, FAIL)
 
     HDassert( f != NULL );
     HDassert( f->name != NULL );
@@ -269,7 +269,7 @@ H5C2_begin_journaling(H5F_t * f,
     HDassert( f->shared->sizeof_addr > 0 );
     HDassert( f->shared->sizeof_size > 0 );
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->mdj_enabled == FALSE );
     HDassert( cache_ptr->trans_in_progress == FALSE );
     HDassert( cache_ptr->trans_num == 0 );
@@ -293,17 +293,17 @@ H5C2_begin_journaling(H5F_t * f,
                     "metadata journaling already enabled on entry.")
     }
 
-    result = H5C2_flush_cache(f, dxpl_id, H5C2__NO_FLAGS_SET);
+    result = H5C_flush_cache(f, dxpl_id, H5C__NO_FLAGS_SET);
 
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_flush_cache() failed.") 
+                    "H5C_flush_cache() failed.") 
     }
 
     journal_magic = (int32_t)HDrand();
 
-    result = H5C2_jb__init(&(cache_ptr->mdj_jbrb),
+    result = H5C_jb__init(&(cache_ptr->mdj_jbrb),
                            journal_magic,
 		           f->name,
 			   config_ptr->journal_file_path,
@@ -317,46 +317,46 @@ H5C2_begin_journaling(H5F_t * f,
     if ( result != SUCCEED ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__init() failed.")
+                    "H5C_jb__init() failed.")
     }
 
     /* Note that this call flushes the HDF5 file in passing */
-    result = H5C2_mark_journaling_in_progress(f, dxpl_id, journal_magic,
+    result = H5C_mark_journaling_in_progress(f, dxpl_id, journal_magic,
 		                              config_ptr->journal_file_path);
 
     if ( result != SUCCEED ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_mark_journaling_in_progress() failed.")
+                    "H5C_mark_journaling_in_progress() failed.")
     }
 
     cache_ptr->mdj_enabled = TRUE;
 
-    result = H5C2_get_journal_config(cache_ptr, &config);
+    result = H5C_get_journal_config(cache_ptr, &config);
 
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_get_journal_config() failed.")
+                    "H5C_get_journal_config() failed.")
     }
 
-    result = H5C2_call_mdjsc_callbacks(cache_ptr, dxpl_id, &config);
+    result = H5C_call_mdjsc_callbacks(cache_ptr, dxpl_id, &config);
 
     if ( result < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_call_mdjsc_callbacks() failed.")
+                    "H5C_call_mdjsc_callbacks() failed.")
     }
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_begin_journaling() */
+} /* H5C_begin_journaling() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_begin_transaction
+ * Function:    H5C_begin_transaction
  *
  * Purpose:     Handle book keeping for the beginning of a transaction, and
  *              return the transaction ID assigned to the transaction in 
@@ -372,23 +372,23 @@ done:
  */
 
 herr_t
-H5C2_begin_transaction(H5C2_t * cache_ptr,
+H5C_begin_transaction(H5C_t * cache_ptr,
                        uint64_t * trans_num_ptr,
                        const char * api_call_name)
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_begin_transaction, FAIL)
+    FUNC_ENTER_NOAPI(H5C_begin_transaction, FAIL)
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->tl_len == 0 );
     HDassert( cache_ptr->tl_size == 0 );
     HDassert( cache_ptr->tl_head_ptr == NULL );
     HDassert( cache_ptr->tl_tail_ptr == NULL );
     HDassert( trans_num_ptr != NULL );
     HDassert( api_call_name != NULL );
-    HDassert( HDstrlen(api_call_name) <= H5C2__MAX_API_NAME_LEN );
+    HDassert( HDstrlen(api_call_name) <= H5C__MAX_API_NAME_LEN );
 
     if ( cache_ptr->mdj_enabled ) {
 
@@ -399,7 +399,7 @@ H5C2_begin_transaction(H5C2_t * cache_ptr,
         }
 
 	HDstrncpy(cache_ptr->trans_api_name, api_call_name,
-                  (size_t)H5C2__MAX_API_NAME_LEN);
+                  (size_t)H5C__MAX_API_NAME_LEN);
 
         (cache_ptr->trans_num)++;
 
@@ -412,11 +412,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_begin_transaction() */
+} /* H5C_begin_transaction() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_end_journaling
+ * Function:    H5C_end_journaling
  *
  * Purpose:     Shutdown metadata journaling.
  *
@@ -446,19 +446,19 @@ done:
  */
 
 herr_t
-H5C2_end_journaling(H5F_t * f,
+H5C_end_journaling(H5F_t * f,
                     hid_t dxpl_id,
-		    H5C2_t * cache_ptr)
+		    H5C_t * cache_ptr)
 {
     herr_t result;
     herr_t ret_value = SUCCEED;      /* Return value */
-    H5C2_mdj_config_t config;
+    H5C_mdj_config_t config;
 
-    FUNC_ENTER_NOAPI(H5C2_end_journaling, FAIL)
+    FUNC_ENTER_NOAPI(H5C_end_journaling, FAIL)
 
     HDassert( f != NULL );
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     if ( cache_ptr->mdj_enabled ) {
 
@@ -469,12 +469,12 @@ H5C2_end_journaling(H5F_t * f,
         HDassert( cache_ptr->tl_head_ptr == NULL );
         HDassert( cache_ptr->tl_tail_ptr == NULL );
 
-        result = H5C2_flush_cache(f, dxpl_id, H5C2__NO_FLAGS_SET);
+        result = H5C_flush_cache(f, dxpl_id, H5C__NO_FLAGS_SET);
 
         if ( result < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                             "H5C2_flush_cache() failed.") 
+                             "H5C_flush_cache() failed.") 
 	}
 
 	HDassert( cache_ptr->mdj_enabled );
@@ -490,36 +490,36 @@ H5C2_end_journaling(H5F_t * f,
          * extension.  In passing, also discard the cache's copies of the 
          * metadata journaling magic, and the journal file name.
          */
-        result = H5C2_unmark_journaling_in_progress(f, dxpl_id, cache_ptr);
+        result = H5C_unmark_journaling_in_progress(f, dxpl_id, cache_ptr);
 
         if ( result < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_unmark_journaling_in_progress() failed.")
+                        "H5C_unmark_journaling_in_progress() failed.")
         }
 
-        result = H5C2_jb__takedown(&(cache_ptr->mdj_jbrb));
+        result = H5C_jb__takedown(&(cache_ptr->mdj_jbrb));
 
         if ( result < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb__takedown() failed.")
+                        "H5C_jb__takedown() failed.")
         }
 
-        result = H5C2_get_journal_config(cache_ptr, &config);
+        result = H5C_get_journal_config(cache_ptr, &config);
 
         if ( result < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_get_journal_config() failed.")
+                        "H5C_get_journal_config() failed.")
         }
 
-        result = H5C2_call_mdjsc_callbacks(cache_ptr, dxpl_id, &config);
+        result = H5C_call_mdjsc_callbacks(cache_ptr, dxpl_id, &config);
 
         if ( result < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_call_mdjsc_callbacks() failed.")
+                        "H5C_call_mdjsc_callbacks() failed.")
         }
     }
 
@@ -527,12 +527,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_end_journaling() */
+} /* H5C_end_journaling() */
 
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_end_transaction
+ * Function:    H5C_end_transaction
  *
  * Purpose:     Handle book keeping for the end of a transaction.
  *
@@ -546,9 +546,9 @@ done:
  */
 
 herr_t
-H5C2_end_transaction(H5F_t * f,
+H5C_end_transaction(H5F_t * f,
 		     hid_t dxpl_id,
-                     H5C2_t * cache_ptr,
+                     H5C_t * cache_ptr,
                      uint64_t trans_num,
                      const char * api_call_name)
 {
@@ -556,12 +556,12 @@ H5C2_end_transaction(H5F_t * f,
     herr_t result;
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_end_transaction, FAIL)
+    FUNC_ENTER_NOAPI(H5C_end_transaction, FAIL)
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( api_call_name != NULL );
-    HDassert( HDstrlen(api_call_name) <= H5C2__MAX_API_NAME_LEN );
+    HDassert( HDstrlen(api_call_name) <= H5C__MAX_API_NAME_LEN );
     HDassert( ( ! ( cache_ptr->mdj_enabled ) ) ||
               ( HDstrcmp(api_call_name, cache_ptr->trans_api_name) == 0 ) );
 
@@ -583,12 +583,12 @@ H5C2_end_transaction(H5F_t * f,
          */
         if ( cache_ptr->tl_len > 0 ) {
 
-            result = H5C2_journal_transaction(f, dxpl_id, cache_ptr);
+            result = H5C_journal_transaction(f, dxpl_id, cache_ptr);
 
             if ( result != SUCCEED ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                            "H5C2_journal_transaction() failed.")
+                            "H5C_journal_transaction() failed.")
             }
         }
 
@@ -599,24 +599,24 @@ H5C2_end_transaction(H5F_t * f,
          * in progress list.
          */
 
-        result = H5C2_jb__get_last_transaction_on_disk(&(cache_ptr->mdj_jbrb),
+        result = H5C_jb__get_last_transaction_on_disk(&(cache_ptr->mdj_jbrb),
                                                        &new_last_trans_on_disk);
 
         if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb__get_last_transaction_on_disk() failed.")
+                        "H5C_jb__get_last_transaction_on_disk() failed.")
         }
 
         if ( cache_ptr->last_trans_on_disk < new_last_trans_on_disk ) {
 
-            result = H5C2_update_for_new_last_trans_on_disk(cache_ptr,
+            result = H5C_update_for_new_last_trans_on_disk(cache_ptr,
 		                                        new_last_trans_on_disk);
 
 	    if ( result != SUCCEED ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                            "H5C2_update_for_new_last_trans_on_disk() failed.")
+                            "H5C_update_for_new_last_trans_on_disk() failed.")
             }
         }
     }
@@ -625,14 +625,14 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_end_transaction() */
+} /* H5C_end_transaction() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_get_journal_config
+ * Function:    H5C_get_journal_config
  *
  * Purpose:     Return the current metadata journaling status in an
- *              instance of H5C2_mdj_config_t.
+ *              instance of H5C_mdj_config_t.
  *
  *              If journaling is enabled, config_ptr->enable_journaling 
  *              is set to TRUE, and the remaining fields in *config_ptr
@@ -651,21 +651,21 @@ done:
  * Changes:
  *
  *              JRM -- 8/14/08
- *              Reworked function to use H5C2_mdj_config_t.
+ *              Reworked function to use H5C_mdj_config_t.
  *
  *-------------------------------------------------------------------------
  */
 
 herr_t
-H5C2_get_journal_config(H5C2_t * cache_ptr,
-		        H5C2_mdj_config_t * config_ptr)
+H5C_get_journal_config(H5C_t * cache_ptr,
+		        H5C_mdj_config_t * config_ptr)
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_get_journal_config, FAIL)
+    FUNC_ENTER_NOAPI(H5C_get_journal_config, FAIL)
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
 
     if ( config_ptr == NULL ) {
 
@@ -679,9 +679,9 @@ H5C2_get_journal_config(H5C2_t * cache_ptr,
 
 	HDstrncpy(&(config_ptr->journal_file_path[0]), 
 		  cache_ptr->jnl_file_name,
-		  H5C2__MAX_JOURNAL_FILE_NAME_LEN);
+		  H5C__MAX_JOURNAL_FILE_NAME_LEN);
 
-	config_ptr->journal_file_path[H5C2__MAX_JOURNAL_FILE_NAME_LEN] = '\0';
+	config_ptr->journal_file_path[H5C__MAX_JOURNAL_FILE_NAME_LEN] = '\0';
 
 	config_ptr->jbrb_buf_size = (cache_ptr->mdj_jbrb).buf_size;
 
@@ -700,11 +700,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_get_journal_config() */
+} /* H5C_get_journal_config() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_journal_post_flush()
+ * Function:    H5C_journal_post_flush()
  *
  * Purpose:     Handle any journaling activities that are necessary
  * 		after we flush the metadata cache.
@@ -735,19 +735,19 @@ done:
  */
 
 herr_t
-H5C2_journal_post_flush(H5F_t * f,
+H5C_journal_post_flush(H5F_t * f,
                         hid_t dxpl_id,
-                        H5C2_t * cache_ptr,
+                        H5C_t * cache_ptr,
 		        hbool_t cache_is_clean)
 {
     herr_t result;
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_journal_post_flush, FAIL)
+    FUNC_ENTER_NOAPI(H5C_journal_post_flush, FAIL)
 
     HDassert( f != NULL );
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->mdj_enabled );
 
     if ( cache_ptr->trans_in_progress ) {
@@ -782,12 +782,12 @@ H5C2_journal_post_flush(H5F_t * f,
 		        "low level flush failed")
 	}
 
-        result = H5C2_jb__trunc(&(cache_ptr->mdj_jbrb));
+        result = H5C_jb__trunc(&(cache_ptr->mdj_jbrb));
 
         if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb__trunc() failed.")
+                        "H5C_jb__trunc() failed.")
         }
         
 	cache_ptr->trans_num = (uint64_t)0;
@@ -798,11 +798,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_journal_post_flush() */
+} /* H5C_journal_post_flush() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_journal_pre_flush()
+ * Function:    H5C_journal_pre_flush()
  *
  * Purpose:     Handle any journaling activities that are necessary
  * 		before we flush the metadata cache.
@@ -833,16 +833,16 @@ done:
  */
 
 herr_t
-H5C2_journal_pre_flush(H5C2_t * cache_ptr)
+H5C_journal_pre_flush(H5C_t * cache_ptr)
 {
     herr_t result;
     uint64_t new_last_trans_on_disk;
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_journal_pre_flush, FAIL)
+    FUNC_ENTER_NOAPI(H5C_journal_pre_flush, FAIL)
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->mdj_enabled );
 
     if ( cache_ptr->trans_in_progress ) {
@@ -851,31 +851,31 @@ H5C2_journal_pre_flush(H5C2_t * cache_ptr)
                     "Transaction in progress during flush?!?!?.")
     }
 
-    result = H5C2_jb__flush(&(cache_ptr->mdj_jbrb));
+    result = H5C_jb__flush(&(cache_ptr->mdj_jbrb));
 
     if ( result != SUCCEED ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__flush() failed.")
+                    "H5C_jb__flush() failed.")
     }
 
-    result = H5C2_jb__get_last_transaction_on_disk(&(cache_ptr->mdj_jbrb),
+    result = H5C_jb__get_last_transaction_on_disk(&(cache_ptr->mdj_jbrb),
 		                                   &new_last_trans_on_disk);
     if ( result != SUCCEED ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__get_last_transaction_on_disk() failed.")
+                    "H5C_jb__get_last_transaction_on_disk() failed.")
     }
 
     if ( cache_ptr->last_trans_on_disk < new_last_trans_on_disk ) {
 
-        result = H5C2_update_for_new_last_trans_on_disk(cache_ptr,
+        result = H5C_update_for_new_last_trans_on_disk(cache_ptr,
 		                                        new_last_trans_on_disk);
 
 	if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_update_for_new_last_trans_on_disk() failed.")
+                        "H5C_update_for_new_last_trans_on_disk() failed.")
         }
     }    
 
@@ -889,11 +889,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_journal_pre_flush() */
+} /* H5C_journal_pre_flush() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_journal_transaction()
+ * Function:    H5C_journal_transaction()
  *
  * Purpose:     Generate journal messages for the current transaction.
  * 		In passing, remove all entries from the transaction list.
@@ -908,15 +908,15 @@ done:
  */
 
 herr_t
-H5C2_journal_transaction(H5F_t * f,
+H5C_journal_transaction(H5F_t * f,
 		         hid_t dxpl_id,
-		         H5C2_t * cache_ptr)
+		         H5C_t * cache_ptr)
 
 {
-    char buf[H5C2__MAX_API_NAME_LEN + 128];
+    char buf[H5C__MAX_API_NAME_LEN + 128];
     hbool_t resized;
     hbool_t renamed;
-    H5C2_cache_entry_t * entry_ptr = NULL;
+    H5C_cache_entry_t * entry_ptr = NULL;
     unsigned serialize_flags = 0;
     haddr_t new_addr;
     size_t new_len;
@@ -925,32 +925,32 @@ H5C2_journal_transaction(H5F_t * f,
     herr_t result;    
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_journal_transaction, FAIL)
+    FUNC_ENTER_NOAPI(H5C_journal_transaction, FAIL)
     
     HDassert( f != NULL );
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->trans_in_progress );
     HDassert( cache_ptr->tl_len > 0 );
 
-    HDsnprintf(buf, H5C2__MAX_API_NAME_LEN + 128, "Begin transaction on %s.",
+    HDsnprintf(buf, H5C__MAX_API_NAME_LEN + 128, "Begin transaction on %s.",
                cache_ptr->trans_api_name);
 
-    result = H5C2_jb__comment(&(cache_ptr->mdj_jbrb), buf);
+    result = H5C_jb__comment(&(cache_ptr->mdj_jbrb), buf);
 
     if ( result != SUCCEED ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__comment() failed.")
+                    "H5C_jb__comment() failed.")
     }
 
-    result = H5C2_jb__start_transaction(&(cache_ptr->mdj_jbrb), 
+    result = H5C_jb__start_transaction(&(cache_ptr->mdj_jbrb), 
 		                        cache_ptr->trans_num);
 
     if ( result != SUCCEED ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__start_transaction() failed.")
+                    "H5C_jb__start_transaction() failed.")
     }
 
     entry_ptr = cache_ptr->tl_tail_ptr;
@@ -1015,9 +1015,9 @@ H5C2_journal_transaction(H5F_t * f,
 	         */
 
 	        resized = 
-		    (hbool_t)((serialize_flags & H5C2__SERIALIZE_RESIZED_FLAG) != 0);
+		    (hbool_t)((serialize_flags & H5C__SERIALIZE_RESIZED_FLAG) != 0);
 	        renamed = 
-                    (hbool_t)((serialize_flags & H5C2__SERIALIZE_RENAMED_FLAG) != 0);
+                    (hbool_t)((serialize_flags & H5C__SERIALIZE_RENAMED_FLAG) != 0);
 
 	        if ( ( renamed ) && ( ! resized ) ) {
 
@@ -1031,26 +1031,26 @@ H5C2_journal_transaction(H5F_t * f,
 		     * is irrelement, as we know that the entry is in cache,
 	             * and thus no I/O will take place.
 	             */
-	            thing = H5C2_protect(f, dxpl_id,
+	            thing = H5C_protect(f, dxpl_id,
 	                                 entry_ptr->type, entry_ptr->addr,
 				         entry_ptr->size, NULL, 
-				         H5C2__NO_FLAGS_SET);
+				         H5C__NO_FLAGS_SET);
 
                     if ( thing == NULL ) {
 
                         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                                    "H5C2_protect() failed.")
+                                    "H5C_protect() failed.")
                     }
 
-                    result = H5C2_unprotect(f, dxpl_id,
+                    result = H5C_unprotect(f, dxpl_id,
                                             entry_ptr->type, entry_ptr->addr,
-                                            thing, H5C2__SIZE_CHANGED_FLAG, 
+                                            thing, H5C__SIZE_CHANGED_FLAG, 
 					    new_len);
 
                     if ( result < 0 ) {
 
                         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                                    "H5C2_unprotect() failed.")
+                                    "H5C_unprotect() failed.")
                     }
 
 		    entry_ptr->image_ptr = new_image_ptr;
@@ -1058,13 +1058,13 @@ H5C2_journal_transaction(H5F_t * f,
 
 	        if ( renamed ) {
 
-                    result = H5C2_rename_entry(cache_ptr, entry_ptr->type,
+                    result = H5C_rename_entry(cache_ptr, entry_ptr->type,
 				               entry_ptr->addr, new_addr);
 
                     if ( result < 0 ) {
 
                         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                                    "H5C2_rename_entr() failed.")
+                                    "H5C_rename_entr() failed.")
                     }
                 }
             }
@@ -1077,7 +1077,7 @@ H5C2_journal_transaction(H5F_t * f,
 	 */
 	if ( ( ! resized ) && ( ! renamed ) ) {
                 
-            result = H5C2_jb__journal_entry(&(cache_ptr->mdj_jbrb),
+            result = H5C_jb__journal_entry(&(cache_ptr->mdj_jbrb),
                                             cache_ptr->trans_num,
 					    entry_ptr->addr,
 					    entry_ptr->size,
@@ -1086,34 +1086,34 @@ H5C2_journal_transaction(H5F_t * f,
             if ( result != SUCCEED ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                            "H5C2_jb__journal_entry() failed.")
+                            "H5C_jb__journal_entry() failed.")
             }
 
-	    H5C2__TRANS_DLL_REMOVE(entry_ptr, cache_ptr->tl_head_ptr, \
+	    H5C__TRANS_DLL_REMOVE(entry_ptr, cache_ptr->tl_head_ptr, \
                                    cache_ptr->tl_tail_ptr, cache_ptr->tl_len, \
 				   cache_ptr->tl_size, FAIL);
         }
         entry_ptr = cache_ptr->tl_tail_ptr;
     }
 
-    result = H5C2_jb__end_transaction(&(cache_ptr->mdj_jbrb),
+    result = H5C_jb__end_transaction(&(cache_ptr->mdj_jbrb),
 		                      cache_ptr->trans_num);
 
     if ( result != SUCCEED ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__end_transaction() failed.")
+                    "H5C_jb__end_transaction() failed.")
     }
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_journal_transaction() */
+} /* H5C_journal_transaction() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_update_for_new_last_trans_on_disk()
+ * Function:    H5C_update_for_new_last_trans_on_disk()
  *
  * Purpose:     Update the journal write in progress list for a change in
  * 		the last transaction on disk.
@@ -1143,17 +1143,17 @@ done:
  */
 
 herr_t
-H5C2_update_for_new_last_trans_on_disk(H5C2_t * cache_ptr,
+H5C_update_for_new_last_trans_on_disk(H5C_t * cache_ptr,
 		                       uint64_t new_last_trans_on_disk)
 {
-    H5C2_cache_entry_t * entry_ptr = NULL;
-    H5C2_cache_entry_t * prev_entry_ptr = NULL;
+    H5C_cache_entry_t * entry_ptr = NULL;
+    H5C_cache_entry_t * prev_entry_ptr = NULL;
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_update_for_new_last_trans_on_disk, FAIL)
+    FUNC_ENTER_NOAPI(H5C_update_for_new_last_trans_on_disk, FAIL)
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->mdj_enabled );
     HDassert( cache_ptr->last_trans_on_disk <= new_last_trans_on_disk );
 
@@ -1173,7 +1173,7 @@ H5C2_update_for_new_last_trans_on_disk(H5C2_t * cache_ptr,
 	    if ( entry_ptr->last_trans <= cache_ptr->last_trans_on_disk ) {
 
                 entry_ptr->last_trans = 0;
-                H5C2__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE(cache_ptr, \
+                H5C__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE(cache_ptr, \
 				                           entry_ptr, \
 		                                           FAIL)
             }
@@ -1204,7 +1204,7 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_update_for_new_last_trans_on_disk() */
+} /* H5C_update_for_new_last_trans_on_disk() */
 
 
 /**************************************************************************/
@@ -1212,7 +1212,7 @@ done:
 /**************************************************************************/
 
 /*-------------------------------------------------------------------------
- * Function:	H5C2_check_for_journaling()
+ * Function:	H5C_check_for_journaling()
  *
  * Purpose:	If the superblock extension of a newly opened HDF5 file
  * 		indicates that journaling is in progress, the process
@@ -1238,9 +1238,9 @@ done:
  */
 
 herr_t
-H5C2_check_for_journaling(H5F_t * f,
+H5C_check_for_journaling(H5F_t * f,
                           hid_t dxpl_id,
-			  H5C2_t * cache_ptr,
+			  H5C_t * cache_ptr,
 		          hbool_t journal_recovered)
 {
     const char * l0 =
@@ -1254,22 +1254,22 @@ H5C2_check_for_journaling(H5F_t * f,
     herr_t result;
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_check_for_journaling, FAIL)
+    FUNC_ENTER_NOAPI(H5C_check_for_journaling, FAIL)
 
     HDassert( f );
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->jnl_magic == 0 );
     HDassert( cache_ptr->jnl_file_name_len == 0 );
 
-    if ( H5C2__check_for_journaling ) {
+    if ( H5C__check_for_journaling ) {
 
-        result = H5C2_get_journaling_in_progress(f, cache_ptr);
+        result = H5C_get_journaling_in_progress(f, cache_ptr);
 
         if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_get_journaling_in_progress() failed.")
+                        "H5C_get_journaling_in_progress() failed.")
         }
 
         if ( cache_ptr->jnl_file_name_len > 0 ) { /* journaling was in */
@@ -1282,14 +1282,14 @@ H5C2_check_for_journaling(H5F_t * f,
                  * we were.
 	         */
 
-                result = H5C2_unmark_journaling_in_progress(f, 
+                result = H5C_unmark_journaling_in_progress(f, 
                                                             dxpl_id, 
                                                             cache_ptr);
 
 	        if ( result != SUCCEED ) {
 
                     HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                                "H5C2_unmark_journaling_in_progress() failed.")
+                                "H5C_unmark_journaling_in_progress() failed.")
                 }
 	    } else {
 
@@ -1313,11 +1313,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_check_for_journaling() */
+} /* H5C_check_for_journaling() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_get_journaling_in_progress()
+ * Function:    H5C_get_journaling_in_progress()
  *
  * Purpose:     Query the HDF5 file to see if it is marked as having
  * 		journaling in progress.  Update the journaling 
@@ -1356,17 +1356,17 @@ done:
  */
 
 herr_t
-H5C2_get_journaling_in_progress(const H5F_t * f,
-				H5C2_t * cache_ptr)
+H5C_get_journaling_in_progress(const H5F_t * f,
+				H5C_t * cache_ptr)
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2_get_journaling_in_progress)
+    FUNC_ENTER_NOAPI_NOINIT(H5C_get_journaling_in_progress)
 
     HDassert( f );
     HDassert( f->shared != NULL );
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->jnl_file_name_len == 0 );
 
     if ( f->shared->mdc_jnl_enabled == TRUE ) {
@@ -1378,7 +1378,7 @@ H5C2_get_journaling_in_progress(const H5F_t * f,
         }
 
         if ( f->shared->mdc_jnl_file_name_len > 
-             H5C2__MAX_JOURNAL_FILE_NAME_LEN ) {
+             H5C__MAX_JOURNAL_FILE_NAME_LEN ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
                         "journal file name too long?!?.")
@@ -1404,11 +1404,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_get_journaling_in_progress() */
+} /* H5C_get_journaling_in_progress() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_mark_journaling_in_progress()
+ * Function:    H5C_mark_journaling_in_progress()
  *
  * Purpose:     Modify the HDF5 file to indicate that journaling is 
  * 		in progress, and flush the file to disk.  
@@ -1439,24 +1439,24 @@ done:
  */
 
 herr_t
-H5C2_mark_journaling_in_progress(H5F_t * f,
+H5C_mark_journaling_in_progress(H5F_t * f,
                                  hid_t dxpl_id,
 				 const int32_t journal_magic,
                                  const char * journal_file_name_ptr)
 {
-    H5C2_t * cache_ptr;
+    H5C_t * cache_ptr;
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_mark_journaling_in_progress, FAIL)
+    FUNC_ENTER_NOAPI(H5C_mark_journaling_in_progress, FAIL)
 
     HDassert( f != NULL );
     HDassert( f->shared != NULL );
     HDassert( ! f->shared->mdc_jnl_enabled );
 
-    cache_ptr = f->shared->cache2;
+    cache_ptr = f->shared->cache;
 
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->jnl_file_name_len == 0 );
     HDassert( journal_file_name_ptr != NULL );
 
@@ -1478,7 +1478,7 @@ H5C2_mark_journaling_in_progress(H5F_t * f,
                     "length of journal file name is zero.")
     }
 
-    if ( cache_ptr->jnl_file_name_len > H5C2__MAX_JOURNAL_FILE_NAME_LEN ) {
+    if ( cache_ptr->jnl_file_name_len > H5C__MAX_JOURNAL_FILE_NAME_LEN ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
                     "journal file name too long.")
@@ -1516,11 +1516,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_mark_journaling_in_progress() */
+} /* H5C_mark_journaling_in_progress() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_unmark_journaling_in_progress()
+ * Function:    H5C_unmark_journaling_in_progress()
  *
  * Purpose:     Modify the HDF5 file to indicate that journaling is 
  * 		not in progress, and flush the file to disk.  
@@ -1552,24 +1552,24 @@ done:
  */
 
 herr_t
-H5C2_unmark_journaling_in_progress(H5F_t * f,
+H5C_unmark_journaling_in_progress(H5F_t * f,
                                    hid_t dxpl_id,
 #ifndef NDEBUG
-				   H5C2_t * cache_ptr)
+				   H5C_t * cache_ptr)
 #else /* NDEBUG */
-				   H5C2_t UNUSED * cache_ptr)
+				   H5C_t UNUSED * cache_ptr)
 #endif /* NDEBUG */
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_unmark_journaling_in_progress, FAIL)
+    FUNC_ENTER_NOAPI(H5C_unmark_journaling_in_progress, FAIL)
 
     HDassert( f != NULL );
     HDassert( f->shared != NULL );
     HDassert( f->shared->mdc_jnl_enabled );
-    HDassert( f->shared->cache2 == cache_ptr );
+    HDassert( f->shared->cache == cache_ptr );
     HDassert( cache_ptr );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->jnl_file_name_len > 0 );
 
 
@@ -1613,7 +1613,7 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_unmark_journaling_in_progress() */
+} /* H5C_unmark_journaling_in_progress() */
 
 
 /**************************************************************************/
@@ -1621,7 +1621,7 @@ done:
 /**************************************************************************/
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_call_mdjsc_callbacks()
+ * Function:    H5C_call_mdjsc_callbacks()
  *
  * Purpose:     Call the metadata journaling status change callbacks.
  *
@@ -1635,22 +1635,22 @@ done:
  */
 
 static herr_t
-H5C2_call_mdjsc_callbacks(H5C2_t * cache_ptr, 
+H5C_call_mdjsc_callbacks(H5C_t * cache_ptr, 
 		          hid_t dxpl_id,
-		          H5C2_mdj_config_t * config_ptr)
+		          H5C_mdj_config_t * config_ptr)
 {
     herr_t ret_value = SUCCEED;      /* Return value */
     int32_t i;
     int32_t funcs_called = 0;
-    H5C2_mdj_status_change_func_t func_ptr;
+    H5C_mdj_status_change_func_t func_ptr;
     void * data_ptr;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2_call_mdjsc_callbacks)
+    FUNC_ENTER_NOAPI_NOINIT(H5C_call_mdjsc_callbacks)
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->mdjsc_cb_tbl != NULL );
-    HDassert( cache_ptr->mdjsc_cb_tbl_len >= H5C2__MIN_MDJSC_CB_TBL_LEN );
+    HDassert( cache_ptr->mdjsc_cb_tbl_len >= H5C__MIN_MDJSC_CB_TBL_LEN );
     HDassert( ( cache_ptr->mdjsc_cb_tbl_fl_head == -1 ) ||
 	      ( cache_ptr->num_mdjsc_cbs < cache_ptr->mdjsc_cb_tbl_len ) );
 
@@ -1667,7 +1667,7 @@ H5C2_call_mdjsc_callbacks(H5C2_t * cache_ptr,
 	 ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use >= 
 	   cache_ptr->mdjsc_cb_tbl_len ) 
 	 ||
-	 ( cache_ptr->mdjsc_cb_tbl_len < H5C2__MIN_MDJSC_CB_TBL_LEN ) 
+	 ( cache_ptr->mdjsc_cb_tbl_len < H5C__MIN_MDJSC_CB_TBL_LEN ) 
 	 ||
          ( ( cache_ptr->num_mdjsc_cbs == cache_ptr->mdjsc_cb_tbl_len )
 	   &&
@@ -1712,11 +1712,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_call_mdjsc_callbacks() */
+} /* H5C_call_mdjsc_callbacks() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_deregister_mdjsc_callback()
+ * Function:    H5C_deregister_mdjsc_callback()
  *
  * Purpose:     Deregister a metadata journaling status change callback,
  * 		shrinking the metadata journaling status callback table 
@@ -1732,17 +1732,17 @@ done:
  */
 
 herr_t
-H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr,
+H5C_deregister_mdjsc_callback(H5C_t * cache_ptr,
 			       int32_t idx)
 {
     herr_t ret_value = SUCCEED;      /* Return value */
     int32_t i;
     double fraction_in_use;
 
-    FUNC_ENTER_NOAPI(H5C2_deregister_mdjsc_callback, FAIL)
+    FUNC_ENTER_NOAPI(H5C_deregister_mdjsc_callback, FAIL)
 
     if ( ( cache_ptr == NULL ) ||
-         ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) {
+         ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
 		    "cache_ptr corrupt?!?");
@@ -1755,7 +1755,7 @@ H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr,
 	 ( ( cache_ptr->mdjsc_cb_tbl_fl_head < 0 ) 
 	   &&
 	   ( cache_ptr->num_mdjsc_cbs != cache_ptr->mdjsc_cb_tbl_len ) ) ||
-         ( cache_ptr->mdjsc_cb_tbl_len < H5C2__MIN_MDJSC_CB_TBL_LEN ) ||
+         ( cache_ptr->mdjsc_cb_tbl_len < H5C__MIN_MDJSC_CB_TBL_LEN ) ||
          ( cache_ptr->mdjsc_cb_tbl_fl_head >= cache_ptr->mdjsc_cb_tbl_len ) ||
 	 ( cache_ptr->num_mdjsc_cbs > cache_ptr->mdjsc_cb_tbl_len ) ||
 	 ( cache_ptr->num_mdjsc_cbs < 0 ) ||
@@ -1841,18 +1841,18 @@ H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr,
     fraction_in_use = ((double)(cache_ptr->num_mdjsc_cbs)) /
 	              ((double)(cache_ptr->mdjsc_cb_tbl_len));
 
-    if ( ( fraction_in_use < H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) &&
-         ( cache_ptr->mdjsc_cb_tbl_len > H5C2__MIN_MDJSC_CB_TBL_LEN ) &&
+    if ( ( fraction_in_use < H5C__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) &&
+         ( cache_ptr->mdjsc_cb_tbl_len > H5C__MIN_MDJSC_CB_TBL_LEN ) &&
          ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use < 
 	   (cache_ptr->mdjsc_cb_tbl_len / 2) ) ) {
         herr_t result;
 
-        result = H5C2_shrink_mdjsc_callback_table(cache_ptr);
+        result = H5C_shrink_mdjsc_callback_table(cache_ptr);
 
 	if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-			"H5C2_shrink_mdjsc_callback_table() failed.");
+			"H5C_shrink_mdjsc_callback_table() failed.");
         }
     }
 
@@ -1860,11 +1860,11 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_deregister_mdjsc_callback() */
+} /* H5C_deregister_mdjsc_callback() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_grow_mdjsc_callback_table()
+ * Function:    H5C_grow_mdjsc_callback_table()
  *
  * Purpose:     Double the size of the the metadata journaling status
  * 		change callback table.  Note that the table is assumed
@@ -1880,21 +1880,21 @@ done:
  */
 
 static herr_t
-H5C2_grow_mdjsc_callback_table(H5C2_t * cache_ptr)
+H5C_grow_mdjsc_callback_table(H5C_t * cache_ptr)
 {
     herr_t ret_value = SUCCEED;      /* Return value */
     int32_t i;
     int32_t old_mdjsc_cb_tbl_len;
     int64_t new_mdjsc_cb_tbl_len;
-    H5C2_mdjsc_record_t * old_mdjsc_cb_tbl = NULL;
-    H5C2_mdjsc_record_t * new_mdjsc_cb_tbl = NULL;
+    H5C_mdjsc_record_t * old_mdjsc_cb_tbl = NULL;
+    H5C_mdjsc_record_t * new_mdjsc_cb_tbl = NULL;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2_grow_mdjsc_callback_table)
+    FUNC_ENTER_NOAPI_NOINIT(H5C_grow_mdjsc_callback_table)
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->mdjsc_cb_tbl != NULL );
-    HDassert( cache_ptr->mdjsc_cb_tbl_len >= H5C2__MIN_MDJSC_CB_TBL_LEN );
+    HDassert( cache_ptr->mdjsc_cb_tbl_len >= H5C__MIN_MDJSC_CB_TBL_LEN );
     HDassert( cache_ptr->mdjsc_cb_tbl_fl_head == -1 );
     HDassert( cache_ptr->num_mdjsc_cbs == cache_ptr->mdjsc_cb_tbl_len );
 
@@ -1911,8 +1911,8 @@ H5C2_grow_mdjsc_callback_table(H5C2_t * cache_ptr)
     old_mdjsc_cb_tbl_len = cache_ptr->mdjsc_cb_tbl_len;
 
     new_mdjsc_cb_tbl_len = 2 * old_mdjsc_cb_tbl_len;
-    new_mdjsc_cb_tbl = (H5C2_mdjsc_record_t *)
-	H5MM_malloc((size_t)new_mdjsc_cb_tbl_len * sizeof(H5C2_mdjsc_record_t));
+    new_mdjsc_cb_tbl = (H5C_mdjsc_record_t *)
+	H5MM_malloc((size_t)new_mdjsc_cb_tbl_len * sizeof(H5C_mdjsc_record_t));
     if ( new_mdjsc_cb_tbl == NULL ) {
 
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
@@ -1936,7 +1936,7 @@ H5C2_grow_mdjsc_callback_table(H5C2_t * cache_ptr)
     cache_ptr->mdjsc_cb_tbl_len = new_mdjsc_cb_tbl_len;
     cache_ptr->mdjsc_cb_tbl_fl_head = old_mdjsc_cb_tbl_len;
 
-    old_mdjsc_cb_tbl = (H5C2_mdjsc_record_t *)H5MM_xfree(old_mdjsc_cb_tbl);
+    old_mdjsc_cb_tbl = (H5C_mdjsc_record_t *)H5MM_xfree(old_mdjsc_cb_tbl);
 
     if ( old_mdjsc_cb_tbl != NULL ) {
 
@@ -1948,12 +1948,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_grow_mdjsc_callback_table() */
+} /* H5C_grow_mdjsc_callback_table() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2_register_mdjsc_callback()
+ * Function:    H5C_register_mdjsc_callback()
  *
  * Purpose:     Register a metadata journaling status change callback,
  * 		growing the metadata journaling status callback table 
@@ -1969,8 +1969,8 @@ done:
  */
 
 herr_t
-H5C2_register_mdjsc_callback(H5C2_t * cache_ptr,
-		             H5C2_mdj_status_change_func_t fcn_ptr,
+H5C_register_mdjsc_callback(H5C_t * cache_ptr,
+		             H5C_mdj_status_change_func_t fcn_ptr,
 			     void * data_ptr,
 			     int32_t * idx_ptr)
 {
@@ -1978,10 +1978,10 @@ H5C2_register_mdjsc_callback(H5C2_t * cache_ptr,
     herr_t ret_value = SUCCEED;      /* Return value */
     int32_t i;
 
-    FUNC_ENTER_NOAPI(H5C2_register_mdjsc_callback, FAIL)
+    FUNC_ENTER_NOAPI(H5C_register_mdjsc_callback, FAIL)
 
     if ( ( cache_ptr == NULL ) ||
-         ( cache_ptr->magic != H5C2__H5C2_T_MAGIC ) ) {
+         ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "bad cache_ptr on entry");
     }
@@ -1992,7 +1992,7 @@ H5C2_register_mdjsc_callback(H5C2_t * cache_ptr,
 		    "cache_ptr->mdjsc_cb_tbl == NULL")
     }
 
-    if ( cache_ptr->mdjsc_cb_tbl_len < H5C2__MIN_MDJSC_CB_TBL_LEN ) {
+    if ( cache_ptr->mdjsc_cb_tbl_len < H5C__MIN_MDJSC_CB_TBL_LEN ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
 		    "cache_ptr->mdjsc_cb_tbl_len too small")
@@ -2017,12 +2017,12 @@ H5C2_register_mdjsc_callback(H5C2_t * cache_ptr,
 
     if ( cache_ptr->mdjsc_cb_tbl_len <= cache_ptr->num_mdjsc_cbs ) {
 
-        result = H5C2_grow_mdjsc_callback_table(cache_ptr);
+        result = H5C_grow_mdjsc_callback_table(cache_ptr);
 
 	if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-			"H5C2_grow_mdjsc_callback_table() failed.");
+			"H5C_grow_mdjsc_callback_table() failed.");
         }
     }
 
@@ -2071,20 +2071,20 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_register_mdjsc_callback() */
+} /* H5C_register_mdjsc_callback() */
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5C2_shrink_mdjsc_callback_table()
+ * Function:    H5C_shrink_mdjsc_callback_table()
  *
  * Purpose:     Half the size of the the metadata journaling status
  * 		change callback table.  Note that the table is assumed
  * 		to be:
  *
- * 		1) Not more than H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO * 100
+ * 		1) Not more than H5C__MDJSC_CB_TBL_MIN_ACTIVE_RATIO * 100
  *                 percent full.
  *
- *              2) Of size H5C2__MIN_MDJSC_CB_TBL_LEN * 2 ** n, where
+ *              2) Of size H5C__MIN_MDJSC_CB_TBL_LEN * 2 ** n, where
  *                 n is a positive integer.
  *
  *              3) Contain no entries at index greater than or equal to
@@ -2100,7 +2100,7 @@ done:
  */
 
 static herr_t
-H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr)
+H5C_shrink_mdjsc_callback_table(H5C_t * cache_ptr)
 {
     herr_t ret_value = SUCCEED;      /* Return value */
     int32_t i;
@@ -2109,15 +2109,15 @@ H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr)
     int32_t new_fl_head = -1;
     int32_t last_free_entry = -1;
     double fraction_in_use;
-    H5C2_mdjsc_record_t * old_mdjsc_cb_tbl = NULL;
-    H5C2_mdjsc_record_t * new_mdjsc_cb_tbl = NULL;
+    H5C_mdjsc_record_t * old_mdjsc_cb_tbl = NULL;
+    H5C_mdjsc_record_t * new_mdjsc_cb_tbl = NULL;
 
-    FUNC_ENTER_NOAPI_NOINIT(H5C2_shrink_mdjsc_callback_table)
+    FUNC_ENTER_NOAPI_NOINIT(H5C_shrink_mdjsc_callback_table)
 
     HDassert( cache_ptr != NULL );
-    HDassert( cache_ptr->magic == H5C2__H5C2_T_MAGIC );
+    HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
     HDassert( cache_ptr->mdjsc_cb_tbl != NULL );
-    HDassert( cache_ptr->mdjsc_cb_tbl_len > H5C2__MIN_MDJSC_CB_TBL_LEN );
+    HDassert( cache_ptr->mdjsc_cb_tbl_len > H5C__MIN_MDJSC_CB_TBL_LEN );
     HDassert( cache_ptr->mdjsc_cb_tbl_fl_head >= 0);
     HDassert( cache_ptr->num_mdjsc_cbs < cache_ptr->mdjsc_cb_tbl_len / 2 );
 
@@ -2125,11 +2125,11 @@ H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr)
 	              ((double)(cache_ptr->mdjsc_cb_tbl_len));
 
     if ( ( cache_ptr->num_mdjsc_cbs >= cache_ptr->mdjsc_cb_tbl_len ) ||
-	 ( (cache_ptr->mdjsc_cb_tbl_len / 2) < H5C2__MIN_MDJSC_CB_TBL_LEN ) ||
+	 ( (cache_ptr->mdjsc_cb_tbl_len / 2) < H5C__MIN_MDJSC_CB_TBL_LEN ) ||
 	 ( cache_ptr->mdjsc_cb_tbl_fl_head == -1 ) ||
 	 ( cache_ptr->mdjsc_cb_tbl_max_idx_in_use >= 
 	   cache_ptr->mdjsc_cb_tbl_len / 2 ) ||
-	 ( fraction_in_use >= H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) ) {
+	 ( fraction_in_use >= H5C__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
 	            "unexpected mdjsc_cb_tbl status.");
@@ -2140,25 +2140,25 @@ H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr)
 
     new_mdjsc_cb_tbl_len = old_mdjsc_cb_tbl_len / 2;
 
-    while ( ( (new_mdjsc_cb_tbl_len / 2) >= H5C2__MIN_MDJSC_CB_TBL_LEN ) &&
+    while ( ( (new_mdjsc_cb_tbl_len / 2) >= H5C__MIN_MDJSC_CB_TBL_LEN ) &&
 	    ( (((double)(cache_ptr->num_mdjsc_cbs)) / 
 	       ((double)new_mdjsc_cb_tbl_len)) <= 
-	      H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) &&
+	      H5C__MDJSC_CB_TBL_MIN_ACTIVE_RATIO ) &&
 	    ( (new_mdjsc_cb_tbl_len / 2) > 
 	      cache_ptr->mdjsc_cb_tbl_max_idx_in_use ) )
     {
 	new_mdjsc_cb_tbl_len /= 2;
     }
 
-    if ( ( new_mdjsc_cb_tbl_len < H5C2__MIN_MDJSC_CB_TBL_LEN ) ||
+    if ( ( new_mdjsc_cb_tbl_len < H5C__MIN_MDJSC_CB_TBL_LEN ) ||
          ( new_mdjsc_cb_tbl_len < cache_ptr->mdjsc_cb_tbl_max_idx_in_use ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
 	            "error in computation of new_mdjsc_cb_tbl_len?!?!");
     }
 
-    new_mdjsc_cb_tbl = (H5C2_mdjsc_record_t *)
-	H5MM_malloc((size_t)new_mdjsc_cb_tbl_len * sizeof(H5C2_mdjsc_record_t));
+    new_mdjsc_cb_tbl = (H5C_mdjsc_record_t *)
+	H5MM_malloc((size_t)new_mdjsc_cb_tbl_len * sizeof(H5C_mdjsc_record_t));
     if ( new_mdjsc_cb_tbl == NULL ) {
 
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, \
@@ -2202,7 +2202,7 @@ H5C2_shrink_mdjsc_callback_table(H5C2_t * cache_ptr)
     cache_ptr->mdjsc_cb_tbl_fl_head = new_fl_head;
     cache_ptr->mdjsc_cb_tbl_len = new_mdjsc_cb_tbl_len;
 
-    old_mdjsc_cb_tbl = ( H5C2_mdjsc_record_t *)H5MM_xfree(old_mdjsc_cb_tbl);
+    old_mdjsc_cb_tbl = ( H5C_mdjsc_record_t *)H5MM_xfree(old_mdjsc_cb_tbl);
 
     if ( old_mdjsc_cb_tbl != NULL ) {
 
@@ -2214,7 +2214,7 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_shrink_mdjsc_callback_table() */
+} /* H5C_shrink_mdjsc_callback_table() */
 
 
 /**************************************************************************/
@@ -2232,78 +2232,78 @@ done:
     /* remove print statements from these macros. -- JRM */
 #endif /* JRM */
 
-#define H5C2_JB_BJF__WRITE_BUFFER(struct_ptr,                             \
+#define H5C_JB_BJF__WRITE_BUFFER(struct_ptr,                             \
                                   buf_size,                               \
                                   buf_ptr,                                \
                                   is_end_trans,                           \
                                   trans_num,                              \
                                   fail_return)				  \
-if ( H5C2_jb_bjf__write_buffer((struct_ptr), (buf_size), (buf_ptr),       \
+if ( H5C_jb_bjf__write_buffer((struct_ptr), (buf_size), (buf_ptr),       \
                               (is_end_trans), (trans_num)) != SUCCEED ) { \
     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, (fail_return),                 \
-                "H5C2_jb_bjf__write_buffer() failed.");                   \
+                "H5C_jb_bjf__write_buffer() failed.");                   \
 }
 
-#define H5C2_jb_BJF__WRITE_CHKSUM(struct_ptr,                             \
+#define H5C_jb_BJF__WRITE_CHKSUM(struct_ptr,                             \
                                   is_end_trans,                           \
                                   trans_num,                              \
                                   fail_return)                            \
-if ( H5C2_jb_bjf__write_chksum((struct_ptr), (is_end_trans), (trans_num)) \
+if ( H5C_jb_bjf__write_chksum((struct_ptr), (is_end_trans), (trans_num)) \
      != SUCCEED ) {                                                       \
     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, (fail_return),                 \
-                "H5C2_jb_bjf__write_chksum() failed.");                   \
+                "H5C_jb_bjf__write_chksum() failed.");                   \
 }
 
-#define H5C2_JB_BJF__WRITE_LENGTH(struct_ptr,                             \
+#define H5C_JB_BJF__WRITE_LENGTH(struct_ptr,                             \
                                   length,                                 \
                                   is_end_trans,                           \
                                   trans_num,                              \
                                   fail_return)                            \
-if ( H5C2_jb_bjf__write_length((struct_ptr), (length), (is_end_trans),    \
+if ( H5C_jb_bjf__write_length((struct_ptr), (length), (is_end_trans),    \
                                (trans_num)) != SUCCEED ) {                \
     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, (fail_return),                 \
-                "H5C2_jb_bjf__write_length() failed.");                   \
+                "H5C_jb_bjf__write_length() failed.");                   \
 }
 
-#define H5C2_JB_BJF__WRITE_OFFSET(struct_ptr,                             \
+#define H5C_JB_BJF__WRITE_OFFSET(struct_ptr,                             \
                                   offset,                                 \
                                   is_end_trans,                           \
                                   trans_num,                              \
                                   fail_return)                            \
-if ( H5C2_jb_bjf__write_offset((struct_ptr), (offset), (is_end_trans),    \
+if ( H5C_jb_bjf__write_offset((struct_ptr), (offset), (is_end_trans),    \
                                (trans_num)) != SUCCEED ) {                \
-    HDfprintf(stdout, "%s: H5C2_jb_bjf__write_offset() failed.\n", FUNC); \
+    HDfprintf(stdout, "%s: H5C_jb_bjf__write_offset() failed.\n", FUNC); \
     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, (fail_return),                 \
-                "H5C2_jb_bjf__write_offset() failed.");                   \
+                "H5C_jb_bjf__write_offset() failed.");                   \
 }
 
-#define H5C2_JB_BJF__WRITE_SIG_AND_VER(struct_ptr,                        \
+#define H5C_JB_BJF__WRITE_SIG_AND_VER(struct_ptr,                        \
                                        sig_ptr,                           \
                                        version,                           \
                                        keep_chksum,                       \
                                        is_end_trans,                      \
                                        trans_num,                         \
                                        fail_return)                       \
-if(H5C2_jb_bjf__write_sig_and_ver((struct_ptr), (sig_ptr), (version),     \
+if(H5C_jb_bjf__write_sig_and_ver((struct_ptr), (sig_ptr), (version),     \
         (keep_chksum), (is_end_trans), (trans_num)) < 0) {                \
-    HDfprintf(stdout, "%s: H5C2_jb_bjf__write_sig_and_ver() failed.\n", FUNC); \
-    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, (fail_return), "H5C2_jb_bjf__write_sig_and_ver() failed.") \
+    HDfprintf(stdout, "%s: H5C_jb_bjf__write_sig_and_ver() failed.\n", FUNC); \
+    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, (fail_return), "H5C_jb_bjf__write_sig_and_ver() failed.") \
 }
 
-#define H5C2_JB_BJF__WRITE_TRANS_NUM(struct_ptr,                          \
+#define H5C_JB_BJF__WRITE_TRANS_NUM(struct_ptr,                          \
                                      is_end_trans,                        \
                                      trans_num,                           \
                                      fail_return)                         \
-if ( H5C2_jb_bjf__write_trans_num((struct_ptr), (is_end_trans),           \
+if ( H5C_jb_bjf__write_trans_num((struct_ptr), (is_end_trans),           \
                                   (trans_num)) != SUCCEED ) {             \
     HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, (fail_return),                 \
-                "H5C2_jb_bjf__write_trans_num() failed.");                \
+                "H5C_jb_bjf__write_trans_num() failed.");                \
 }
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__await_buffer_write_completion()
+ * Function:		H5C_jb_aio__await_buffer_write_completion()
  *
  * Programmer:		John Mainzer
  *
@@ -2324,7 +2324,7 @@ if ( H5C2_jb_bjf__write_trans_num((struct_ptr), (is_end_trans),           \
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_aio__await_buffer_write_completion(H5C2_jbrb_t * struct_ptr,
+H5C_jb_aio__await_buffer_write_completion(H5C_jbrb_t * struct_ptr,
 				           int buf_num)
 {
     int result;
@@ -2332,10 +2332,10 @@ H5C2_jb_aio__await_buffer_write_completion(H5C2_jbrb_t * struct_ptr,
     struct aiocb * aiocb_ptr = NULL;
     const struct aiocb * aiocb_list[1] = { NULL };
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__await_buffer_write_completion, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__await_buffer_write_completion, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->use_aio );
     HDassert( struct_ptr->aio_ctl_blks != NULL );
     HDassert( buf_num >= 0 );
@@ -2387,7 +2387,7 @@ H5C2_jb_aio__await_buffer_write_completion(H5C2_jbrb_t * struct_ptr,
     /* TODO: Verify the number of bytes written? */
 #endif /* JRM */
 
-    H5C2__JBRB__UPDATE_STATS_FOR_BUF_WRITE_COMPLETE(struct_ptr, TRUE)
+    H5C__JBRB__UPDATE_STATS_FOR_BUF_WRITE_COMPLETE(struct_ptr, TRUE)
 
     /* mark the aio control block to indicate no write in progress */
     aiocb_ptr->aio_fildes = -1;
@@ -2396,12 +2396,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__await_buffer_write_completion() */
+} /* H5C_jb_aio__await_buffer_write_completion() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__await_async_fsync_completion()
+ * Function:		H5C_jb_aio__await_async_fsync_completion()
  *
  * Programmer:		John Mainzer
  *
@@ -2412,7 +2412,7 @@ done:
  *			Then await completion of the asynchronous fsync 
  *			at the head of the sync queue, update struct_ptr->
  *			last_trans_on_disk, remove and discard the instance
- *			of H5C2_jbrb_sync_q_entry_t at the head of the sync
+ *			of H5C_jbrb_sync_q_entry_t at the head of the sync
  *			queue, and return.
  *
  *							JRM -- 2/10/10
@@ -2422,21 +2422,21 @@ done:
  *
  ******************************************************************************/
 
-#define H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG 0
+#define H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG 0
 
 #if 1
 static herr_t 
-H5C2_jb_aio__await_async_fsync_completion(H5C2_jbrb_t * struct_ptr)
+H5C_jb_aio__await_async_fsync_completion(H5C_jbrb_t * struct_ptr)
 {
     int result;
     herr_t ret_value = SUCCEED;
-    struct H5C2_jbrb_sync_q_entry_t * head_ptr = NULL;
+    struct H5C_jbrb_sync_q_entry_t * head_ptr = NULL;
     struct aiocb * aiocb_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__await_async_fsync_completion, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__await_async_fsync_completion, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->use_aio );
     HDassert( struct_ptr->use_aio_fsync );
     HDassert( struct_ptr->aio_sync_q_len > 0 );
@@ -2444,15 +2444,15 @@ H5C2_jb_aio__await_async_fsync_completion(H5C2_jbrb_t * struct_ptr)
     head_ptr = struct_ptr->aio_sync_q_head;
 
     HDassert( head_ptr != NULL );
-    HDassert( head_ptr->magic == H5C2__H5C2_JBRB_SYNC_Q_T_MAGIC );
+    HDassert( head_ptr->magic == H5C__H5C_JBRB_SYNC_Q_T_MAGIC );
 
     aiocb_ptr = &(head_ptr->ctl_blk);
 
     if ( aiocb_ptr->aio_fildes != struct_ptr->journal_file_fd ) {
 
-#if H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
+#if H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
         HDfprintf(stdout, "%s: bad fd in ctl blk?!?\n", FUNC);
-#endif /* H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
+#endif /* H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                     "bad fd in ctl blk?!?")
@@ -2468,17 +2468,17 @@ H5C2_jb_aio__await_async_fsync_completion(H5C2_jbrb_t * struct_ptr)
 
         if ( ( result != 0 ) && ( result != EINPROGRESS ) ) {
 
-#if H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
+#if H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
             HDfprintf(stdout, "%s: call to aio_error() reports error.\n", FUNC);
             HDfprintf(stdout, "%s: errno = %d (%s).\n", FUNC, errno, 
                       strerror(errno));
-#endif /* H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
+#endif /* H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
 
             HGOTO_ERROR(H5E_IO, H5E_SYNCFAIL, FAIL, \
                         "aio_error() reports error.")
         }
 
-	H5C2__JBRB__UPDATE_STATS_FOR_AIO_ERROR_CALL_AWAITING_SYNC(struct_ptr)
+	H5C__JBRB__UPDATE_STATS_FOR_AIO_ERROR_CALL_AWAITING_SYNC(struct_ptr)
 
     } while ( result != 0 );
 
@@ -2487,11 +2487,11 @@ H5C2_jb_aio__await_async_fsync_completion(H5C2_jbrb_t * struct_ptr)
 
     if ( result == -1 ) {
 
-#if H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
+#if H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
         HDfprintf(stdout, 
                "%s: aio_return() reports something other than success.\n",
                FUNC);
-#endif /* H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
+#endif /* H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
 
         HGOTO_ERROR(H5E_IO, H5E_SYNCFAIL, FAIL, \
 		    "aio_return() reports something other than success.")
@@ -2505,47 +2505,47 @@ H5C2_jb_aio__await_async_fsync_completion(H5C2_jbrb_t * struct_ptr)
     HDassert( struct_ptr->last_trans_on_disk <= head_ptr->last_trans_in_sync );
     HDassert( head_ptr->last_trans_in_sync <= struct_ptr->last_trans_written );
 
-#if H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
+#if H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
     HDfprintf(stdout, "%s: changing last trans on disk from %lld to %lld.\n",
               FUNC, struct_ptr->last_trans_on_disk, 
               head_ptr->last_trans_in_sync);
-#endif /* H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
+#endif /* H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
 
-    H5C2__JBRB__UPDATE_STATS_FOR_ASYNC_SYNC_COMPLETED(struct_ptr, TRUE)
+    H5C__JBRB__UPDATE_STATS_FOR_ASYNC_SYNC_COMPLETED(struct_ptr, TRUE)
 
     struct_ptr->last_trans_on_disk = head_ptr->last_trans_in_sync;
     aiocb_ptr->aio_fildes = -1;
 
-    if ( H5C2_jb_aio__sync_q__discard_head(struct_ptr) != SUCCEED ) {
+    if ( H5C_jb_aio__sync_q__discard_head(struct_ptr) != SUCCEED ) {
 
-#if H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
+#if H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
         HDfprintf(stdout, 
-                 "%s: H5C2_jb_aio__sync_q__discard_head() failed.\n", FUNC);
-#endif /* H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
+                 "%s: H5C_jb_aio__sync_q__discard_head() failed.\n", FUNC);
+#endif /* H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_jb_aio__sync_q__discard_head() failed.")
+                    "H5C_jb_aio__sync_q__discard_head() failed.")
     }
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__await_async_fsync_completion() */
+} /* H5C_jb_aio__await_async_fsync_completion() */
 #else 
 static herr_t 
-H5C2_jb_aio__await_async_fsync_completion(H5C2_jbrb_t * struct_ptr)
+H5C_jb_aio__await_async_fsync_completion(H5C_jbrb_t * struct_ptr)
 {
     int result;
     herr_t ret_value = SUCCEED;
-    struct H5C2_jbrb_sync_q_entry_t * head_ptr = NULL;
+    struct H5C_jbrb_sync_q_entry_t * head_ptr = NULL;
     struct aiocb * aiocb_ptr = NULL;
     const struct aiocb * aiocb_list[1] = { NULL };
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__await_async_fsync_completion, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__await_async_fsync_completion, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->use_aio );
     HDassert( struct_ptr->use_aio_fsync );
     HDassert( struct_ptr->aio_sync_q_len > 0 );
@@ -2553,15 +2553,15 @@ H5C2_jb_aio__await_async_fsync_completion(H5C2_jbrb_t * struct_ptr)
     head_ptr = struct_ptr->aio_sync_q_head;
 
     HDassert( head_ptr != NULL );
-    HDassert( head_ptr->magic == H5C2__H5C2_JBRB_SYNC_Q_T_MAGIC );
+    HDassert( head_ptr->magic == H5C__H5C_JBRB_SYNC_Q_T_MAGIC );
 
     aiocb_ptr = &(head_ptr->ctl_blk);
 
     if ( aiocb_ptr->aio_fildes != struct_ptr->journal_file_fd ) {
 
-#if H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
+#if H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
         HDfprintf(stdout, "%s: bad fd in ctl blk?!?\n", FUNC);
-#endif /* H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
+#endif /* H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                     "bad fd in ctl blk?!?")
@@ -2573,11 +2573,11 @@ H5C2_jb_aio__await_async_fsync_completion(H5C2_jbrb_t * struct_ptr)
 
     if ( result != 0 ) {
 
-#if H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
+#if H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
         HDfprintf(stdout, "%s: call to aio_suspend() failed.\n", FUNC);
         HDfprintf(stdout, "%s: errno = %d (%s).\n", FUNC, errno, 
                   strerror(errno));
-#endif /* H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
+#endif /* H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
 
         HGOTO_ERROR(H5E_IO, H5E_SYNCFAIL, FAIL, \
 		    "call to aio_suspend() failed.")
@@ -2588,11 +2588,11 @@ H5C2_jb_aio__await_async_fsync_completion(H5C2_jbrb_t * struct_ptr)
 
     if ( result != 0 ) {
 
-#if H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
+#if H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
         HDfprintf(stdout, 
                "%s: aio_error() reports error after aio_suspend() returns.\n",
                FUNC);
-#endif /* H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
+#endif /* H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
 
         HGOTO_ERROR(H5E_IO, H5E_SYNCFAIL, FAIL, \
                     "aio_error() reports error after aio_suspend() returns")
@@ -2602,11 +2602,11 @@ H5C2_jb_aio__await_async_fsync_completion(H5C2_jbrb_t * struct_ptr)
     result = aio_return(aiocb_ptr);
     if ( result == -1 ) {
 
-#if H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
+#if H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
         HDfprintf(stdout, 
                "%s: aio_return() reports something other than success.\n",
                FUNC);
-#endif /* H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
+#endif /* H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
 
         HGOTO_ERROR(H5E_IO, H5E_SYNCFAIL, FAIL, \
 		    "aio_return() reports something other than success.")
@@ -2620,37 +2620,37 @@ H5C2_jb_aio__await_async_fsync_completion(H5C2_jbrb_t * struct_ptr)
     HDassert( struct_ptr->last_trans_on_disk <= head_ptr->last_trans_in_sync );
     HDassert( head_ptr->last_trans_in_sync <= struct_ptr->last_trans_written );
 
-#if H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
+#if H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
     HDfprintf(stdout, "%s: changing last trans on disk from %lld to %lld.\n",
               FUNC, struct_ptr->last_trans_on_disk, 
               head_ptr->last_trans_in_sync);
-#endif /* H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
+#endif /* H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
 
     struct_ptr->last_trans_on_disk = head_ptr->last_trans_in_sync;
     aiocb_ptr->aio_fildes = -1;
 
-    if ( H5C2_jb_aio__sync_q__discard_head(struct_ptr) != SUCCEED ) {
+    if ( H5C_jb_aio__sync_q__discard_head(struct_ptr) != SUCCEED ) {
 
-#if H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
+#if H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG
         HDfprintf(stdout, 
-                 "%s: H5C2_jb_aio__sync_q__discard_head() failed.\n", FUNC);
-#endif /* H5C2_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
+                 "%s: H5C_jb_aio__sync_q__discard_head() failed.\n", FUNC);
+#endif /* H5C_JB_AIO__AWAIT_ASYNC_FSYNC_COMPLETION__DEBUG */
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_jb_aio__sync_q__discard_head() failed.")
+                    "H5C_jb_aio__sync_q__discard_head() failed.")
     }
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__await_async_fsync_completion() */
+} /* H5C_jb_aio__await_async_fsync_completion() */
 #endif
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__await_completion_of_all_async_fsyncs
+ * Function:		H5C_jb_aio__await_completion_of_all_async_fsyncs
  *
  * Programmer:		John Mainzer
  *			2/10/10
@@ -2668,40 +2668,40 @@ done:
  *
  ******************************************************************************/
 
-#define H5C2_JB_AIO__AWAIT_COMPLETION_OF_ALL_ASYNC_FSYNCS__DEBUG 0
+#define H5C_JB_AIO__AWAIT_COMPLETION_OF_ALL_ASYNC_FSYNCS__DEBUG 0
 
 herr_t 
-H5C2_jb_aio__await_completion_of_all_async_fsyncs(H5C2_jbrb_t * struct_ptr)
+H5C_jb_aio__await_completion_of_all_async_fsyncs(H5C_jbrb_t * struct_ptr)
 {
     herr_t result;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__await_completion_of_all_async_fsyncs, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__await_completion_of_all_async_fsyncs, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->use_aio );
     HDassert( struct_ptr->use_aio_fsync );
 
-#if H5C2_JB_AIO__AWAIT_COMPLETION_OF_ALL_ASYNC_FSYNCS__DEBUG 
+#if H5C_JB_AIO__AWAIT_COMPLETION_OF_ALL_ASYNC_FSYNCS__DEBUG 
     HDfprintf(stdout, "%s: entering -- aio_sync_q_len = %d.\n",
               FUNC, (int)(struct_ptr->aio_sync_q_len));
-#endif /* H5C2_JB_AIO__AWAIT_COMPLETION_OF_ALL_ASYNC_FSYNCS__DEBUG */
+#endif /* H5C_JB_AIO__AWAIT_COMPLETION_OF_ALL_ASYNC_FSYNCS__DEBUG */
 
     while ( struct_ptr->aio_sync_q_len > 0 ) {
 
-        result = H5C2_jb_aio__await_async_fsync_completion(struct_ptr);
+        result = H5C_jb_aio__await_async_fsync_completion(struct_ptr);
 
         if ( result != SUCCEED ) {
 
-#if H5C2_JB_AIO__AWAIT_COMPLETION_OF_ALL_ASYNC_FSYNCS__DEBUG 
+#if H5C_JB_AIO__AWAIT_COMPLETION_OF_ALL_ASYNC_FSYNCS__DEBUG 
             HDfprintf(stdout, 
-                      "H5C2_jb_aio__await_async_fsync_completion() failed.\n",
+                      "H5C_jb_aio__await_async_fsync_completion() failed.\n",
                       FUNC);
-#endif /* H5C2_JB_AIO__AWAIT_COMPLETION_OF_ALL_ASYNC_FSYNCS__DEBUG */
+#endif /* H5C_JB_AIO__AWAIT_COMPLETION_OF_ALL_ASYNC_FSYNCS__DEBUG */
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C2_jb_aio__await_async_fsync_completion() failed.")
+                        "H5C_jb_aio__await_async_fsync_completion() failed.")
         }
     } /* while */
 
@@ -2711,12 +2711,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__await_completion_of_all_async_fsyncs() */
+} /* H5C_jb_aio__await_completion_of_all_async_fsyncs() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__await_completion_of_all_pending_writes
+ * Function:		H5C_jb_aio__await_completion_of_all_pending_writes
  *
  * Programmer:		John Mainzer
  *			1/12/10
@@ -2736,20 +2736,20 @@ done:
  *
  ******************************************************************************/
 
-#define H5C2_JB_AIO__AWAIT_COMPLETION_OF_ALL_PENDING_WRITES__DEBUG 0
+#define H5C_JB_AIO__AWAIT_COMPLETION_OF_ALL_PENDING_WRITES__DEBUG 0
 
 herr_t 
-H5C2_jb_aio__await_completion_of_all_pending_writes(H5C2_jbrb_t * struct_ptr)
+H5C_jb_aio__await_completion_of_all_pending_writes(H5C_jbrb_t * struct_ptr)
 {
     hbool_t done = FALSE;
     int result;
     herr_t ret_value = SUCCEED;
     struct aiocb * aiocb_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__await_completion_of_all_pending_writes, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__await_completion_of_all_pending_writes, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->use_aio );
 
     if ( struct_ptr->bufs_in_use <= 0 ) {
@@ -2763,13 +2763,13 @@ H5C2_jb_aio__await_completion_of_all_pending_writes(H5C2_jbrb_t * struct_ptr)
 
         if ( aiocb_ptr->aio_fildes != -1 ) {
 
-	    result = H5C2_jb_aio__await_buffer_write_completion(struct_ptr,
+	    result = H5C_jb_aio__await_buffer_write_completion(struct_ptr,
 				                              struct_ptr->get);
 
             if ( result != SUCCEED ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-			"H5C2_jb_aio__await_buffer_write_completion() failed.");
+			"H5C_jb_aio__await_buffer_write_completion() failed.");
             }
 
             /* Update the last transaction written, and then set the 
@@ -2784,12 +2784,12 @@ H5C2_jb_aio__await_completion_of_all_pending_writes(H5C2_jbrb_t * struct_ptr)
 
             (*struct_ptr->trans_tracking)[struct_ptr->get] = 0;
 
-#if H5C2_JB_AIO__AWAIT_COMPLETION_OF_ALL_PENDING_WRITES__DEBUG
+#if H5C_JB_AIO__AWAIT_COMPLETION_OF_ALL_PENDING_WRITES__DEBUG
             HDfprintf(stdout, 
                       "%s: last_trans_written = %lld, get/put = %d/%d\n", 
                       FUNC, (long long)(struct_ptr->last_trans_written),
                       struct_ptr->get, struct_ptr->put);
-#endif /* H5C2_JB_AIO__AWAIT_COMPLETION_OF_ALL_PENDING_WRITES__DEBUG */
+#endif /* H5C_JB_AIO__AWAIT_COMPLETION_OF_ALL_PENDING_WRITES__DEBUG */
 
             /* decrement writes in progress */
             struct_ptr->writes_in_progress--;
@@ -2836,13 +2836,13 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__await_completion_of_all_pending_writes() */
+} /* H5C_jb_aio__await_completion_of_all_pending_writes() */
 
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__flush
+ * Function:		H5C_jb_aio__flush
  *
  * Programmer:		John Mainzer
  *			1/11/10
@@ -2864,21 +2864,21 @@ done:
  *
  ******************************************************************************/
 
-#define H5C2_JB_AIO__FLUSH__DEBUG 0
+#define H5C_JB_AIO__FLUSH__DEBUG 0
 
 static herr_t 
-H5C2_jb_aio__flush(H5C2_jbrb_t * struct_ptr)
+H5C_jb_aio__flush(H5C_jbrb_t * struct_ptr)
 {
     hbool_t cur_buf_was_dirty = FALSE;
     herr_t result;
     herr_t ret_value = SUCCEED;
     uint64_t last_trans_in_ring_buffer;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__flush, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__flush, FAIL)
 
     /* Check Arguments and status */
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->use_aio );
     HDassert( struct_ptr->trans_in_prog == FALSE );
     HDassert( ( ( struct_ptr->writes_in_progress == struct_ptr->bufs_in_use ) 
@@ -2907,17 +2907,17 @@ H5C2_jb_aio__flush(H5C2_jbrb_t * struct_ptr)
     /* make note of the last transaction in the ring buffer */
     last_trans_in_ring_buffer = (*struct_ptr->trans_tracking)[struct_ptr->put];
 
-#if H5C2_JB_AIO__FLUSH__DEBUG
+#if H5C_JB_AIO__FLUSH__DEBUG
     HDfprintf(stdout, "%s: trans_tracking[%d] = %lld\n", FUNC, struct_ptr->get,
               (*struct_ptr->trans_tracking)[struct_ptr->get]);
     HDfprintf(stdout, "%s: trans_tracking[%d] = %lld\n", FUNC, struct_ptr->put,
               (*struct_ptr->trans_tracking)[struct_ptr->put]);
-#endif /* H5C2_JB_AIO__FLUSH__DEBUG */
+#endif /* H5C_JB_AIO__FLUSH__DEBUG */
 
     /* if the current buffer (indicated by struct_ptr->put) is dirty,
      * but not full, queue a write of the buffer.  The dirty part should
      * be obvious.  The not full part is required, as 
-     * H5C2_jb_aio__write_to_buffer() will have already queued the write
+     * H5C_jb_aio__write_to_buffer() will have already queued the write
      * if the buffer is full.
      *
      * In passing, make note of whether the current buffer is dirty -- 
@@ -2931,38 +2931,38 @@ H5C2_jb_aio__flush(H5C2_jbrb_t * struct_ptr)
         if ( struct_ptr->cur_buf_free_space > 0 ) {
 
             /* kick off an asynchronous write of the current buffer */
-	    result = H5C2_jb_aio__queue_buffer_write(struct_ptr,
+	    result = H5C_jb_aio__queue_buffer_write(struct_ptr,
 				                     struct_ptr->put,
                                                      TRUE);
 
             if ( result != SUCCEED ) {
 
-#if H5C2_JB_AIO__FLUSH__DEBUG
+#if H5C_JB_AIO__FLUSH__DEBUG
 		HDfprintf(stdout, 
-                          "%s: H5C2_jb_aio__queue_buffer_write() failed.\n", 
+                          "%s: H5C_jb_aio__queue_buffer_write() failed.\n", 
                           FUNC);
-#endif /* H5C2_JB_AIO__FLUSH__DEBUG */
+#endif /* H5C_JB_AIO__FLUSH__DEBUG */
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-			    "H5C2_jb_aio__queue_buffer_write() failed.");
+			    "H5C_jb_aio__queue_buffer_write() failed.");
             }
         }
     }
 
     /* await completion of all outstanding writes */
 
-    result = H5C2_jb_aio__await_completion_of_all_pending_writes(struct_ptr);
+    result = H5C_jb_aio__await_completion_of_all_pending_writes(struct_ptr);
 
     if ( result != SUCCEED ) {
 
-#if H5C2_JB_AIO__FLUSH__DEBUG
+#if H5C_JB_AIO__FLUSH__DEBUG
 	HDfprintf(stdout, 
-         "%s: H5C2_jb_aio__await_completion_of_all_pending_writes() failed.\n", 
+         "%s: H5C_jb_aio__await_completion_of_all_pending_writes() failed.\n", 
           FUNC);
-#endif /* H5C2_JB_AIO__FLUSH__DEBUG */
+#endif /* H5C_JB_AIO__FLUSH__DEBUG */
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-	    "H5C2_jb_aio__await_completion_of_all_pending_writes() failed.");
+	    "H5C_jb_aio__await_completion_of_all_pending_writes() failed.");
     }
 
     HDassert( struct_ptr->bufs_in_use == 0 );
@@ -2971,29 +2971,29 @@ H5C2_jb_aio__flush(H5C2_jbrb_t * struct_ptr)
 
     /* sync out the file */
 
-    result = H5C2_jb_aio__sync_file(struct_ptr);
+    result = H5C_jb_aio__sync_file(struct_ptr);
 
     if ( result != SUCCEED ) {
 
-#if H5C2_JB_AIO__FLUSH__DEBUG
+#if H5C_JB_AIO__FLUSH__DEBUG
 	HDfprintf(stdout, 
-                  "%s: H5C2_jb_aio__sync_file() failed.\n", 
+                  "%s: H5C_jb_aio__sync_file() failed.\n", 
                   FUNC);
-#endif /* H5C2_JB_AIO__FLUSH__DEBUG */
+#endif /* H5C_JB_AIO__FLUSH__DEBUG */
 
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_jb_aio__sync_file() failed.");
+                    "H5C_jb_aio__sync_file() failed.");
     }
 
     /* If the current buffer was dirty on entry, it was flushed and must 
      * be prepared for use.
      *
-     * Don't call H5C2_jb_aio__prep_next_buf_for_use() for this, as 
+     * Don't call H5C_jb_aio__prep_next_buf_for_use() for this, as 
      * it assumes that the current buffer is full and dirty -- neither
      * of which is the case at present.
      *
-     * further, H5C2_jb_aio__prep_next_buf_for_use() will also 
+     * further, H5C_jb_aio__prep_next_buf_for_use() will also 
      * increment put, which will cause problems if we don't increment
      * get as well.
      */
@@ -3047,12 +3047,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__flush() */
+} /* H5C_jb_aio__flush() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__get_last_transaction_on_disk
+ * Function:		H5C_jb_aio__get_last_transaction_on_disk
  *
  * Programmer:		John Mainzer
  *			1/19/10
@@ -3079,18 +3079,18 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_aio__get_last_transaction_on_disk(H5C2_jbrb_t * struct_ptr,
+H5C_jb_aio__get_last_transaction_on_disk(H5C_jbrb_t * struct_ptr,
                                           uint64_t * trans_num_ptr)
 {
     hbool_t ring_buffer_was_full = FALSE;
     herr_t result;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__get_last_transaction_on_disk, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__get_last_transaction_on_disk, FAIL)
 	
     /* Check Arguments */
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->use_aio );
     HDassert( trans_num_ptr != NULL );
     HDassert( ( ( struct_ptr->writes_in_progress == struct_ptr->bufs_in_use ) 
@@ -3117,20 +3117,20 @@ H5C2_jb_aio__get_last_transaction_on_disk(H5C2_jbrb_t * struct_ptr,
 
     if ( struct_ptr->use_aio_fsync ) {
 
-        result = H5C2_jb_aio__note_completed_async_buffer_writes(struct_ptr);
+        result = H5C_jb_aio__note_completed_async_buffer_writes(struct_ptr);
 
         if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_jb_aio__note_completed_async_buffer_writes() failed.")
+                    "H5C_jb_aio__note_completed_async_buffer_writes() failed.")
         }
 
-        result = H5C2_jb_aio__note_completed_async_fsyncs(struct_ptr);
+        result = H5C_jb_aio__note_completed_async_fsyncs(struct_ptr);
 
         if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C2_jb_aio__note_completed_async_fsyncs() failed.")
+                        "H5C_jb_aio__note_completed_async_fsyncs() failed.")
         }
     } else {
 
@@ -3144,12 +3144,12 @@ H5C2_jb_aio__get_last_transaction_on_disk(H5C2_jbrb_t * struct_ptr,
         /* await completion of all outstanding writes */
 
         result = 
-	    H5C2_jb_aio__await_completion_of_all_pending_writes(struct_ptr);
+	    H5C_jb_aio__await_completion_of_all_pending_writes(struct_ptr);
 
         if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-	       "H5C2_jb_aio__await_completion_of_all_pending_writes() failed.");
+	       "H5C_jb_aio__await_completion_of_all_pending_writes() failed.");
         }
 
         HDassert( struct_ptr->bufs_in_use <= 1 );
@@ -3159,12 +3159,12 @@ H5C2_jb_aio__get_last_transaction_on_disk(H5C2_jbrb_t * struct_ptr,
 
         /* sync out the file */
 
-        result = H5C2_jb_aio__sync_file(struct_ptr);
+        result = H5C_jb_aio__sync_file(struct_ptr);
 
         if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C2_jb_aio__sync_file() failed.");
+                        "H5C_jb_aio__sync_file() failed.");
         }
 
 
@@ -3179,11 +3179,11 @@ H5C2_jb_aio__get_last_transaction_on_disk(H5C2_jbrb_t * struct_ptr,
          *
          * In this case, we must prepare the next buffer for use.
          *
-         * Don't call H5C2_jb_aio__prep_next_buf_for_use() for this, as 
+         * Don't call H5C_jb_aio__prep_next_buf_for_use() for this, as 
          * it assumes that the current buffer is full and dirty -- neither
          * of which is the case at present.
          *
-         * further, H5C2_jb_aio__prep_next_buf_for_use() will also 
+         * further, H5C_jb_aio__prep_next_buf_for_use() will also 
          * increment put, which will cause problems if we don't increment
          * get as well.
          */
@@ -3244,12 +3244,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__get_last_transaction_on_disk */
+} /* H5C_jb_aio__get_last_transaction_on_disk */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__make_space_in_ring_buffer()
+ * Function:		H5C_jb_aio__make_space_in_ring_buffer()
  *
  * Programmer:		John Mainzer
  *
@@ -3274,7 +3274,7 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_aio__make_space_in_ring_buffer(H5C2_jbrb_t * struct_ptr)
+H5C_jb_aio__make_space_in_ring_buffer(H5C_jbrb_t * struct_ptr)
 {
     hbool_t done = FALSE;
     hbool_t buf_write_complete;
@@ -3282,10 +3282,10 @@ H5C2_jb_aio__make_space_in_ring_buffer(H5C2_jbrb_t * struct_ptr)
     herr_t result;
     uint64_t last_trans_in_ring_buffer;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__make_space_in_ring_buffer, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__make_space_in_ring_buffer, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->use_aio == TRUE );
     HDassert( struct_ptr->bufs_in_use == struct_ptr->num_bufs );
     HDassert( struct_ptr->bufs_in_use == struct_ptr->writes_in_progress );
@@ -3294,7 +3294,7 @@ H5C2_jb_aio__make_space_in_ring_buffer(H5C2_jbrb_t * struct_ptr)
     HDassert( struct_ptr->cur_buf_free_space == 0 );
 
     /* free up the oldest (or least recently dirtied) buffer */
-    result = H5C2_jb_aio__await_buffer_write_completion(struct_ptr,
+    result = H5C_jb_aio__await_buffer_write_completion(struct_ptr,
 				                        struct_ptr->get);
 
     if ( result != SUCCEED ) {
@@ -3302,7 +3302,7 @@ H5C2_jb_aio__make_space_in_ring_buffer(H5C2_jbrb_t * struct_ptr)
         HDassert(FALSE);
 #endif /* JRM */
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_jb_aio__await_buffer_write_completion() failed.")
+                    "H5C_jb_aio__await_buffer_write_completion() failed.")
     }
 
     /* Update the last transaction written, and then set the transaction 
@@ -3330,13 +3330,13 @@ H5C2_jb_aio__make_space_in_ring_buffer(H5C2_jbrb_t * struct_ptr)
 
     last_trans_in_ring_buffer = (*struct_ptr->trans_tracking)[struct_ptr->put];
 
-    result = H5C2_jb_aio__prep_next_buf_for_use(struct_ptr, 
+    result = H5C_jb_aio__prep_next_buf_for_use(struct_ptr, 
                                                 last_trans_in_ring_buffer);
 
     if ( result != SUCCEED ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_jb_aio__prep_next_buf_for_use() failed.")
+                    "H5C_jb_aio__prep_next_buf_for_use() failed.")
     }
 
     HDassert( ((struct_ptr->put + 1) % struct_ptr->num_bufs) == 
@@ -3350,14 +3350,14 @@ H5C2_jb_aio__make_space_in_ring_buffer(H5C2_jbrb_t * struct_ptr)
 
 #if 1 /* JRM */
 
-    result = H5C2_jb_aio__note_completed_async_buffer_writes(struct_ptr);
+    result = H5C_jb_aio__note_completed_async_buffer_writes(struct_ptr);
 
     if ( result != SUCCEED ) {
 #if 1 /* JRM */
         HDassert(FALSE);
 #endif /* JRM */
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_jb_aio__note_completed_async_buffer_writes() failed.")
+                    "H5C_jb_aio__note_completed_async_buffer_writes() failed.")
     }
 
 #else /* delete this branch if all goes well -- JRM */
@@ -3366,7 +3366,7 @@ H5C2_jb_aio__make_space_in_ring_buffer(H5C2_jbrb_t * struct_ptr)
 
         buf_write_complete = FALSE;
 
-        result = H5C2_jb_aio__test_buffer_write_complete(struct_ptr,
+        result = H5C_jb_aio__test_buffer_write_complete(struct_ptr,
 				                         struct_ptr->get,
                                                          &buf_write_complete);
 
@@ -3375,7 +3375,7 @@ H5C2_jb_aio__make_space_in_ring_buffer(H5C2_jbrb_t * struct_ptr)
             HDassert(FALSE);
 #endif /* JRM */
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C2_jb_aio__test_buffer_write_complete() failed.")
+                        "H5C_jb_aio__test_buffer_write_complete() failed.")
         }
 
         if ( buf_write_complete ) {
@@ -3430,12 +3430,12 @@ H5C2_jb_aio__make_space_in_ring_buffer(H5C2_jbrb_t * struct_ptr)
 
     if ( struct_ptr->use_aio_fsync ) {
 
-        result = H5C2_jb_aio__note_completed_async_fsyncs(struct_ptr);
+        result = H5C_jb_aio__note_completed_async_fsyncs(struct_ptr);
 
         if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C2_jb_aio__note_completed_async_fsyncs() failed.")
+                        "H5C_jb_aio__note_completed_async_fsyncs() failed.")
         }
     }
 
@@ -3443,12 +3443,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__make_space_in_ring_buffer() */
+} /* H5C_jb_aio__make_space_in_ring_buffer() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__note_completed_async_buffer_writes
+ * Function:		H5C_jb_aio__note_completed_async_buffer_writes
  *
  * Programmer:		John Mainzer
  *			2/10/10
@@ -3470,37 +3470,37 @@ done:
  *
  ******************************************************************************/
 
-#define H5C2_JB_AIO__NOTE_COMPLETED_ASYNC_BUFFER_WRITES__DEBUG 0
+#define H5C_JB_AIO__NOTE_COMPLETED_ASYNC_BUFFER_WRITES__DEBUG 0
 
 static herr_t 
-H5C2_jb_aio__note_completed_async_buffer_writes(H5C2_jbrb_t * struct_ptr)
+H5C_jb_aio__note_completed_async_buffer_writes(H5C_jbrb_t * struct_ptr)
 {
     herr_t result;
     herr_t ret_value = SUCCEED;
     hbool_t write_completed = TRUE;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__note_completed_async_buffer_writes, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__note_completed_async_buffer_writes, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->use_aio );
 
     while ( ( struct_ptr->writes_in_progress > 0 ) &&
             ( write_completed ) ) {
 
-        result = H5C2_jb_aio__test_buffer_write_complete(struct_ptr, 
+        result = H5C_jb_aio__test_buffer_write_complete(struct_ptr, 
                                                          struct_ptr->get,
                                                          &write_completed);
 
         if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C2_jb_aio__test_buffer_write_complete() failed.")
+                        "H5C_jb_aio__test_buffer_write_complete() failed.")
         }
 
         if ( write_completed ) {
 
-	    H5C2__JBRB__UPDATE_STATS_FOR_BUF_WRITE_COMPLETE(struct_ptr, FALSE)
+	    H5C__JBRB__UPDATE_STATS_FOR_BUF_WRITE_COMPLETE(struct_ptr, FALSE)
 
             /* Update the last transaction written, and then set the
              * transaction tracking array entry of the buffer whose
@@ -3531,7 +3531,7 @@ H5C2_jb_aio__note_completed_async_buffer_writes(H5C2_jbrb_t * struct_ptr)
 
             struct_ptr->get = (struct_ptr->get + 1) % (struct_ptr->num_bufs);
 
-#if H5C2_JB_AIO__NOTE_COMPLETED_ASYNC_BUFFER_WRITES__DEBUG 
+#if H5C_JB_AIO__NOTE_COMPLETED_ASYNC_BUFFER_WRITES__DEBUG 
             if ( ! ( ( ( struct_ptr->bufs_in_use == 0 ) 
                        &&
                        ( struct_ptr->put == struct_ptr->get ) 
@@ -3549,7 +3549,7 @@ H5C2_jb_aio__note_completed_async_buffer_writes(H5C2_jbrb_t * struct_ptr)
                              (int)(struct_ptr->put),
                              (int)(struct_ptr->get));
                } 
-#endif /* H5C2_JB_AIO__NOTE_COMPLETED_ASYNC_BUFFER_WRITES__DEBUG */
+#endif /* H5C_JB_AIO__NOTE_COMPLETED_ASYNC_BUFFER_WRITES__DEBUG */
 
             HDassert( ( ( struct_ptr->bufs_in_use == 0 ) 
                         &&
@@ -3575,12 +3575,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__note_completed_async_buffer_writes() */
+} /* H5C_jb_aio__note_completed_async_buffer_writes() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__note_completed_async_fsyncs
+ * Function:		H5C_jb_aio__note_completed_async_fsyncs
  *
  * Programmer:		John Mainzer
  *			2/10/10
@@ -3590,7 +3590,7 @@ done:
  *
  * 			Then, if the sync queue is not empty, test to see 
  *			if the asynchronous fsync associated with the 
- *			instance of struct H5C2_jbrb_sync_q_entry_t at the 
+ *			instance of struct H5C_jbrb_sync_q_entry_t at the 
  *			head of the sync queue has completed.  
  *
  *			If it hasn't, return.
@@ -3615,16 +3615,16 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_aio__note_completed_async_fsyncs(H5C2_jbrb_t * struct_ptr)
+H5C_jb_aio__note_completed_async_fsyncs(H5C_jbrb_t * struct_ptr)
 {
     herr_t result;
     herr_t ret_value = SUCCEED;
     hbool_t sync_completed = TRUE;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__note_completed_async_fsyncs, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__note_completed_async_fsyncs, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->use_aio );
     HDassert( struct_ptr->use_aio_fsync );
 
@@ -3632,13 +3632,13 @@ H5C2_jb_aio__note_completed_async_fsyncs(H5C2_jbrb_t * struct_ptr)
             ( struct_ptr->aio_sync_q_len > struct_ptr->writes_in_progress ) &&
             ( sync_completed ) ) {
 
-        result = H5C2_jb_aio__test_next_async_fsync_complete(struct_ptr, 
+        result = H5C_jb_aio__test_next_async_fsync_complete(struct_ptr, 
                                                              &sync_completed);
 
         if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C2_jb_aio__test_next_async_fsync_complete() failed.")
+                        "H5C_jb_aio__test_next_async_fsync_complete() failed.")
         }
     } /* while */
 
@@ -3646,12 +3646,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__note_completed_async_fsyncs() */
+} /* H5C_jb_aio__note_completed_async_fsyncs() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__prep_next_buf_for_use()
+ * Function:		H5C_jb_aio__prep_next_buf_for_use()
  *
  * Programmer:		John Mainzer
  *
@@ -3671,15 +3671,15 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_aio__prep_next_buf_for_use(H5C2_jbrb_t * struct_ptr,
+H5C_jb_aio__prep_next_buf_for_use(H5C_jbrb_t * struct_ptr,
                                    uint64_t last_trans_in_ring_buffer)
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__prep_next_buf_for_use, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__prep_next_buf_for_use, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->use_aio == TRUE );
 
     if ( ( struct_ptr->bufs_in_use >= struct_ptr->num_bufs ) ||
@@ -3711,12 +3711,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__prep_next_buf_for_use() */
+} /* H5C_jb_aio__prep_next_buf_for_use() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__queue_async_fsync()
+ * Function:		H5C_jb_aio__queue_async_fsync()
  *
  * Programmer:		John Mainzer
  *
@@ -3725,7 +3725,7 @@ done:
  *			Verify that AIO is enabled, and that use_aio_fsync
  *			is TRUE.
  *
- *			Then allocate an instance of H5C2_jbrb_sync_q_entry_t,
+ *			Then allocate an instance of H5C_jbrb_sync_q_entry_t,
  *			load it with the last transaction queued and a 
  *			correctly configured aio control block, and attempt
  *			to queue an asynchronous fsync via aio_fsync().
@@ -3733,7 +3733,7 @@ done:
  *			If aio_fsync() is not supported, (i.e. it fails 
  *			with ENOSYS or EINVAL), set struct_ptr->use_aio_fsync 
  *			to FALSE, discard the instance of 
- *			H5C2_jbrb_sync_q_entry_t and return.
+ *			H5C_jbrb_sync_q_entry_t and return.
  *
  *			if aio_fsync() fails with EAGAIN, retry until either
  *			success, failure with some other error, or the retry
@@ -3744,13 +3744,13 @@ done:
  *			EAGAIN, EINVAL, or ENOSYS, flag an error and quit.
  *
  *			If the aio_fsync() is queued successfully, add the
- *			instance of H5C2_jbrb_sync_q_entry_t to the tail of 
+ *			instance of H5C_jbrb_sync_q_entry_t to the tail of 
  *			the aio sync queue, and then return.  
  *
- *			If the instance	of H5C2_jbrb_sync_q_entry_t is 
+ *			If the instance	of H5C_jbrb_sync_q_entry_t is 
  *			allocated, but the call to aio_fsync() fails for 
  *			any reason, discard the instance of 
- *			H5C2_jbrb_sync_q_entry_t before exiting.
+ *			H5C_jbrb_sync_q_entry_t before exiting.
  *
  *						JRM -- 2/8/10
  *
@@ -3758,11 +3758,11 @@ done:
  *
  ******************************************************************************/
 
-#define H5C2_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG 0
+#define H5C_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG 0
 #define AIO_FSYNC_MAX_RETRIES	120
 
 static herr_t 
-H5C2_jb_aio__queue_async_fsync(H5C2_jbrb_t * struct_ptr)
+H5C_jb_aio__queue_async_fsync(H5C_jbrb_t * struct_ptr)
 {
     herr_t ret_value = SUCCEED;
     herr_t herr_result;
@@ -3770,18 +3770,18 @@ H5C2_jb_aio__queue_async_fsync(H5C2_jbrb_t * struct_ptr)
     hbool_t sync_queued = FALSE;
     int result;
     int retries = -1;
-    struct H5C2_jbrb_sync_q_entry_t * entry_ptr = NULL;
+    struct H5C_jbrb_sync_q_entry_t * entry_ptr = NULL;
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->journal_file_fd >= 0 );
     HDassert( struct_ptr->use_aio );
     HDassert( struct_ptr->use_aio_fsync );
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__queue_async_fsync, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__queue_async_fsync, FAIL)
 
-    entry_ptr = (struct H5C2_jbrb_sync_q_entry_t *) 
-	H5MM_malloc(sizeof(struct H5C2_jbrb_sync_q_entry_t));
+    entry_ptr = (struct H5C_jbrb_sync_q_entry_t *) 
+	H5MM_malloc(sizeof(struct H5C_jbrb_sync_q_entry_t));
 
     if ( entry_ptr == NULL ) {
 
@@ -3789,7 +3789,7 @@ H5C2_jb_aio__queue_async_fsync(H5C2_jbrb_t * struct_ptr)
                     "memory allocation failed for aio sync queue entry.")
     }
 
-    entry_ptr->magic = H5C2__H5C2_JBRB_SYNC_Q_T_MAGIC;
+    entry_ptr->magic = H5C__H5C_JBRB_SYNC_Q_T_MAGIC;
     entry_ptr->last_trans_in_sync = struct_ptr->last_trans_queued;
     bzero((void *)(&(entry_ptr->ctl_blk)), sizeof(struct aiocb));
     entry_ptr->ctl_blk.aio_fildes = struct_ptr->journal_file_fd;
@@ -3804,11 +3804,11 @@ H5C2_jb_aio__queue_async_fsync(H5C2_jbrb_t * struct_ptr)
             if ( ( errno == EINVAL ) ||
                  ( errno == ENOSYS ) ) {
 
-#if H5C2_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG
+#if H5C_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG
 	        HDfprintf(stdout, 
                       "%s: aio_fsync() not supported. errno = %d (%s)\n",
                       FUNC, errno, strerror(errno));
-#endif /* H5C2_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG */
+#endif /* H5C_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG */
                 HDassert( struct_ptr->aio_sync_q_len == 0 );
                 struct_ptr->use_aio_fsync = FALSE;
 
@@ -3818,11 +3818,11 @@ H5C2_jb_aio__queue_async_fsync(H5C2_jbrb_t * struct_ptr)
 
                 if ( retries > AIO_FSYNC_MAX_RETRIES ) {
 
-#if H5C2_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG
+#if H5C_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG
                     HDfprintf(stdout, 
 			  "%s: retry limit on calls to aio_fsync() exceeded\n",
                           FUNC);
-#endif /* H5C2_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG */
+#endif /* H5C_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG */
 
                     HGOTO_ERROR(H5E_IO, H5E_SYNCFAIL, FAIL,  \
                         "retry limit on calls to aio_fsync() exceeded.")
@@ -3837,16 +3837,16 @@ H5C2_jb_aio__queue_async_fsync(H5C2_jbrb_t * struct_ptr)
                 if ( struct_ptr->aio_sync_q_len > 0 ) {
 
                     herr_result =  
-			H5C2_jb_aio__test_next_async_fsync_complete(struct_ptr,
+			H5C_jb_aio__test_next_async_fsync_complete(struct_ptr,
                                                                &sync_complete);
                 }
 	    } else {
 
-#if H5C2_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG
+#if H5C_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG
 	        HDfprintf(stdout, 
                       "%s: aio_fsync() failed. errno = %d (%s)\n",
                       FUNC, errno, strerror(errno));
-#endif /* H5C2_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG */
+#endif /* H5C_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG */
 
                 HGOTO_ERROR(H5E_IO, H5E_SYNCFAIL, FAIL, \
 		        "call to aio_fsync() failed.")
@@ -3857,26 +3857,26 @@ H5C2_jb_aio__queue_async_fsync(H5C2_jbrb_t * struct_ptr)
 
     if ( result == 0 ) {
 
-	herr_result = H5C2_jb_aio__sync_q__append(struct_ptr, entry_ptr);
+	herr_result = H5C_jb_aio__sync_q__append(struct_ptr, entry_ptr);
 
         if ( herr_result != SUCCEED ) {
 
              HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                         "H5C2_jb_aio__sync_q__append() failed.")
+                         "H5C_jb_aio__sync_q__append() failed.")
 
         }
 
         sync_queued = TRUE;
 
-	H5C2__JBRB__UPDATE_STATS_FOR_ASYNC_SYNCS_QUEUED(struct_ptr);
+	H5C__JBRB__UPDATE_STATS_FOR_ASYNC_SYNCS_QUEUED(struct_ptr);
 
-#if H5C2_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG
+#if H5C_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG
         HDfprintf(stdout, 
                   "%s: queued async fsync. last trans = %lld, q_len = %lld.\n",
                   FUNC, 
                   (long long)(entry_ptr->last_trans_in_sync), 
                   (long long)(struct_ptr->aio_sync_q_len));
-#endif /* H5C2_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG */
+#endif /* H5C_JB_AIO__QUEUE_ASYNC_FSYNC__DEBUG */
 		
     }
 done:
@@ -3885,7 +3885,7 @@ done:
          ( ! sync_queued ) ) { /* discard *entry_ptr */
 
         entry_ptr->magic = 0;
-        entry_ptr = (struct H5C2_jbrb_sync_q_entry_t *)H5MM_xfree(entry_ptr);
+        entry_ptr = (struct H5C_jbrb_sync_q_entry_t *)H5MM_xfree(entry_ptr);
 
         if ( entry_ptr != NULL ) {
 
@@ -3896,12 +3896,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__queue_async_fsync() */
+} /* H5C_jb_aio__queue_async_fsync() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__queue_buffer_write
+ * Function:		H5C_jb_aio__queue_buffer_write
  *
  * Programmer:		John Mainzer
  *
@@ -3923,20 +3923,20 @@ done:
  *
  ******************************************************************************/
 
-#define H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG 0
+#define H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG 0
 #define AIO_WRITE_MAX_RETRIES	120
 
 static herr_t 
-H5C2_jb_aio__queue_buffer_write(H5C2_jbrb_t * struct_ptr,
+H5C_jb_aio__queue_buffer_write(H5C_jbrb_t * struct_ptr,
 		 	        int buf_num,
                                 hbool_t partial_write_ok)
 {
     hbool_t write_queued = FALSE;
     int result;
     int retries = -1;
-#if H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
+#if H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
     static int writes_queued = 0;
-#endif /* H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
+#endif /* H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
     uint64_t last_trans_in_buf;
     herr_t herr_result;
     herr_t ret_value = SUCCEED;
@@ -3945,7 +3945,7 @@ H5C2_jb_aio__queue_buffer_write(H5C2_jbrb_t * struct_ptr,
     struct aiocb * aiocb_ptr = NULL;
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->buf_size > 0 );
     HDassert( struct_ptr->journal_file_fd >= 0 );
     HDassert( struct_ptr->use_aio );
@@ -3954,7 +3954,7 @@ H5C2_jb_aio__queue_buffer_write(H5C2_jbrb_t * struct_ptr,
     HDassert( buf_num >= 0 );
     HDassert( buf_num < struct_ptr->num_bufs );
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__queue_buffer_write, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__queue_buffer_write, FAIL)
 
     if ( struct_ptr->cur_buf_free_space >= struct_ptr->buf_size ) {
 
@@ -3965,11 +3965,11 @@ H5C2_jb_aio__queue_buffer_write(H5C2_jbrb_t * struct_ptr,
     if ( ( struct_ptr->cur_buf_free_space > 0 ) && 
          ( ! partial_write_ok ) ) {
 
-#if H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
+#if H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
 	HDfprintf(stdout, 
                   "%s: buffer not full and partial_write_ok == FALSE.\n",
                   FUNC);
-#endif /* H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
+#endif /* H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                     "buffer not full and partial_write_ok == FALSE.")
@@ -3986,11 +3986,11 @@ H5C2_jb_aio__queue_buffer_write(H5C2_jbrb_t * struct_ptr,
 
     if ( aiocb_ptr->aio_fildes != -1 ) {
 
-#if H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
+#if H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
 	HDfprintf(stdout, 
                   "%s: AIO write alread in progress for target buffer?\n",
                   FUNC);
-#endif /* H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
+#endif /* H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                     "AIO write alread in progress for target buffer?")
@@ -4000,11 +4000,11 @@ H5C2_jb_aio__queue_buffer_write(H5C2_jbrb_t * struct_ptr,
 
     if ( buf_ptr == NULL ) {
 
-#if H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
+#if H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
 	HDfprintf(stdout, 
                   "%s: ((*struct_ptr->buf)[buf_num]) == NULL?!?\n",
                   FUNC);
-#endif /* H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
+#endif /* H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
 		    "((*struct_ptr->buf)[buf_num]) == NULL?!?")
@@ -4037,7 +4037,7 @@ H5C2_jb_aio__queue_buffer_write(H5C2_jbrb_t * struct_ptr,
 
 	    } else {
 
-#if H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
+#if H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
 	        HDfprintf(stdout, 
                       "%s: aio_write(aiocb_ptr) failed. errno = %d (%s)\n",
                       FUNC, errno, strerror(errno));
@@ -4045,7 +4045,7 @@ H5C2_jb_aio__queue_buffer_write(H5C2_jbrb_t * struct_ptr,
                           FUNC,
                           (long long)struct_ptr->aio_next_buf_offset,
                           (int)bytes_to_write);
-#endif /* H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
+#endif /* H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
 
                 HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, \
 		        "call to aio_write() failed.")
@@ -4053,7 +4053,7 @@ H5C2_jb_aio__queue_buffer_write(H5C2_jbrb_t * struct_ptr,
         }
     } while ( ( result != 0 ) && ( retries <= AIO_WRITE_MAX_RETRIES ) );
 
-#if H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
+#if H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
     if ( retries > 0 ) {
 
         HDfprintf(stdout, 
@@ -4067,36 +4067,36 @@ H5C2_jb_aio__queue_buffer_write(H5C2_jbrb_t * struct_ptr,
                   (long long)struct_ptr->aio_next_buf_offset,
                   (int)bytes_to_write);
     }
-#endif /* H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
+#endif /* H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
 
 
     if ( ( result != 0 ) && ( retries > AIO_WRITE_MAX_RETRIES ) ) {
 
-#if H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
+#if H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
         HDfprintf(stdout, "%s: retry limit on calls to aio_write() exceeded\n",
                    FUNC);
-#endif /* H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
+#endif /* H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
 
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, \
                     "retry limit on calls to aio_write() exceeded.")
     }
 
-#if H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
+#if H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
         writes_queued++;
-#endif /* H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
+#endif /* H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
 
-    H5C2__JBRB__UPDATE_STATS_FOR_BUF_WRITE_QUEUED(struct_ptr, \
+    H5C__JBRB__UPDATE_STATS_FOR_BUF_WRITE_QUEUED(struct_ptr, \
 				(struct_ptr->cur_buf_free_space > 0 ))
 
     /* note that another write is in progress */
     struct_ptr->writes_in_progress++;
-#if H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
+#if H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG
     if ( struct_ptr->writes_in_progress != struct_ptr->bufs_in_use ) {
         HDfprintf(stdout, "%s: wip = %d, biu = %d.\n", FUNC,
                   struct_ptr->writes_in_progress,
                   struct_ptr->bufs_in_use);
     } 
-#endif /* H5C2_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
+#endif /* H5C_JB_AIO__QUEUE_BUFFER_WRITE__DEBUG */
     HDassert( struct_ptr->writes_in_progress == struct_ptr->bufs_in_use );
 
     /* update struct_ptr->last_trans_queued */
@@ -4110,12 +4110,12 @@ H5C2_jb_aio__queue_buffer_write(H5C2_jbrb_t * struct_ptr,
      */
     if ( struct_ptr->use_aio_fsync ) {
 
-        herr_result = H5C2_jb_aio__queue_async_fsync(struct_ptr);
+        herr_result = H5C_jb_aio__queue_async_fsync(struct_ptr);
 
         if ( herr_result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C2_jb_aio__queue_async_fsync() failed.")
+                        "H5C_jb_aio__queue_async_fsync() failed.")
         }
     }
 
@@ -4123,12 +4123,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__queue_buffer_write() */
+} /* H5C_jb_aio__queue_buffer_write() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__sync_file()
+ * Function:		H5C_jb_aio__sync_file()
  *
  * Programmer:		John Mainzer
  *			1/13/10
@@ -4156,26 +4156,26 @@ done:
  *
  ******************************************************************************/
 
-#define H5C2_JB_AIO__SYNC_FILE__DEBUG 0
+#define H5C_JB_AIO__SYNC_FILE__DEBUG 0
 
 static herr_t 
-H5C2_jb_aio__sync_file(H5C2_jbrb_t * struct_ptr)
+H5C_jb_aio__sync_file(H5C_jbrb_t * struct_ptr)
 {
     int result;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__sync_file, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__sync_file, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->journal_file_fd >= 0 );
     HDassert( struct_ptr->use_aio );
 
     if ( struct_ptr->writes_in_progress != 0 ) {
 
-#if H5C2_JB_AIO__SYNC_FILE__DEBUG 
+#if H5C_JB_AIO__SYNC_FILE__DEBUG 
         HDfprintf(stdout, "%s: async write in progress on entry.\n", FUNC);
-#endif /* H5C2_JB_AIO__SYNC_FILE__DEBUG */
+#endif /* H5C_JB_AIO__SYNC_FILE__DEBUG */
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
                     "async write in progress on entry")
@@ -4183,18 +4183,18 @@ H5C2_jb_aio__sync_file(H5C2_jbrb_t * struct_ptr)
 
     if ( struct_ptr->use_aio_fsync ) {
 
-        result = H5C2_jb_aio__await_completion_of_all_async_fsyncs(struct_ptr);
+        result = H5C_jb_aio__await_completion_of_all_async_fsyncs(struct_ptr);
 
         if ( result != 0 ) {
 
-#if H5C2_JB_AIO__SYNC_FILE__DEBUG 
+#if H5C_JB_AIO__SYNC_FILE__DEBUG 
             HDfprintf(stdout, 
-	    "%s: H5C2_jb_aio__await_completion_of_all_async_fsyncs() failed.\n",
+	    "%s: H5C_jb_aio__await_completion_of_all_async_fsyncs() failed.\n",
             FUNC);
-#endif /* H5C2_JB_AIO__SYNC_FILE__DEBUG */
+#endif /* H5C_JB_AIO__SYNC_FILE__DEBUG */
 
             HGOTO_ERROR(H5E_IO, H5E_SYNCFAIL, FAIL,  \
-                "H5C2_jb_aio__await_completion_of_all_async_fsyncs() failed.");
+                "H5C_jb_aio__await_completion_of_all_async_fsyncs() failed.");
         }
     } else {
 
@@ -4202,32 +4202,32 @@ H5C2_jb_aio__sync_file(H5C2_jbrb_t * struct_ptr)
 
         if ( result != 0 ) {
 
-#if H5C2_JB_AIO__SYNC_FILE__DEBUG 
+#if H5C_JB_AIO__SYNC_FILE__DEBUG 
             HDfprintf(stdout, "%s: fsync() failed.\n", FUNC);
-#endif /* H5C2_JB_AIO__SYNC_FILE__DEBUG */
+#endif /* H5C_JB_AIO__SYNC_FILE__DEBUG */
 
             HGOTO_ERROR(H5E_IO, H5E_SYNCFAIL, FAIL,  "fsync() failed.");
         }
 
-	H5C2__JBRB__UPDATE_STATS_FOR_CALL_TO_FSYNC(struct_ptr)
+	H5C__JBRB__UPDATE_STATS_FOR_CALL_TO_FSYNC(struct_ptr)
     }
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__sync_file() */
+} /* H5C_jb_aio__sync_file() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__sync_q__append()
+ * Function:		H5C_jb_aio__sync_q__append()
  *
- * Purpose:		Append an instance of H5C2_jbrb_sync_q_entry_t to
+ * Purpose:		Append an instance of H5C_jbrb_sync_q_entry_t to
  *			the sync queue.
  *
  *			Verify that AIO is enabled, and that the supplied
- *			instance of H5C2_jbrb_sync_q_entry_t has the correct
+ *			instance of H5C_jbrb_sync_q_entry_t has the correct
  *			magic value.  Then append to the end of the sync 
  *			queue.
  *							JRM -- 2/9/10
@@ -4238,18 +4238,18 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_aio__sync_q__append(H5C2_jbrb_t * struct_ptr,
-                           struct H5C2_jbrb_sync_q_entry_t * entry_ptr)
+H5C_jb_aio__sync_q__append(H5C_jbrb_t * struct_ptr,
+                           struct H5C_jbrb_sync_q_entry_t * entry_ptr)
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__sync_q__append, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__sync_q__append, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->use_aio );
     HDassert( entry_ptr != NULL );
-    HDassert( entry_ptr->magic == H5C2__H5C2_JBRB_SYNC_Q_T_MAGIC );
+    HDassert( entry_ptr->magic == H5C__H5C_JBRB_SYNC_Q_T_MAGIC );
     HDassert( entry_ptr->next == NULL );
 
     /* this should be an assert, but we need to include one call to
@@ -4288,7 +4288,7 @@ H5C2_jb_aio__sync_q__append(H5C2_jbrb_t * struct_ptr,
                   )
                 );
         HDassert( struct_ptr->aio_sync_q_tail->magic == 
-                  H5C2__H5C2_JBRB_SYNC_Q_T_MAGIC );
+                  H5C__H5C_JBRB_SYNC_Q_T_MAGIC );
         HDassert( struct_ptr->aio_sync_q_tail->next == NULL );
 
         struct_ptr->aio_sync_q_tail->next = entry_ptr;
@@ -4300,18 +4300,18 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__sync_q__append() */
+} /* H5C_jb_aio__sync_q__append() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__sync_q__append()
+ * Function:		H5C_jb_aio__sync_q__append()
  *
- * Purpose:		Append an instance of H5C2_jbrb_sync_q_entry_t to
+ * Purpose:		Append an instance of H5C_jbrb_sync_q_entry_t to
  *			the sync queue.
  *
  *			Verify that AIO is enabled, and that the supplied
- *			instance of H5C2_jbrb_sync_q_entry_t has the correct
+ *			instance of H5C_jbrb_sync_q_entry_t has the correct
  *			magic value.  Then append to the end of the sync 
  *			queue.
  *							JRM -- 2/9/10
@@ -4322,15 +4322,15 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_aio__sync_q__discard_head(H5C2_jbrb_t * struct_ptr)
+H5C_jb_aio__sync_q__discard_head(H5C_jbrb_t * struct_ptr)
 {
     herr_t ret_value = SUCCEED;
-    struct H5C2_jbrb_sync_q_entry_t * head_ptr = NULL;
+    struct H5C_jbrb_sync_q_entry_t * head_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__sync_q__discard_head, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__sync_q__discard_head, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->use_aio );
     HDassert( struct_ptr->use_aio_fsync );
 
@@ -4345,7 +4345,7 @@ H5C2_jb_aio__sync_q__discard_head(H5C2_jbrb_t * struct_ptr)
 
     head_ptr = struct_ptr->aio_sync_q_head;
     HDassert( head_ptr != NULL );
-    HDassert( head_ptr->magic == H5C2__H5C2_JBRB_SYNC_Q_T_MAGIC );
+    HDassert( head_ptr->magic == H5C__H5C_JBRB_SYNC_Q_T_MAGIC );
 
     /* unlink *head_ptr from the queue */
 
@@ -4368,7 +4368,7 @@ H5C2_jb_aio__sync_q__discard_head(H5C2_jbrb_t * struct_ptr)
         HDassert( struct_ptr->aio_sync_q_tail != NULL );
         HDassert( struct_ptr->aio_sync_q_tail != head_ptr );
         HDassert( head_ptr->next != NULL );
-        HDassert( head_ptr->next->magic == H5C2__H5C2_JBRB_SYNC_Q_T_MAGIC );
+        HDassert( head_ptr->next->magic == H5C__H5C_JBRB_SYNC_Q_T_MAGIC );
         HDassert( struct_ptr->aio_sync_q_tail->next == NULL );
 
         struct_ptr->aio_sync_q_head = head_ptr->next;
@@ -4379,7 +4379,7 @@ H5C2_jb_aio__sync_q__discard_head(H5C2_jbrb_t * struct_ptr)
     /* and then discard it */
 
     head_ptr->magic = 0;
-    head_ptr = (struct H5C2_jbrb_sync_q_entry_t *)H5MM_xfree(head_ptr);
+    head_ptr = (struct H5C_jbrb_sync_q_entry_t *)H5MM_xfree(head_ptr);
 
     if ( head_ptr != NULL ) {
 
@@ -4391,12 +4391,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__sync_q__discard_head() */
+} /* H5C_jb_aio__sync_q__discard_head() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__test_buffer_write_complete()
+ * Function:		H5C_jb_aio__test_buffer_write_complete()
  *
  * Programmer:		John Mainzer
  *
@@ -4418,7 +4418,7 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_aio__test_buffer_write_complete(H5C2_jbrb_t * struct_ptr,
+H5C_jb_aio__test_buffer_write_complete(H5C_jbrb_t * struct_ptr,
 				        int buf_num,
                                         hbool_t *complete_ptr)
 {
@@ -4426,10 +4426,10 @@ H5C2_jb_aio__test_buffer_write_complete(H5C2_jbrb_t * struct_ptr,
     herr_t ret_value = SUCCEED;
     struct aiocb * aiocb_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__test_buffer_write_complete, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__test_buffer_write_complete, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->buf_size > 0 );
     HDassert( struct_ptr->journal_file_fd >= 0 );
     HDassert( struct_ptr->use_aio );
@@ -4488,19 +4488,19 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__test_buffer_write_complete() */
+} /* H5C_jb_aio__test_buffer_write_complete() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__test_next_async_fsync_complete()
+ * Function:		H5C_jb_aio__test_next_async_fsync_complete()
  *
  * Purpose:		Test to see if the asynchronous fsync at the head
  *			of the sync queue is complete.  
  *
  *			If it is, finish up the call to aio_fsync(), update 
  *			last_trans_on_disk, remove the associated instance of 
- *			H5C2_jbrb_sync_q_entry_t from the sync queue, set
+ *			H5C_jbrb_sync_q_entry_t from the sync queue, set
  *			*sync_complete_ptr to TRUE, and return.
  *
  *			If it isn't, set *sync_complete_ptr to FALSE, and 
@@ -4516,21 +4516,21 @@ done:
  *
  ******************************************************************************/
 
-#define H5C2_JB_AIO__TEST_NEXT_ASYNC_FSYNC_COMPLETE__DEBUG 0
+#define H5C_JB_AIO__TEST_NEXT_ASYNC_FSYNC_COMPLETE__DEBUG 0
 
 static herr_t 
-H5C2_jb_aio__test_next_async_fsync_complete(H5C2_jbrb_t * struct_ptr,
+H5C_jb_aio__test_next_async_fsync_complete(H5C_jbrb_t * struct_ptr,
                                             hbool_t *sync_complete_ptr)
 {
     int result;
     herr_t ret_value = SUCCEED;
-    struct H5C2_jbrb_sync_q_entry_t * head_ptr = NULL;
+    struct H5C_jbrb_sync_q_entry_t * head_ptr = NULL;
     struct aiocb * aiocb_ptr = NULL;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__test_next_async_fsync_complete, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__test_next_async_fsync_complete, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->use_aio );
     HDassert( struct_ptr->use_aio_fsync );
     HDassert( struct_ptr->aio_sync_q_len > 0 );
@@ -4539,7 +4539,7 @@ H5C2_jb_aio__test_next_async_fsync_complete(H5C2_jbrb_t * struct_ptr,
     head_ptr = struct_ptr->aio_sync_q_head;
 
     HDassert( head_ptr != NULL );
-    HDassert( head_ptr->magic == H5C2__H5C2_JBRB_SYNC_Q_T_MAGIC );
+    HDassert( head_ptr->magic == H5C__H5C_JBRB_SYNC_Q_T_MAGIC );
 
     aiocb_ptr = &(head_ptr->ctl_blk);
 
@@ -4575,35 +4575,35 @@ H5C2_jb_aio__test_next_async_fsync_complete(H5C2_jbrb_t * struct_ptr,
          * TRUE.
          */
 
-#if H5C2_JB_AIO__TEST_NEXT_ASYNC_FSYNC_COMPLETE__DEBUG 
+#if H5C_JB_AIO__TEST_NEXT_ASYNC_FSYNC_COMPLETE__DEBUG 
     HDfprintf(stdout, "%s: ltod/ltw/ltis = %lld/%lld/%lld.\n",
               FUNC, 
               (long long)(struct_ptr->last_trans_on_disk), 
               (long long)(struct_ptr->last_trans_written), 
               (long long)(head_ptr->last_trans_in_sync));
-#endif /* H5C2_JB_AIO__TEST_NEXT_ASYNC_FSYNC_COMPLETE__DEBUG */
+#endif /* H5C_JB_AIO__TEST_NEXT_ASYNC_FSYNC_COMPLETE__DEBUG */
         
         HDassert( (uint64_t)(struct_ptr->last_trans_on_disk) <= 
                       (uint64_t)(head_ptr->last_trans_in_sync) );
         HDassert( (uint64_t)(head_ptr->last_trans_in_sync) <= 
                       (uint64_t)(struct_ptr->last_trans_written) );
 
-#if H5C2_JB_AIO__TEST_NEXT_ASYNC_FSYNC_COMPLETE__DEBUG 
+#if H5C_JB_AIO__TEST_NEXT_ASYNC_FSYNC_COMPLETE__DEBUG 
     HDfprintf(stdout, "%s: changing last trans on disk from %lld to %lld.\n",
               FUNC, struct_ptr->last_trans_on_disk, 
               head_ptr->last_trans_in_sync);
-#endif /* H5C2_JB_AIO__TEST_NEXT_ASYNC_FSYNC_COMPLETE__DEBUG */
+#endif /* H5C_JB_AIO__TEST_NEXT_ASYNC_FSYNC_COMPLETE__DEBUG */
 
-        H5C2__JBRB__UPDATE_STATS_FOR_ASYNC_SYNC_COMPLETED(struct_ptr, FALSE)
+        H5C__JBRB__UPDATE_STATS_FOR_ASYNC_SYNC_COMPLETED(struct_ptr, FALSE)
 
         aiocb_ptr->aio_fildes = -1;
 
         struct_ptr->last_trans_on_disk = head_ptr->last_trans_in_sync;
 
-        if ( H5C2_jb_aio__sync_q__discard_head(struct_ptr) != SUCCEED ) {
+        if ( H5C_jb_aio__sync_q__discard_head(struct_ptr) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C2_jb_aio__sync_q__discard_head() failed.")
+                        "H5C_jb_aio__sync_q__discard_head() failed.")
         }
 
         *sync_complete_ptr = TRUE;
@@ -4620,12 +4620,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__test_next_async_fsync_complete() */
+} /* H5C_jb_aio__test_next_async_fsync_complete() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_aio__write_to_buffer
+ * Function:		H5C_jb_aio__write_to_buffer
  *
  * Programmer:		John Mainzer
  *			0/09/10
@@ -4639,10 +4639,10 @@ done:
  *
  ******************************************************************************/
 
-#define H5C2_JB_AIO__WRITE_TO_BUFFER__DEBUG 0
+#define H5C_JB_AIO__WRITE_TO_BUFFER__DEBUG 0
 
 herr_t 
-H5C2_jb_aio__write_to_buffer(H5C2_jbrb_t * struct_ptr,	
+H5C_jb_aio__write_to_buffer(H5C_jbrb_t * struct_ptr,	
 			     size_t size,			
 			     const char * data,
                              hbool_t is_end_trans,
@@ -4655,11 +4655,11 @@ H5C2_jb_aio__write_to_buffer(H5C2_jbrb_t * struct_ptr,
     const char * data_remaining;
     uint64_t last_trans_in_ring_buffer;
 	
-    FUNC_ENTER_NOAPI(H5C2_jb_aio__write_to_buffer, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_aio__write_to_buffer, FAIL)
 
     /* Check Arguments */
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->use_aio == TRUE );
     HDassert( size > 0 );
     HDassert( data != 0 );
@@ -4691,25 +4691,25 @@ H5C2_jb_aio__write_to_buffer(H5C2_jbrb_t * struct_ptr,
      * struct_ptr->cur_buf_free_space will always be greater 
      * than zero if there is any space in the ring buffer,
      * it is sufficient to check that value and call 
-     * H5C2_jb_aio__make_space_in_ring_buffer() if it is zero.
+     * H5C_jb_aio__make_space_in_ring_buffer() if it is zero.
      */
     if ( struct_ptr->cur_buf_free_space <= 0 ) {
 
         HDassert( struct_ptr->bufs_in_use == struct_ptr->num_bufs );
         HDassert( struct_ptr->writes_in_progress == struct_ptr->bufs_in_use );
 
-        result = H5C2_jb_aio__make_space_in_ring_buffer(struct_ptr);
+        result = H5C_jb_aio__make_space_in_ring_buffer(struct_ptr);
 
         if ( result != SUCCEED ) {
 
-#if H5C2_JB_AIO__WRITE_TO_BUFFER__DEBUG
+#if H5C_JB_AIO__WRITE_TO_BUFFER__DEBUG
             HDfprintf(stdout, 
-		      "%s: H5C2_jb_aio__make_space_in_ring_buffer(1) failed.\n",
+		      "%s: H5C_jb_aio__make_space_in_ring_buffer(1) failed.\n",
                       FUNC);
-#endif /* H5C2_JB_AIO__WRITE_TO_BUFFER__DEBUG */
+#endif /* H5C_JB_AIO__WRITE_TO_BUFFER__DEBUG */
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C2_jb_aio__make_space_in_ring_buffer(1) failed.")
+                        "H5C_jb_aio__make_space_in_ring_buffer(1) failed.")
         }
 
         just_called_make_space_in_ring_buffer = TRUE;
@@ -4749,30 +4749,30 @@ H5C2_jb_aio__write_to_buffer(H5C2_jbrb_t * struct_ptr,
 
             (*struct_ptr->trans_tracking)[struct_ptr->put] = trans_num;
 
-#if H5C2_JB_AIO__WRITE_TO_BUFFER__DEBUG
+#if H5C_JB_AIO__WRITE_TO_BUFFER__DEBUG
 	    HDfprintf(stdout, "%s: set trans_tracking[%d] to %lld (1).\n",
                       FUNC, struct_ptr->put, trans_num);
-#endif /* H5C2_JB_AIO__WRITE_TO_BUFFER__DEBUG */
+#endif /* H5C_JB_AIO__WRITE_TO_BUFFER__DEBUG */
         }
 
         HDassert( struct_ptr->bufs_in_use == 
                   (struct_ptr->writes_in_progress + 1 ) );
      
         /* kick off an asynchronous write of the current buffer */
-	result = H5C2_jb_aio__queue_buffer_write(struct_ptr,
+	result = H5C_jb_aio__queue_buffer_write(struct_ptr,
 				                 struct_ptr->put,
                                                  FALSE);
 
         if ( result != SUCCEED ) {
 
-#if H5C2_JB_AIO__WRITE_TO_BUFFER__DEBUG
+#if H5C_JB_AIO__WRITE_TO_BUFFER__DEBUG
             HDfprintf(stdout, 
-		      "%s: H5C2_jb_aio__queue_buffer_write() failed.\n",
+		      "%s: H5C_jb_aio__queue_buffer_write() failed.\n",
                       FUNC);
-#endif /* H5C2_JB_AIO__WRITE_TO_BUFFER__DEBUG */
+#endif /* H5C_JB_AIO__WRITE_TO_BUFFER__DEBUG */
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-			"H5C2_jb_aio__queue_buffer_write() failed.");
+			"H5C_jb_aio__queue_buffer_write() failed.");
         }
 
         just_called_make_space_in_ring_buffer = FALSE;
@@ -4780,10 +4780,10 @@ H5C2_jb_aio__write_to_buffer(H5C2_jbrb_t * struct_ptr,
         HDassert( struct_ptr->bufs_in_use == struct_ptr->writes_in_progress );
 
         /* if there is another free buffer, call 
-         * H5C2_jb_aio__prep_next_buf_for_use().
+         * H5C_jb_aio__prep_next_buf_for_use().
          *
          * otherwise, if we still have data to write, call 
-         * H5C2_jb_aio__make_space_in_ring_buffer() to free up 
+         * H5C_jb_aio__make_space_in_ring_buffer() to free up 
          * space to continue the write.
          */
         if ( struct_ptr->bufs_in_use < struct_ptr->num_bufs ) {
@@ -4791,39 +4791,39 @@ H5C2_jb_aio__write_to_buffer(H5C2_jbrb_t * struct_ptr,
             last_trans_in_ring_buffer = 
 		(*struct_ptr->trans_tracking)[struct_ptr->put];
 
-#if H5C2_JB_AIO__WRITE_TO_BUFFER__DEBUG
+#if H5C_JB_AIO__WRITE_TO_BUFFER__DEBUG
 	    HDfprintf(stdout, "%s: set trans_tracking[%d] to %lld (2).\n",
                       FUNC, struct_ptr->put, trans_num);
-#endif /* H5C2_JB_AIO__WRITE_TO_BUFFER__DEBUG */
+#endif /* H5C_JB_AIO__WRITE_TO_BUFFER__DEBUG */
 
-            result = H5C2_jb_aio__prep_next_buf_for_use(struct_ptr,
+            result = H5C_jb_aio__prep_next_buf_for_use(struct_ptr,
 						last_trans_in_ring_buffer);
 
             if ( result != SUCCEED ) {
 
-#if H5C2_JB_AIO__WRITE_TO_BUFFER__DEBUG
+#if H5C_JB_AIO__WRITE_TO_BUFFER__DEBUG
             HDfprintf(stdout, 
-		      "%s: H5C2_jb_aio__prep_next_buf_for_use() failed.\n",
+		      "%s: H5C_jb_aio__prep_next_buf_for_use() failed.\n",
                       FUNC);
-#endif /* H5C2_JB_AIO__WRITE_TO_BUFFER__DEBUG */
+#endif /* H5C_JB_AIO__WRITE_TO_BUFFER__DEBUG */
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                            "H5C2_jb_aio__prep_next_buf_for_use() failed.")
+                            "H5C_jb_aio__prep_next_buf_for_use() failed.")
             }
         } else if ( size_remaining > 0 ) { 
 
-            result = H5C2_jb_aio__make_space_in_ring_buffer(struct_ptr);
+            result = H5C_jb_aio__make_space_in_ring_buffer(struct_ptr);
 
             if ( result != SUCCEED ) {
 
-#if H5C2_JB_AIO__WRITE_TO_BUFFER__DEBUG
+#if H5C_JB_AIO__WRITE_TO_BUFFER__DEBUG
                 HDfprintf(stdout, 
-		       "%s: H5C2_jb_aio__make_space_in_ring_buffer() failed.\n",
+		       "%s: H5C_jb_aio__make_space_in_ring_buffer() failed.\n",
                        FUNC);
-#endif /* H5C2_JB_AIO__WRITE_TO_BUFFER__DEBUG */
+#endif /* H5C_JB_AIO__WRITE_TO_BUFFER__DEBUG */
 
                 HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                           "H5C2_jb_aio__make_space_in_ring_buffer(2) failed.")
+                           "H5C_jb_aio__make_space_in_ring_buffer(2) failed.")
             }
             just_called_make_space_in_ring_buffer = TRUE;
         } 
@@ -4863,10 +4863,10 @@ H5C2_jb_aio__write_to_buffer(H5C2_jbrb_t * struct_ptr,
 
             (*struct_ptr->trans_tracking)[struct_ptr->put] = trans_num;
 
-#if H5C2_JB_AIO__WRITE_TO_BUFFER__DEBUG
+#if H5C_JB_AIO__WRITE_TO_BUFFER__DEBUG
 	    HDfprintf(stdout, "%s: set trans_tracking[%d] to %lld (3).\n",
                       FUNC, struct_ptr->put, trans_num);
-#endif /* H5C2_JB_AIO__WRITE_TO_BUFFER__DEBUG */
+#endif /* H5C_JB_AIO__WRITE_TO_BUFFER__DEBUG */
         }
     }
 
@@ -4896,13 +4896,13 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_aio__write_to_buffer */
+} /* H5C_jb_aio__write_to_buffer */
 
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_bjf__comment
+ * Function:		H5C_jb_bjf__comment
  *
  * Programmer:		John Mainzer
  *
@@ -4916,16 +4916,16 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_bjf__comment(H5C2_jbrb_t * struct_ptr,
+H5C_jb_bjf__comment(H5C_jbrb_t * struct_ptr,
                      const char * comment_ptr)
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_bjf__comment, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_bjf__comment, FAIL)
 	
     /* Check Arguments */
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( comment_ptr != NULL );
 
     /* the following really should be an assert, but the FUNC ENTER/LEAVE
@@ -4942,12 +4942,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_bjf__comment() */
+} /* H5C_jb_bjf__comment() */
 
 
 /*****************************************************************************
  *
- * Function:		H5C2_jb_bjf__end_transaction
+ * Function:		H5C_jb_bjf__end_transaction
  *
  * Programmer:		John Mainzer
  *
@@ -4968,16 +4968,16 @@ done:
  *****************************************************************************/
 
 static herr_t
-H5C2_jb_bjf__end_transaction(H5C2_jbrb_t * struct_ptr,
+H5C_jb_bjf__end_transaction(H5C_jbrb_t * struct_ptr,
 			     uint64_t trans_num)
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_bjf__end_transaction, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_bjf__end_transaction, FAIL)
 
     /* Check Arguments */
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->human_readable == FALSE );
 	
     /* Verify that the supplied transaction is in progress */
@@ -4998,15 +4998,15 @@ H5C2_jb_bjf__end_transaction(H5C2_jbrb_t * struct_ptr,
     } /* end if */
 
     /* Write end transaction message */
-    H5C2_JB_BJF__WRITE_SIG_AND_VER(struct_ptr,               \
-                                   H5C2_BJNL__END_TRANS_SIG, \
-                                   H5C2_BJNL__END_TRANS_VER, \
+    H5C_JB_BJF__WRITE_SIG_AND_VER(struct_ptr,               \
+                                   H5C_BJNL__END_TRANS_SIG, \
+                                   H5C_BJNL__END_TRANS_VER, \
                                    /* keep_chksum */ FALSE,  \
                                    /* is_end_trans */ FALSE, \
                                    trans_num,                \
                                    /* fail_return */ FAIL)
 
-    H5C2_JB_BJF__WRITE_TRANS_NUM(struct_ptr,                 \
+    H5C_JB_BJF__WRITE_TRANS_NUM(struct_ptr,                 \
                                  /* is_end_trans */ TRUE,    \
                                  trans_num,                  \
                                  /* fail_return */ FAIL)
@@ -5023,12 +5023,12 @@ done:
 	
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb_bjf__end_transaction */
+} /* end H5C_jb_bjf__end_transaction */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_bjf__eoa
+ * Function:		H5C_jb_bjf__eoa
  *
  * Programmer:		John Mainzer
  *
@@ -5037,7 +5037,7 @@ done:
  *
  *			Note that EOA messages are not generated by the 
  *			metadata cache, and thus are not associated with 
- *			transactions.  Since H5C2_jb__write_to_buffer()
+ *			transactions.  Since H5C_jb__write_to_buffer()
  *			expects a transaction number, we use 
  *			struct_ptr->cur_trans and pass is_end_trans
  *			as FALSE.  However, this is just a cluge to 
@@ -5050,15 +5050,15 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_bjf__eoa(H5C2_jbrb_t * struct_ptr,
+H5C_jb_bjf__eoa(H5C_jbrb_t * struct_ptr,
 		 haddr_t eoa)
 {
     herr_t ret_value = SUCCEED;
-    FUNC_ENTER_NOAPI(H5C2_jb_bjf__eoa, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_bjf__eoa, FAIL)
 	
     /* Check Arguments */
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->human_readable == FALSE );
     HDassert( struct_ptr->hdf5_file_name != NULL );
 
@@ -5067,30 +5067,30 @@ H5C2_jb_bjf__eoa(H5C2_jbrb_t * struct_ptr,
      */
     if ( struct_ptr->header_present == FALSE ) {
 
-        if ( H5C2_jb__write_header_entry(struct_ptr) != SUCCEED ) {
+        if ( H5C_jb__write_header_entry(struct_ptr) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb__write_header_entry() failed.\n")
+                        "H5C_jb__write_header_entry() failed.\n")
         }
     } /* end if */
 
     /* Note that EOA messages are not generated by the metadata cache, and 
      * thus are not associated with transactions.  Since 
-     * H5C2_jb__write_to_buffer() expects a transaction number, we use 
+     * H5C_jb__write_to_buffer() expects a transaction number, we use 
      * struct_ptr->cur_trans and pass is_end_trans as FALSE.  However, 
      * this is just a cluge to keep pre-existing code happy.
      */
 
     /* Write EOA message */
-    H5C2_JB_BJF__WRITE_SIG_AND_VER(struct_ptr,                    \
-                                   H5C2_BJNL__END_ADDR_SPACE_SIG, \
-                                   H5C2_BJNL__END_ADDR_SPACE_VER, \
+    H5C_JB_BJF__WRITE_SIG_AND_VER(struct_ptr,                    \
+                                   H5C_BJNL__END_ADDR_SPACE_SIG, \
+                                   H5C_BJNL__END_ADDR_SPACE_VER, \
                                    /* keep_chksum */ FALSE,       \
                                    /* is_end_trans */ FALSE,      \
                                    struct_ptr->cur_trans,         \
                                    /* fail_return */ FAIL)
 
-    H5C2_JB_BJF__WRITE_OFFSET(struct_ptr,               \
+    H5C_JB_BJF__WRITE_OFFSET(struct_ptr,               \
                               eoa,                      \
                               /* is_end_trans */ FALSE, \
                               struct_ptr->cur_trans,    \
@@ -5100,12 +5100,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb_bjf__eoa */
+} /* end H5C_jb_bjf__eoa */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_bjf__journal_entry
+ * Function:		H5C_jb_bjf__journal_entry
  *
  * Programmer:		John Mainzer
  *
@@ -5117,7 +5117,7 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_bjf__journal_entry(H5C2_jbrb_t * struct_ptr,
+H5C_jb_bjf__journal_entry(H5C_jbrb_t * struct_ptr,
 			   uint64_t trans_num,
 			   haddr_t base_addr,
 			   size_t length,
@@ -5125,11 +5125,11 @@ H5C2_jb_bjf__journal_entry(H5C2_jbrb_t * struct_ptr,
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_bjf__journal_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_bjf__journal_entry, FAIL)
 
     /* Check Arguments */
     HDassert(struct_ptr);
-    HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
+    HDassert(struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC);
     HDassert(struct_ptr->human_readable == FALSE );
 
     /* Verify that the supplied transaction is in progress */
@@ -5140,39 +5140,39 @@ H5C2_jb_bjf__journal_entry(H5C2_jbrb_t * struct_ptr,
                     "Transaction not in progress or bad transaction number.")
     } /* end if */
 
-    H5C2_JB_BJF__WRITE_SIG_AND_VER(struct_ptr,                   \
-                                   H5C2_BJNL__JOURNAL_ENTRY_SIG, \
-                                   H5C2_BJNL__JOURNAL_ENTRY_VER, \
+    H5C_JB_BJF__WRITE_SIG_AND_VER(struct_ptr,                   \
+                                   H5C_BJNL__JOURNAL_ENTRY_SIG, \
+                                   H5C_BJNL__JOURNAL_ENTRY_VER, \
                                    /* keep_chksum */ TRUE,       \
                                    /* is_end_trans */ FALSE,     \
                                    trans_num,                    \
                                    /* fail_return */ FAIL)
 
-    H5C2_JB_BJF__WRITE_TRANS_NUM(struct_ptr,                     \
+    H5C_JB_BJF__WRITE_TRANS_NUM(struct_ptr,                     \
                                  /* is_end_trans */ FALSE,       \
                                  trans_num,                      \
                                  /* fail_return */ FAIL)
 
-    H5C2_JB_BJF__WRITE_OFFSET(struct_ptr,                        \
+    H5C_JB_BJF__WRITE_OFFSET(struct_ptr,                        \
                               base_addr,                         \
                               /* is_end_trans */ FALSE,          \
                               trans_num,                         \
                               /* fail_return */ FAIL)
 
-    H5C2_JB_BJF__WRITE_LENGTH(struct_ptr,                        \
+    H5C_JB_BJF__WRITE_LENGTH(struct_ptr,                        \
                               length,                            \
                               /* is_end_trans */ FALSE,          \
                               trans_num,                         \
                               /* fail_return */ FAIL)
 
-    H5C2_JB_BJF__WRITE_BUFFER(struct_ptr,                        \
+    H5C_JB_BJF__WRITE_BUFFER(struct_ptr,                        \
                               /* buf_size */ length,             \
                               /* buf_ptr */ (const char *)body,  \
                               /* is_end_trans */ FALSE,          \
                               trans_num,                         \
                               /* fail_return */ FAIL)
 
-    H5C2_jb_BJF__WRITE_CHKSUM(struct_ptr,                        \
+    H5C_jb_BJF__WRITE_CHKSUM(struct_ptr,                        \
                               /* is_end_trans */ FALSE,          \
                               trans_num,                         \
                               /* fail_return */ FAIL)
@@ -5187,12 +5187,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_bjf__journal_entry() */
+} /* H5C_jb_bjf__journal_entry() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_bjf__start_transaction
+ * Function:		H5C_jb_bjf__start_transaction
  *
  * Programmer:		John Mainzer
  *
@@ -5209,17 +5209,17 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_bjf__start_transaction(H5C2_jbrb_t * struct_ptr,
+H5C_jb_bjf__start_transaction(H5C_jbrb_t * struct_ptr,
 			       uint64_t trans_num)
 
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_bjf__start_transaction, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_bjf__start_transaction, FAIL)
 
     /* Check Arguments */
     HDassert(struct_ptr);
-    HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
+    HDassert(struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC);
     HDassert(struct_ptr->human_readable == FALSE );
 	
     /* Verify that there is no transaction in progress */
@@ -5241,25 +5241,25 @@ H5C2_jb_bjf__start_transaction(H5C2_jbrb_t * struct_ptr,
      */
     if ( struct_ptr->header_present == FALSE ) {
 
-        if ( H5C2_jb__write_header_entry(struct_ptr) != SUCCEED ) {
+        if ( H5C_jb__write_header_entry(struct_ptr) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb__write_header_entry() failed.\n")
+                        "H5C_jb__write_header_entry() failed.\n")
         }
 
     } /* end if */
 
 
     /* Write start transaction message */
-    H5C2_JB_BJF__WRITE_SIG_AND_VER(struct_ptr,                 \
-                                   H5C2_BJNL__BEGIN_TRANS_SIG, \
-                                   H5C2_BJNL__BEGIN_TRANS_VER, \
+    H5C_JB_BJF__WRITE_SIG_AND_VER(struct_ptr,                 \
+                                   H5C_BJNL__BEGIN_TRANS_SIG, \
+                                   H5C_BJNL__BEGIN_TRANS_VER, \
                                    /* keep_chksum */ FALSE,    \
                                    /* is_end_trans */ FALSE,   \
                                    trans_num,                  \
                                    /* fail_return */ FAIL)
 
-    H5C2_JB_BJF__WRITE_TRANS_NUM(struct_ptr,                   \
+    H5C_JB_BJF__WRITE_TRANS_NUM(struct_ptr,                   \
                                  /* is_end_trans */ FALSE,     \
                                  trans_num,                    \
                                  /* fail_return */ FAIL)
@@ -5272,12 +5272,12 @@ done:
 	
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb_bjf__start_transaction */
+} /* end H5C_jb_bjf__start_transaction */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_bjf__write_buf
+ * Function:		H5C_jb_bjf__write_buf
  *
  * Programmer:		John Mainzer
  *			4/24/09
@@ -5292,7 +5292,7 @@ done:
  *
  *			If the supplied buffer will cross ring buffer buffer 
  *			boundaries, for now just call 
- *			H5C2_jb__write_to_buffer().
+ *			H5C_jb__write_to_buffer().
  *
  *			In either case, if struct_ptr->chksum_cur_msg is TRUE,
  *			update struct_ptr->msg_chksum.
@@ -5311,7 +5311,7 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_bjf__write_buffer(H5C2_jbrb_t * struct_ptr,
+H5C_jb_bjf__write_buffer(H5C_jbrb_t * struct_ptr,
                           size_t buf_size,
                           const char * buf_ptr,
                           hbool_t is_end_trans,
@@ -5319,10 +5319,10 @@ H5C2_jb_bjf__write_buffer(H5C2_jbrb_t * struct_ptr,
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_jb_bjf__write_buffer, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_bjf__write_buffer, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( buf_size > 0 );
     HDassert( buf_ptr != NULL );
     HDassert( trans_num > 0 ); 
@@ -5427,15 +5427,15 @@ H5C2_jb_bjf__write_buffer(H5C2_jbrb_t * struct_ptr,
 
         /* Here, handle the case where the write will reach the edge
          * of a ring buffer buffer.  This gets a bit more complex, so 
-         * for now at least, we will call H5C2_jb__write_to_buffer().  
+         * for now at least, we will call H5C_jb__write_to_buffer().  
          * If this proves too costly, further optimizations will be necessary.
          */
 
-        if ( H5C2_jb__write_to_buffer(struct_ptr, buf_size, buf_ptr,
+        if ( H5C_jb__write_to_buffer(struct_ptr, buf_size, buf_ptr,
                                       is_end_trans, trans_num) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb__write_to_buffer() failed.")
+                        "H5C_jb__write_to_buffer() failed.")
         }
     }
 
@@ -5466,12 +5466,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_bjf__write_buffer() */
+} /* H5C_jb_bjf__write_buffer() */
  
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_bjf__write_chksum
+ * Function:		H5C_jb_bjf__write_chksum
  *
  * Programmer:		John Mainzer
  *			4/24/09
@@ -5487,7 +5487,7 @@ done:
  *			fields accordingly.  
  *
  *			If the chksum will cross ring buffer buffer boundaries, 
- *			for now just call H5C2_jb__write_to_buffer().
+ *			for now just call H5C_jb__write_to_buffer().
  *
  *			Note that this function will probably prove to be
  *			a hot spot in profiling, so we should more or less
@@ -5499,18 +5499,18 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr, 
+H5C_jb_bjf__write_chksum(H5C_jbrb_t * struct_ptr, 
                           hbool_t is_end_trans,
                           uint64_t trans_num)
 {
     uint8_t *p;
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_jb_bjf__write_chksum, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_bjf__write_chksum, FAIL)
 
     /* Sanity check */
     HDassert(struct_ptr != NULL);
-    HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
+    HDassert(struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC);
     HDassert(trans_num > 0); 
 
     if ( ! struct_ptr->chksum_cur_msg ) {
@@ -5519,7 +5519,7 @@ H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr,
                     "struct_ptr->chksum_cur_msg is false?!?!.")
     }
 
-    if ( H5C2__CHECKSUM_SIZE < struct_ptr->cur_buf_free_space ) {
+    if ( H5C__CHECKSUM_SIZE < struct_ptr->cur_buf_free_space ) {
 
         /* If the checksum will fit in the current buffer with space
          * left over, just write it directly into the buffer, and 
@@ -5536,7 +5536,7 @@ H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr,
 
         UINT32ENCODE(p, struct_ptr->msg_chksum);
 
-        HDassert( p == ((uint8_t *)(struct_ptr->head + H5C2__CHECKSUM_SIZE)) );
+        HDassert( p == ((uint8_t *)(struct_ptr->head + H5C__CHECKSUM_SIZE)) );
 
         /* increment bufs_in_use as necessary -- do this differently
          * for aio and sio.
@@ -5556,19 +5556,19 @@ H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr,
         }
 
         /* update head pointer */
-        struct_ptr->head = &(struct_ptr->head[H5C2__CHECKSUM_SIZE]);
+        struct_ptr->head = &(struct_ptr->head[H5C__CHECKSUM_SIZE]);
 
         /* update current buffer usage */
-        struct_ptr->cur_buf_free_space -= H5C2__CHECKSUM_SIZE;
+        struct_ptr->cur_buf_free_space -= H5C__CHECKSUM_SIZE;
 
         /* update fields used only with SIO: */
         if( ! struct_ptr->use_aio ) {
 
             /* update rb_free_space */
-            struct_ptr->rb_free_space -= H5C2__CHECKSUM_SIZE;
+            struct_ptr->rb_free_space -= H5C__CHECKSUM_SIZE;
 
             /* update end of buffer space */
-            struct_ptr->rb_space_to_rollover -= H5C2__CHECKSUM_SIZE;
+            struct_ptr->rb_space_to_rollover -= H5C__CHECKSUM_SIZE;
         }
 
         if(is_end_trans)
@@ -5579,27 +5579,27 @@ H5C2_jb_bjf__write_chksum(H5C2_jbrb_t * struct_ptr,
     } /* end if */
     else {
 
-        uint8_t buf[H5C2__CHECKSUM_SIZE + 1];
+        uint8_t buf[H5C__CHECKSUM_SIZE + 1];
 
         /* Here, handle the case where the write will reach the edge
          * of a buffer.  This gets a bit more complex, so for now at 
          * least, we will construct a buffer containing a binary 
          * representation of the checksum, and then call 
-         * H5C2_jb__write_to_buffer().  If this proves too costly, 
+         * H5C_jb__write_to_buffer().  If this proves too costly, 
          * further optimizations will be necessary.
          */
         p = buf;
         UINT32ENCODE(p, struct_ptr->msg_chksum);
-        HDassert( p == &(buf[H5C2__CHECKSUM_SIZE]) );
+        HDassert( p == &(buf[H5C__CHECKSUM_SIZE]) );
 
-        if ( H5C2_jb__write_to_buffer(struct_ptr, 
-                                      H5C2__CHECKSUM_SIZE, 
+        if ( H5C_jb__write_to_buffer(struct_ptr, 
+                                      H5C__CHECKSUM_SIZE, 
                                       (const char *)buf, 
                                       is_end_trans, 
                                       trans_num) < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb__write_to_buffer() failed.")
+                        "H5C_jb__write_to_buffer() failed.")
         }
     } /* end else */
 
@@ -5611,12 +5611,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_bjf__write_chksum() */
+} /* H5C_jb_bjf__write_chksum() */
  
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_bjf__write_length
+ * Function:		H5C_jb_bjf__write_length
  *
  * Programmer:		John Mainzer
  *			4/24/09
@@ -5632,7 +5632,7 @@ done:
  *			If the binary representation of the length will 
  *			touch buffer boundaries, create a buffer containing
  *			the binary representation of the length, and then
- *			call H5C2_jb__write_to_buffer() to handle the write.
+ *			call H5C_jb__write_to_buffer() to handle the write.
  *
  *			In either case, if struct_ptr->chksum_cur_msg is TRUE,
  *			update struct_ptr->msg_chksum.
@@ -5649,7 +5649,7 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr,
+H5C_jb_bjf__write_length(H5C_jbrb_t * struct_ptr,
                           size_t length,
                           hbool_t is_end_trans,
                           uint64_t trans_num)
@@ -5658,10 +5658,10 @@ H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr,
     uint8_t * p;
     size_t length_width;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_bjf__write_length, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_bjf__write_length, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( trans_num > 0 ); 
 
     /* is_end_trans must be FALSE if struct_ptr->chksum_cur_msg is TRUE.
@@ -5772,7 +5772,7 @@ H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr,
          * of a buffer.  This gets a bit more complex, so for now at 
          * least, we will construct a buffer containing a binary 
          * representation of the offset, and then call 
-         * H5C2_jb__write_to_buffer().  If this proves too costly, 
+         * H5C_jb__write_to_buffer().  If this proves too costly, 
          * further optimizations will be necessary.
          */
 
@@ -5801,13 +5801,13 @@ H5C2_jb_bjf__write_length(H5C2_jbrb_t * struct_ptr,
 
         HDassert( p == &(buf[length_width]) );
 
-        if ( H5C2_jb__write_to_buffer(struct_ptr, length_width, 
+        if ( H5C_jb__write_to_buffer(struct_ptr, length_width, 
                                       (const char *)buf,
                                       is_end_trans, 
                                       trans_num) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb__write_to_buffer() failed.")
+                        "H5C_jb__write_to_buffer() failed.")
         }
 
         /* Update the check sum if required */
@@ -5824,12 +5824,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_bjf__write_length() */
+} /* H5C_jb_bjf__write_length() */
  
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_bjf__write_offset
+ * Function:		H5C_jb_bjf__write_offset
  *
  * Programmer:		John Mainzer
  *			4/24/09
@@ -5845,7 +5845,7 @@ done:
  *			If the binary representation of the offset will 
  *			touch buffer boundaries, create a buffer containing
  *			the binary representation of the offset, and then
- *			call H5C2_jb__write_to_buffer() to handle the write.
+ *			call H5C_jb__write_to_buffer() to handle the write.
  *
  *			In either case, if struct_ptr->chksum_cur_msg is TRUE,
  *			update struct_ptr->msg_chksum.
@@ -5862,7 +5862,7 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr,
+H5C_jb_bjf__write_offset(H5C_jbrb_t * struct_ptr,
                           haddr_t offset,
                           hbool_t is_end_trans,
                           uint64_t trans_num)
@@ -5871,10 +5871,10 @@ H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr,
     uint8_t * p;
     size_t offset_width;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_bjf__write_offset, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_bjf__write_offset, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     /* eoa messages can be written outside transactions -- so it is
      * possible that the trans_num will be 0.  Since the trans_num is 
      * not used unless is_end_trans is TRUE, we make an exception for
@@ -5990,7 +5990,7 @@ H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr,
          * of a buffer.  This gets a bit more complex, so for now at 
          * least, we will construct a buffer containing a binary 
          * representation of the offset, and then call 
-         * H5C2_jb__write_to_buffer().  If this proves too costly, 
+         * H5C_jb__write_to_buffer().  If this proves too costly, 
          * further optimizations will be necessary.
          */
 
@@ -6022,12 +6022,12 @@ H5C2_jb_bjf__write_offset(H5C2_jbrb_t * struct_ptr,
 
         HDassert( p == &(buf[offset_width]) );
 
-        if ( H5C2_jb__write_to_buffer(struct_ptr, offset_width, 
+        if ( H5C_jb__write_to_buffer(struct_ptr, offset_width, 
                                       (const char *)buf,
                                       is_end_trans, trans_num) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb__write_to_buffer() failed.")
+                        "H5C_jb__write_to_buffer() failed.")
         }
 
         /* Update the check sum if required */
@@ -6044,12 +6044,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_bjf__write_offset() */
+} /* H5C_jb_bjf__write_offset() */
  
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_bjf__write_sig_and_ver
+ * Function:		H5C_jb_bjf__write_sig_and_ver
  *
  * Programmer:		John Mainzer
  *			4/24/09
@@ -6065,7 +6065,7 @@ done:
  *
  *			If the signature and version will cross buffer 
  *			boundaries, for now just call 
- *			H5C2_jb__write_to_buffer().
+ *			H5C_jb__write_to_buffer().
  *
  *			In either case, if keep_chksum is TRUE, initialize
  *			struct_ptr->msg_chksum to 0, and set struct_ptr->
@@ -6088,7 +6088,7 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr, 
+H5C_jb_bjf__write_sig_and_ver(H5C_jbrb_t *struct_ptr, 
                                const char *sig_ptr,
                                const uint8_t version, 
                                hbool_t keep_chksum, 
@@ -6097,12 +6097,12 @@ H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr,
 {
     herr_t ret_value = SUCCEED;      /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_jb_bjf__write_sig_and_ver, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_bjf__write_sig_and_ver, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( sig_ptr != NULL );
-    HDassert( H5C2_BJNL__SIG_LEN == HDstrlen(sig_ptr) );
+    HDassert( H5C_BJNL__SIG_LEN == HDstrlen(sig_ptr) );
     HDassert( ! is_end_trans );
 
     /* eoa messages can occur outside of transactions -- and thus it is 
@@ -6113,7 +6113,7 @@ H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr,
      */
     HDassert((!is_end_trans) || (trans_num > 0));
 
-    if ( (H5C2_BJNL__SIG_LEN + 1) < struct_ptr->cur_buf_free_space ) {
+    if ( (H5C_BJNL__SIG_LEN + 1) < struct_ptr->cur_buf_free_space ) {
 
         /* If the signature and version will fit in the current buffer 
          * with space left over, just memcpy()/write it in and touch up 
@@ -6125,12 +6125,12 @@ H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr,
          */
 
 	/* write the signature into journal buffer */
-        HDmemcpy(struct_ptr->head, (const void *)sig_ptr, H5C2_BJNL__SIG_LEN);
+        HDmemcpy(struct_ptr->head, (const void *)sig_ptr, H5C_BJNL__SIG_LEN);
 
-        struct_ptr->head[H5C2_BJNL__SIG_LEN] = (char)version;
+        struct_ptr->head[H5C_BJNL__SIG_LEN] = (char)version;
 
         /* update head pointer */
-        struct_ptr->head = &(struct_ptr->head[H5C2_BJNL__SIG_LEN + 1]);
+        struct_ptr->head = &(struct_ptr->head[H5C_BJNL__SIG_LEN + 1]);
 
         /* increment bufs_in_use as necessary -- do this differently
          * for aio and sio.
@@ -6150,16 +6150,16 @@ H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr,
         }
 
         /* update current buffer usage */
-        struct_ptr->cur_buf_free_space -= H5C2_BJNL__SIG_LEN + 1;
+        struct_ptr->cur_buf_free_space -= H5C_BJNL__SIG_LEN + 1;
 
         /* update fields used only with SIO: */
         if( ! struct_ptr->use_aio ) {
 
             /* update rb_free_space */
-            struct_ptr->rb_free_space -= H5C2_BJNL__SIG_LEN + 1;
+            struct_ptr->rb_free_space -= H5C_BJNL__SIG_LEN + 1;
 
             /* update end of buffer space */
-            struct_ptr->rb_space_to_rollover -= H5C2_BJNL__SIG_LEN + 1;
+            struct_ptr->rb_space_to_rollover -= H5C_BJNL__SIG_LEN + 1;
         }
 
         /* is_end_trans must be false in this call, so just throw an 
@@ -6176,26 +6176,26 @@ H5C2_jb_bjf__write_sig_and_ver(H5C2_jbrb_t *struct_ptr,
     } /* end if */
     else {
 
-        uint8_t buf[H5C2_BJNL__SIG_LEN + 2];
+        uint8_t buf[H5C_BJNL__SIG_LEN + 2];
 
         /* Here, handle the case where the write will reach the edge
          * of a buffer.  This gets a bit more complex, so for now at 
-         * least, we will call H5C2_jb__write_to_buffer().  If this 
+         * least, we will call H5C_jb__write_to_buffer().  If this 
          * proves too costly, further optimizations will be necessary.
          */
 
-        HDmemcpy(buf, (const void *)sig_ptr, H5C2_BJNL__SIG_LEN);
+        HDmemcpy(buf, (const void *)sig_ptr, H5C_BJNL__SIG_LEN);
 
-        buf[H5C2_BJNL__SIG_LEN] = version;
+        buf[H5C_BJNL__SIG_LEN] = version;
 
-        if ( H5C2_jb__write_to_buffer(struct_ptr, 
-                                      H5C2_BJNL__SIG_LEN + 1, 
+        if ( H5C_jb__write_to_buffer(struct_ptr, 
+                                      H5C_BJNL__SIG_LEN + 1, 
                                       (const char *)buf, 
                                       is_end_trans, 
                                       trans_num) < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb__write_to_buffer() failed.")
+                        "H5C_jb__write_to_buffer() failed.")
         }
     } /* end else */
 
@@ -6216,12 +6216,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb_bjf__write_sig_and_ver() */
+} /* end H5C_jb_bjf__write_sig_and_ver() */
  
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_bjf__write_trans_num()
+ * Function:		H5C_jb_bjf__write_trans_num()
  *
  * Programmer:		John Mainzer
  *			4/24/09
@@ -6237,7 +6237,7 @@ done:
  *			If the transaction will cross or touch buffer 
  *			boundaries, construct binary representation of the 
  *			transaction number in a buffer, and pass it to 
- *			H5C2_jb__write_to_buffer().
+ *			H5C_jb__write_to_buffer().
  *
  *			In either case, if struct_ptr->chksum_cur_msg is TRUE,
  *			update struct_ptr->msg_chksum.
@@ -6254,17 +6254,17 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr,
+H5C_jb_bjf__write_trans_num(H5C_jbrb_t * struct_ptr,
                              hbool_t is_end_trans,
                              uint64_t trans_num)
 {
     herr_t ret_value = SUCCEED;      /* Return value */
     uint8_t * p;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_bjf__write_trans_num, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_bjf__write_trans_num, FAIL)
 
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( trans_num > 0 ); 
 
     /* is_end_trans must be FALSE if struct_ptr->chksum_cur_msg is TRUE.
@@ -6277,7 +6277,7 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr,
                    "is_end_trans and struct_ptr->chksum_cur_msg both true.")
     }
 
-    if ( H5C2__TRANS_NUM_SIZE < struct_ptr->cur_buf_free_space ) {
+    if ( H5C__TRANS_NUM_SIZE < struct_ptr->cur_buf_free_space ) {
 
         /* If the transaction number will fit in the current buffer with space
          * left over, just write it directly into the buffer, and touch up the 
@@ -6292,7 +6292,7 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr,
         p = (uint8_t *)(struct_ptr->head);
         UINT64ENCODE(p, trans_num);
 
-        HDassert( p == ((uint8_t *)(struct_ptr->head + H5C2__TRANS_NUM_SIZE)) );
+        HDassert( p == ((uint8_t *)(struct_ptr->head + H5C__TRANS_NUM_SIZE)) );
 
         /* increment bufs_in_use as necessary -- do this differently
          * for aio and sio.
@@ -6316,24 +6316,24 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr,
 
             struct_ptr->msg_chksum = 
 		H5_checksum_metadata((const void *)(struct_ptr->head), 
-                                     H5C2__TRANS_NUM_SIZE, 
+                                     H5C__TRANS_NUM_SIZE, 
                                      struct_ptr->msg_chksum);
         }
 
         /* update head pointer */
-        struct_ptr->head = &(struct_ptr->head[H5C2__TRANS_NUM_SIZE]);
+        struct_ptr->head = &(struct_ptr->head[H5C__TRANS_NUM_SIZE]);
 
         /* update current buffer usage */
-        struct_ptr->cur_buf_free_space -= H5C2__TRANS_NUM_SIZE;
+        struct_ptr->cur_buf_free_space -= H5C__TRANS_NUM_SIZE;
 
         /* update fields used only with SIO: */
         if( ! struct_ptr->use_aio ) {
 
             /* update rb_free_space */
-            struct_ptr->rb_free_space -= H5C2__TRANS_NUM_SIZE;
+            struct_ptr->rb_free_space -= H5C__TRANS_NUM_SIZE;
 
             /* update end of buffer space */
-            struct_ptr->rb_space_to_rollover -= H5C2__TRANS_NUM_SIZE;
+            struct_ptr->rb_space_to_rollover -= H5C__TRANS_NUM_SIZE;
         }
 
 
@@ -6349,26 +6349,26 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr,
         /* Here, handle the case where the write will reach the edge
          * of a buffer.  This gets a bit more complex, so for now at 
          * least, we will construct a buffer containing a binary representation
-         * of the transaction number, and then call H5C2_jb__write_to_buffer().
+         * of the transaction number, and then call H5C_jb__write_to_buffer().
          * If this proves too costly, further optimizations will be necessary.
          */
 
-        uint8_t buf[H5C2__TRANS_NUM_SIZE + 1];
+        uint8_t buf[H5C__TRANS_NUM_SIZE + 1];
 
         p = buf;
 
         UINT64ENCODE(p, trans_num);
 
-        HDassert( p == &(buf[H5C2__TRANS_NUM_SIZE]) );
+        HDassert( p == &(buf[H5C__TRANS_NUM_SIZE]) );
 
-        if ( H5C2_jb__write_to_buffer(struct_ptr, 
-                                      H5C2__TRANS_NUM_SIZE, 
+        if ( H5C_jb__write_to_buffer(struct_ptr, 
+                                      H5C__TRANS_NUM_SIZE, 
                                       (const char *)buf,
                                       is_end_trans, 
                                       trans_num) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb__write_to_buffer() failed.")
+                        "H5C_jb__write_to_buffer() failed.")
         }
 
         /* Update the check sum if required */
@@ -6376,7 +6376,7 @@ H5C2_jb_bjf__write_trans_num(H5C2_jbrb_t * struct_ptr,
 
             struct_ptr->msg_chksum = 
  			H5_checksum_metadata((const void *)(buf), 
-                                             H5C2__TRANS_NUM_SIZE, 
+                                             H5C__TRANS_NUM_SIZE, 
                                              struct_ptr->msg_chksum);
         }
 
@@ -6386,12 +6386,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_bjf__write_trans_num() */
+} /* H5C_jb_bjf__write_trans_num() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb__bin2hex
+ * Function:		H5C_jb__bin2hex
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Tuesday, March 4, 2008
@@ -6403,7 +6403,7 @@ done:
  ******************************************************************************/
 
 herr_t 
-H5C2_jb__bin2hex(const uint8_t * buf, 
+H5C_jb__bin2hex(const uint8_t * buf, 
                  char * hexdata,
                  size_t * hexlength,
                  size_t buf_size)
@@ -6413,7 +6413,7 @@ H5C2_jb__bin2hex(const uint8_t * buf,
     uint8_t        c;
     char *         t;
 	
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5C2_jb__bin2hex)
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5C_jb__bin2hex)
 
     t = hexdata;
     t[0] = ' ';
@@ -6433,12 +6433,12 @@ H5C2_jb__bin2hex(const uint8_t * buf,
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 
-} /* end H5C2_jb__bin2hex*/
+} /* end H5C_jb__bin2hex*/
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb__comment
+ * Function:		H5C_jb__comment
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Wednesday, February 6, 2008
@@ -6455,38 +6455,38 @@ H5C2_jb__bin2hex(const uint8_t * buf,
  *			by struct_ptr->human_readable.  
  *
  *			The original version of this file has been renamed
- *			to H5C2_jb_hrjf__comment().
+ *			to H5C_jb_hrjf__comment().
  *
  *							JRM -- 4/2/09
  *
  ******************************************************************************/
 
 herr_t 
-H5C2_jb__comment(H5C2_jbrb_t * struct_ptr,
+H5C_jb__comment(H5C_jbrb_t * struct_ptr,
 		 const char * comment_ptr)
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb__comment, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb__comment, FAIL)
 	
     /* Check Arguments */
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( comment_ptr != NULL );
 
     if ( struct_ptr->human_readable ) {
 
-        if ( H5C2_jb_hrjf__comment(struct_ptr, comment_ptr) != SUCCEED ) {
+        if ( H5C_jb_hrjf__comment(struct_ptr, comment_ptr) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb_hrjf__comment() failed.")
+                        "H5C_jb_hrjf__comment() failed.")
         }
     } else {
 
-        if ( H5C2_jb_bjf__comment(struct_ptr, comment_ptr) != SUCCEED ) {
+        if ( H5C_jb_bjf__comment(struct_ptr, comment_ptr) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb_bjf__comment() failed.")
+                        "H5C_jb_bjf__comment() failed.")
         }
     }
 
@@ -6494,12 +6494,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb__comment */
+} /* end H5C_jb__comment */
 
 
 /*****************************************************************************
  *
- * Function:		H5C2_jb__end_transaction
+ * Function:		H5C_jb__end_transaction
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Wednesday, February 6, 2008
@@ -6519,52 +6519,52 @@ done:
  *			by struct_ptr->human_readable.  
  *
  *			The original version of this file has been renamed
- *			to H5C2_jb_hrjf__end_transaction().
+ *			to H5C_jb_hrjf__end_transaction().
  *
  *							JRM -- 4/2/09
  *
  *****************************************************************************/
 
 herr_t
-H5C2_jb__end_transaction(H5C2_jbrb_t * struct_ptr,
+H5C_jb__end_transaction(H5C_jbrb_t * struct_ptr,
 			 uint64_t trans_num)
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb__end_transaction, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb__end_transaction, FAIL)
 
     /* Check Arguments */
     HDassert( struct_ptr );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
 
     if ( struct_ptr->human_readable ) {
 
-        if ( H5C2_jb_hrjf__end_transaction(struct_ptr, trans_num) != SUCCEED ) {
+        if ( H5C_jb_hrjf__end_transaction(struct_ptr, trans_num) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb_hrjf__end_transaction() failed.")
+                        "H5C_jb_hrjf__end_transaction() failed.")
         }
     } else {
 
-        if ( H5C2_jb_bjf__end_transaction(struct_ptr, trans_num) != SUCCEED ) {
+        if ( H5C_jb_bjf__end_transaction(struct_ptr, trans_num) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb_bjf__end_transaction() failed.")
+                        "H5C_jb_bjf__end_transaction() failed.")
         }
     }
 
-    H5C2__JBRB__UPDATE_STATS_FOR_TRANS_COMPLETED(struct_ptr);
+    H5C__JBRB__UPDATE_STATS_FOR_TRANS_COMPLETED(struct_ptr);
 	
 done:
 	
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb__end_transaction */
+} /* end H5C_jb__end_transaction */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb__eoa
+ * Function:		H5C_jb__eoa
  *
  * Programmer:		Mike McGreevy <mamcgree@hdfgroup.org>
  *			July 29, 2008
@@ -6579,38 +6579,38 @@ done:
  *			by struct_ptr->human_readable.  
  *
  *			The original version of this file has been renamed
- *			to H5C2_jb_hrjf__eoa().
+ *			to H5C_jb_hrjf__eoa().
  *
  *							JRM -- 4/2/09
  *
  ******************************************************************************/
 
 herr_t 
-H5C2_jb__eoa(H5C2_jbrb_t * struct_ptr,
+H5C_jb__eoa(H5C_jbrb_t * struct_ptr,
              haddr_t eoa)
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb__eoa, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb__eoa, FAIL)
 	
     /* Check Arguments */
     HDassert( struct_ptr );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->hdf5_file_name );
 
     if ( struct_ptr->human_readable ) {
 
-        if ( H5C2_jb_hrjf__eoa(struct_ptr, eoa) != SUCCEED ) {
+        if ( H5C_jb_hrjf__eoa(struct_ptr, eoa) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb_hrjf__eoa() failed.")
+                        "H5C_jb_hrjf__eoa() failed.")
         }
     } else {
 
-        if ( H5C2_jb_bjf__eoa(struct_ptr, eoa) != SUCCEED ) {
+        if ( H5C_jb_bjf__eoa(struct_ptr, eoa) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb_bjf__eoa() failed.")
+                        "H5C_jb_bjf__eoa() failed.")
         }
     }
 
@@ -6618,12 +6618,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb__eoa() */
+} /* H5C_jb__eoa() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb__flush
+ * Function:		H5C_jb__flush
  *
  * Programmer:		John Mainzer -- 1/14/10
  *
@@ -6635,15 +6635,15 @@ done:
  ******************************************************************************/
 
 herr_t 
-H5C2_jb__flush(H5C2_jbrb_t * struct_ptr)
+H5C_jb__flush(H5C_jbrb_t * struct_ptr)
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb__flush, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb__flush, FAIL)
 
     /* Check Arguments */
     HDassert(struct_ptr);
-    HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
+    HDassert(struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC);
 	
     /* Check if transaction is in progress */
 
@@ -6655,23 +6655,23 @@ H5C2_jb__flush(H5C2_jbrb_t * struct_ptr)
 
     if ( struct_ptr->use_aio ) {
 
-        ret_value = H5C2_jb_aio__flush(struct_ptr);
+        ret_value = H5C_jb_aio__flush(struct_ptr);
 
     } else {
 
-        ret_value = H5C2_jb_sio__flush(struct_ptr);
+        ret_value = H5C_jb_sio__flush(struct_ptr);
     }
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb__flush() */
+} /* H5C_jb__flush() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb__get_last_transaction_on_disk
+ * Function:		H5C_jb__get_last_transaction_on_disk
  *
  * Programmer:		JRM -- 1/20/10
  *
@@ -6684,39 +6684,39 @@ done:
  ******************************************************************************/
 
 herr_t 
-H5C2_jb__get_last_transaction_on_disk(H5C2_jbrb_t * struct_ptr,
+H5C_jb__get_last_transaction_on_disk(H5C_jbrb_t * struct_ptr,
 				      uint64_t * trans_num_ptr)
 {
     herr_t result;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb__get_last_transaction_on_disk, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb__get_last_transaction_on_disk, FAIL)
 	
     /* Check Arguments */
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( trans_num_ptr != NULL );
 
     if ( struct_ptr->use_aio ) {
 
-        result = H5C2_jb_aio__get_last_transaction_on_disk(struct_ptr,
+        result = H5C_jb_aio__get_last_transaction_on_disk(struct_ptr,
                                                            trans_num_ptr);
 
         if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C2_jb_aio__get_last_transaction_on_disk failed")
+                        "H5C_jb_aio__get_last_transaction_on_disk failed")
         }
         
     } else {
 
-        result = H5C2_jb_sio__get_last_transaction_on_disk(struct_ptr,
+        result = H5C_jb_sio__get_last_transaction_on_disk(struct_ptr,
                                                            trans_num_ptr);
 
         if ( result != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                        "H5C2_jb_sio__get_last_transaction_on_disk failed")
+                        "H5C_jb_sio__get_last_transaction_on_disk failed")
         }
     }
 
@@ -6724,12 +6724,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb__get_last_transaction_on_disk */
+} /* end H5C_jb__get_last_transaction_on_disk */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_hrjf__comment
+ * Function:		H5C_jb_hrjf__comment
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Wednesday, February 6, 2008
@@ -6740,26 +6740,26 @@ done:
  *
  * Returns:		SUCCEED on success.
  *
- * Changes:		Renamed H5C2_jb__comment() to H5C2_jb_hrjf__comment().  
+ * Changes:		Renamed H5C_jb__comment() to H5C_jb_hrjf__comment().  
  *
  *							JRM -- 5/2/09
  *
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_hrjf__comment(H5C2_jbrb_t * struct_ptr,
+H5C_jb_hrjf__comment(H5C_jbrb_t * struct_ptr,
  		      const char * comment_ptr)
 {
     char * temp = NULL;
     size_t temp_len;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_hrjf__comment, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_hrjf__comment, FAIL)
 	
     /* Check Arguments */
     HDassert(struct_ptr);
     HDassert(comment_ptr);
-    HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
+    HDassert(struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC);
     HDassert(struct_ptr->hdf5_file_name);
 
     /* Verify that header message is present in journal file or ring buffer. 
@@ -6767,10 +6767,10 @@ H5C2_jb_hrjf__comment(H5C2_jbrb_t * struct_ptr,
      */
     if ( struct_ptr->header_present == FALSE ) {
 
-        if ( H5C2_jb__write_header_entry(struct_ptr) != SUCCEED ) {
+        if ( H5C_jb__write_header_entry(struct_ptr) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb__write_header_entry() failed.\n")
+                        "H5C_jb__write_header_entry() failed.\n")
         }
 
     } /* end if */
@@ -6788,14 +6788,14 @@ H5C2_jb_hrjf__comment(H5C2_jbrb_t * struct_ptr,
 
     HDassert ( temp_len == HDstrlen(temp) );
 
-    if ( H5C2_jb__write_to_buffer(struct_ptr, 
+    if ( H5C_jb__write_to_buffer(struct_ptr, 
                                   temp_len, 
                                   temp, 
                                   FALSE, 
                                   struct_ptr->cur_trans) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__write_to_buffer() failed.\n")
+                    "H5C_jb__write_to_buffer() failed.\n")
     }
 
 done:
@@ -6813,12 +6813,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb hrjf__comment() */
+} /* H5C_jb hrjf__comment() */
 
 
 /*****************************************************************************
  *
- * Function:		H5C2_jb_hrjf__end_transaction
+ * Function:		H5C_jb_hrjf__end_transaction
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Wednesday, February 6, 2008
@@ -6832,24 +6832,24 @@ done:
  *
  * Returns:		SUCCEED on success.
  *
- * Changes:		Renamed H5C2_jb__end_transaction() to
- *			H5C2_jb_hrjf__end_transaction().  
+ * Changes:		Renamed H5C_jb__end_transaction() to
+ *			H5C_jb_hrjf__end_transaction().  
  *							JRM -- 5/2/09
  *
  *****************************************************************************/
 
 static herr_t
-H5C2_jb_hrjf__end_transaction(H5C2_jbrb_t * struct_ptr,
+H5C_jb_hrjf__end_transaction(H5C_jbrb_t * struct_ptr,
 			      uint64_t trans_num)
 {
     char temp[25];
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_hrjf__end_transaction, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_hrjf__end_transaction, FAIL)
 
     /* Check Arguments */
     HDassert(struct_ptr);
-    HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
+    HDassert(struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC);
 	
     /* Verify that the supplied transaction is in progress */
     if ( ( struct_ptr->trans_in_prog != TRUE ) ||
@@ -6873,11 +6873,11 @@ H5C2_jb_hrjf__end_transaction(H5C2_jbrb_t * struct_ptr,
     HDsnprintf(temp, (size_t)25, "3 end_trans %llu\n", trans_num);
 
     /* Write end transaction message */
-    if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(temp), temp, 
+    if ( H5C_jb__write_to_buffer(struct_ptr, HDstrlen(temp), temp, 
 			          TRUE, trans_num ) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__write_to_buffer() failed.\n")
+                    "H5C_jb__write_to_buffer() failed.\n")
     } /* end if */
 
     /* reset boolean flag indicating if at least one journal entry has 
@@ -6892,12 +6892,12 @@ done:
 	
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb_hrjf__end_transaction */
+} /* end H5C_jb_hrjf__end_transaction */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_hrjf__eoa
+ * Function:		H5C_jb_hrjf__eoa
  *
  * Programmer:		Mike McGreevy <mamcgree@hdfgroup.org>
  *			July 29, 2008
@@ -6906,24 +6906,24 @@ done:
  *
  * Returns:		SUCCEED on success.
  *
- * Changes:		Renamed H5C2_jb__eoa() to H5C2_jb_hrjf__eoa().  
+ * Changes:		Renamed H5C_jb__eoa() to H5C_jb_hrjf__eoa().  
  *							JRM -- 5/2/09
  *
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_hrjf__eoa(H5C2_jbrb_t * struct_ptr,
+H5C_jb_hrjf__eoa(H5C_jbrb_t * struct_ptr,
 		  haddr_t eoa)
 {
     char temp[41];
     size_t temp_len = 41;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_hrjf__eoa, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_hrjf__eoa, FAIL)
 	
     /* Check Arguments */
     HDassert(struct_ptr);
-    HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
+    HDassert(struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC);
     HDassert(struct_ptr->hdf5_file_name);
 
     /* Verify that header message is present in journal file or ring buffer. 
@@ -6931,10 +6931,10 @@ H5C2_jb_hrjf__eoa(H5C2_jbrb_t * struct_ptr,
      */
     if ( struct_ptr->header_present == FALSE ) {
 
-        if ( H5C2_jb__write_header_entry(struct_ptr) != SUCCEED ) {
+        if ( H5C_jb__write_header_entry(struct_ptr) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb__write_header_entry() failed.\n")
+                        "H5C_jb__write_header_entry() failed.\n")
         }
     } /* end if */
 
@@ -6943,26 +6943,26 @@ H5C2_jb_hrjf__eoa(H5C2_jbrb_t * struct_ptr,
 
     HDassert ( HDstrlen(temp) < temp_len );
 
-    if ( H5C2_jb__write_to_buffer(struct_ptr,  
+    if ( H5C_jb__write_to_buffer(struct_ptr,  
                                   HDstrlen(temp), 
                                   temp, 
                                   FALSE, 
                                   struct_ptr->cur_trans) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__write_to_buffer() failed.\n")
+                    "H5C_jb__write_to_buffer() failed.\n")
     }
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_hrjf__eoa() */
+} /* H5C_jb_hrjf__eoa() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_hrjf__journal_entry
+ * Function:		H5C_jb_hrjf__journal_entry
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Wednesday, February 6, 2008
@@ -6974,14 +6974,14 @@ done:
  *
  * Returns:		SUCCEED on success.
  *
- * Changes:		Renamed H5C2_jb__journal_entry() to 
- *			H5C2_jb_hrjf__journal_entry().  
+ * Changes:		Renamed H5C_jb__journal_entry() to 
+ *			H5C_jb_hrjf__journal_entry().  
  *							JRM -- 5/2/09
  *
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_hrjf__journal_entry(H5C2_jbrb_t * struct_ptr,
+H5C_jb_hrjf__journal_entry(H5C_jbrb_t * struct_ptr,
 	   		    uint64_t trans_num,
 			    haddr_t base_addr,
 			    size_t length,
@@ -6994,11 +6994,11 @@ H5C2_jb_hrjf__journal_entry(H5C2_jbrb_t * struct_ptr,
     herr_t ret_value = SUCCEED;
     uint8_t * bodydata;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_hrjf__journal_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_hrjf__journal_entry, FAIL)
 
     /* Check Arguments */
     HDassert(struct_ptr != NULL);
-    HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
+    HDassert(struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC);
 
     /* Make a copy of body data */
     if ( (bodydata = (uint8_t *)H5MM_malloc(length)) == NULL ) {
@@ -7037,27 +7037,27 @@ H5C2_jb_hrjf__journal_entry(H5C2_jbrb_t * struct_ptr,
 	       length, 
 	       (unsigned long)base_addr);
 
-    if ( H5C2_jb__write_to_buffer(struct_ptr, 
+    if ( H5C_jb__write_to_buffer(struct_ptr, 
                                   HDstrlen(temp), 
                                   temp, 
                                   FALSE, 
                                   trans_num) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__write_to_buffer() failed.\n")
+                    "H5C_jb__write_to_buffer() failed.\n")
     } /* end if */
 
     /* Convert data from binary to hex */
-    H5C2_jb__bin2hex(bodydata, hexdata, &hexlength, length);
+    H5C_jb__bin2hex(bodydata, hexdata, &hexlength, length);
 
-    if ( H5C2_jb__write_to_buffer(struct_ptr, 
+    if ( H5C_jb__write_to_buffer(struct_ptr, 
                                   hexlength, 
                                   hexdata, 
                                   FALSE, 
                                   trans_num) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__write_to_buffer() failed.\n")
+                    "H5C_jb__write_to_buffer() failed.\n")
     } /* end if */
 
     /* Indicate that at least one journal entry has been written under 
@@ -7105,12 +7105,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_hrjf__journal_entry() */
+} /* H5C_jb_hrjf__journal_entry() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_hrjf__start_transaction
+ * Function:		H5C_jb_hrjf__start_transaction
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Wednesday, February 6, 2008
@@ -7124,25 +7124,25 @@ done:
  *
  * Returns:		SUCCEED on success.
  *
- * Changes:		Renamed H5C2_jb__start_transaction() to 
- *			H5C2_jb_hrjf__start_transaction().  
+ * Changes:		Renamed H5C_jb__start_transaction() to 
+ *			H5C_jb_hrjf__start_transaction().  
  *							JRM -- 5/2/09
  *
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_hrjf__start_transaction(H5C2_jbrb_t * struct_ptr,
+H5C_jb_hrjf__start_transaction(H5C_jbrb_t * struct_ptr,
 			   uint64_t trans_num)
 
 {
     char temp[150];
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_hrjf__start_transaction, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_hrjf__start_transaction, FAIL)
 
     /* Check Arguments */
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
 	
     /* Verify that there is no transaction in progress */
     if ( struct_ptr->trans_in_prog != FALSE ) {
@@ -7163,10 +7163,10 @@ H5C2_jb_hrjf__start_transaction(H5C2_jbrb_t * struct_ptr,
      */
     if ( struct_ptr->header_present == FALSE ) {
 
-        if ( H5C2_jb__write_header_entry(struct_ptr) != SUCCEED ) {
+        if ( H5C_jb__write_header_entry(struct_ptr) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb__write_header_entry() failed.\n")
+                        "H5C_jb__write_header_entry() failed.\n")
         }
 
     } /* end if */
@@ -7174,14 +7174,14 @@ H5C2_jb_hrjf__start_transaction(H5C2_jbrb_t * struct_ptr,
     /* Write start transaction message */
     HDsnprintf(temp, (size_t)150, "1 bgn_trans %llu\n", trans_num);
 
-    if ( H5C2_jb__write_to_buffer(struct_ptr, 
+    if ( H5C_jb__write_to_buffer(struct_ptr, 
                                   HDstrlen(temp), 
                                   temp, 
 			          FALSE, 
                                   trans_num) < 0 ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__write_to_buffer() failed.\n")
+                    "H5C_jb__write_to_buffer() failed.\n")
     } /* end if */
 		
     /* Make note of the fact that supplied transaction is in progress */
@@ -7192,17 +7192,17 @@ done:
 	
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_hrjf__start_transaction() */
+} /* H5C_jb_hrjf__start_transaction() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb__init
+ * Function:		H5C_jb__init
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Tuesday, February 5, 2008
  *
- * Purpose:		Initialize the supplied instance of H5C2_jbrb_t as
+ * Purpose:		Initialize the supplied instance of H5C_jbrb_t as
  *			specified by the buf_size and num_bufs fields. Open the
  *			journal file whose name is supplied in journal_file_name
  *			for either synchronous or asynchronous I/O as specified
@@ -7226,15 +7226,15 @@ done:
  *
  *			JRM -- 12/7/09
  *			Added initialization for posix aio fields in 
- *			H5C2_jbrb_t.
+ *			H5C_jbrb_t.
  *
  *			JRM -- 2/21/10
- *			Added call to H5C2_jb_stats__reset();
+ *			Added call to H5C_jb_stats__reset();
  *
  ******************************************************************************/
 
 herr_t 
-H5C2_jb__init(H5C2_jbrb_t * struct_ptr,  	
+H5C_jb__init(H5C_jbrb_t * struct_ptr,  	
               const int32_t journal_magic,
 	      const char * HDF5_file_name,	 	
 	      const char * journal_file_name, 	
@@ -7248,7 +7248,7 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
     int 	i;
     herr_t 	ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb__init, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb__init, FAIL)
 
     /* Check Arguments */
     HDassert( struct_ptr );
@@ -7256,9 +7256,9 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
     HDassert( journal_file_name );
     HDassert( buf_size > 0 );
     HDassert( num_bufs > 0 );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
 
-    /* Initialize Fields of H5C2_jbrb_t structure.  Note that we will
+    /* Initialize Fields of H5C_jbrb_t structure.  Note that we will
      * overwrite some of these initializations almost immediately.
      */
     struct_ptr->journal_magic = journal_magic;
@@ -7267,7 +7267,7 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
     struct_ptr->buf_size = buf_size;
     struct_ptr->bufs_in_use = 0;
     struct_ptr->writes_in_progress = 0;
-    struct_ptr->jvers = H5C2__JOURNAL_VERSION;
+    struct_ptr->jvers = H5C__JOURNAL_VERSION;
     struct_ptr->get = 0;
     struct_ptr->put = 0;
     struct_ptr->jentry_written = FALSE;
@@ -7308,7 +7308,7 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
     struct_ptr->aio_ctl_blks = NULL;
     struct_ptr->aio_next_buf_offset = (off_t)0;
 /* Comment this out to work on the Mac, currently */
-#if 1
+#if 0
     struct_ptr->use_aio_fsync = use_aio;
 #else
     struct_ptr->use_aio_fsync = FALSE;
@@ -7414,22 +7414,22 @@ H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
         }
     }
 
-    if ( H5C2_jb_stats__reset(struct_ptr) != SUCCEED ) {
+    if ( H5C_jb_stats__reset(struct_ptr) != SUCCEED ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-                    "H5C2_jb_stats__reset() failed.")
+                    "H5C_jb_stats__reset() failed.")
     }
 
 done:
 	
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb__init */
+} /* end H5C_jb__init */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb__journal_entry
+ * Function:		H5C_jb__journal_entry
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Wednesday, February 6, 2008
@@ -7447,14 +7447,14 @@ done:
  *			by struct_ptr->human_readable.  
  *
  *			The original version of this file has been renamed
- *			to H5C2_jb_hrjf__journal_entry().
+ *			to H5C_jb_hrjf__journal_entry().
  *
  *							JRM -- 4/2/09
  *
  ******************************************************************************/
 
 herr_t 
-H5C2_jb__journal_entry(H5C2_jbrb_t * struct_ptr,
+H5C_jb__journal_entry(H5C_jbrb_t * struct_ptr,
 			uint64_t trans_num,
 			haddr_t base_addr,
 			size_t length,
@@ -7462,27 +7462,27 @@ H5C2_jb__journal_entry(H5C2_jbrb_t * struct_ptr,
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb__journal_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb__journal_entry, FAIL)
 
     /* Check Arguments */
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
 
     if ( struct_ptr->human_readable ) {
 
-        if ( H5C2_jb_hrjf__journal_entry(struct_ptr, trans_num, base_addr, 
+        if ( H5C_jb_hrjf__journal_entry(struct_ptr, trans_num, base_addr, 
                                          length, body) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb_hrjf__journal_entry() failed.")
+                        "H5C_jb_hrjf__journal_entry() failed.")
         }
     } else {
 
-        if ( H5C2_jb_bjf__journal_entry(struct_ptr, trans_num, base_addr,
+        if ( H5C_jb_bjf__journal_entry(struct_ptr, trans_num, base_addr,
                                         length, body) != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb_bjf__journal_entry() failed.")
+                        "H5C_jb_bjf__journal_entry() failed.")
         }
     }
 
@@ -7490,12 +7490,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb__journal_entry() */
+} /* H5C_jb__journal_entry() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_sio__flush
+ * Function:		H5C_jb_sio__flush
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Wednesday, February 6, 2008
@@ -7507,8 +7507,8 @@ done:
  *
  * Returns:		SUCCEED on success.
  *
- * Changes:		Renamed function from H5C2_jb__flush() to
- *			H5C2_jb_sio__flush().  Added code to verify that 
+ * Changes:		Renamed function from H5C_jb__flush() to
+ *			H5C_jb_sio__flush().  Added code to verify that 
  *			SIO is selected.
  *
  *						JRM -- 1/14/10
@@ -7516,17 +7516,17 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_sio__flush(H5C2_jbrb_t * struct_ptr)
+H5C_jb_sio__flush(H5C_jbrb_t * struct_ptr)
 {
     int result;
     int i;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_sio__flush, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_sio__flush, FAIL)
 
     /* Check Arguments */
     HDassert(struct_ptr);
-    HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
+    HDassert(struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC);
     HDassert(struct_ptr->use_aio == FALSE);
 	
     /* Check if transaction is in progress */
@@ -7613,7 +7613,7 @@ H5C2_jb_sio__flush(H5C2_jbrb_t * struct_ptr)
         HGOTO_ERROR(H5E_IO, H5E_SYNCFAIL, FAIL, "Journal file sync failed.")
     }
 
-    H5C2__JBRB__UPDATE_STATS_FOR_CALL_TO_FSYNC(struct_ptr)
+    H5C__JBRB__UPDATE_STATS_FOR_CALL_TO_FSYNC(struct_ptr)
 
     /* record last transaction number that made it to disk */
     struct_ptr->last_trans_on_disk = 
@@ -7643,12 +7643,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb_sio__flush */
+} /* end H5C_jb_sio__flush */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_sio__flush_full_buffers
+ * Function:		H5C_jb_sio__flush_full_buffers
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Wednesday, February 6, 2008
@@ -7660,20 +7660,20 @@ done:
  *
  * Returns:		SUCCEED on success.
  *
- * Changes:		Changed name from H5C2_jb__flush_full_buffers() to
- *			H5C2_jb_sio__flush_full_buffers().
+ * Changes:		Changed name from H5C_jb__flush_full_buffers() to
+ *			H5C_jb_sio__flush_full_buffers().
  *
  *							JRM -- 1/14/10
  *
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_sio__flush_full_buffers(H5C2_jbrb_t * struct_ptr)	
+H5C_jb_sio__flush_full_buffers(H5C_jbrb_t * struct_ptr)	
 {
     int result;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_sio__flush_full_buffers, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_sio__flush_full_buffers, FAIL)
 
     /* this asserts that at least one buffer is in use */
     HDassert( struct_ptr->bufs_in_use > 0 );
@@ -7772,12 +7772,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb_sio__flush_full_buffers */
+} /* end H5C_jb_sio__flush_full_buffers */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_sio__get_last_transaction_on_disk
+ * Function:		H5C_jb_sio__get_last_transaction_on_disk
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Wednesday, February 6, 2008
@@ -7791,11 +7791,11 @@ done:
  *
  * Changes:		Renamed the function from 
  *
- *			H5C2_jb__get_last_transaction_on_disk()
+ *			H5C_jb__get_last_transaction_on_disk()
  *
  *			to 
  *
- * 			H5C2_jb_sio__get_last_transaction_on_disk()
+ * 			H5C_jb_sio__get_last_transaction_on_disk()
  *
  *			and added some additional sanity checks.
  *
@@ -7804,17 +7804,17 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_sio__get_last_transaction_on_disk(H5C2_jbrb_t * struct_ptr,
+H5C_jb_sio__get_last_transaction_on_disk(H5C_jbrb_t * struct_ptr,
 				          uint64_t * trans_num_ptr)
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb_sio__get_last_transaction_on_disk, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_sio__get_last_transaction_on_disk, FAIL)
 	
     /* Check Arguments */
     HDassert( struct_ptr != NULL );
     HDassert( trans_num_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
 
     /* JRM: In machine readable version, lets check to see if a sync is 
      *      necessary, and call it only if it is.
@@ -7827,7 +7827,7 @@ H5C2_jb_sio__get_last_transaction_on_disk(H5C2_jbrb_t * struct_ptr,
         HGOTO_ERROR(H5E_IO, H5E_SYNCFAIL, FAIL, "Jounal file sync failed.")
     }
 
-    H5C2__JBRB__UPDATE_STATS_FOR_CALL_TO_FSYNC(struct_ptr)
+    H5C__JBRB__UPDATE_STATS_FOR_CALL_TO_FSYNC(struct_ptr)
 
     * trans_num_ptr = struct_ptr->last_trans_on_disk;
 
@@ -7835,12 +7835,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb_sio__get_last_transaction_on_disk */
+} /* end H5C_jb_sio__get_last_transaction_on_disk */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_sio__write_to_buffer
+ * Function:		H5C_jb_sio__write_to_buffer
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Wednesday, February 6, 2008
@@ -7863,8 +7863,8 @@ done:
  * Returns:		SUCCEED on success.
  *
  * Changes:		Changed the name of the function from 
- *			H5C2_jb__write_to_buffer() to 
- *			H5C2_jb_sio__write_to_buffer().  Added assert to
+ *			H5C_jb__write_to_buffer() to 
+ *			H5C_jb_sio__write_to_buffer().  Added assert to
  *			verify that struct_ptr->use_aio is FALSE.
  *
  *						JRM -- 1/14/10
@@ -7872,7 +7872,7 @@ done:
  ******************************************************************************/
 
 static herr_t 
-H5C2_jb_sio__write_to_buffer(H5C2_jbrb_t * struct_ptr,	
+H5C_jb_sio__write_to_buffer(H5C_jbrb_t * struct_ptr,	
 			     size_t size,			
 			     const char * data,
                              hbool_t is_end_trans,
@@ -7883,12 +7883,12 @@ H5C2_jb_sio__write_to_buffer(H5C2_jbrb_t * struct_ptr,
     int oldput = 0;
     int i;
 	
-    FUNC_ENTER_NOAPI(H5C2_jb_sio__write_to_buffer, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_sio__write_to_buffer, FAIL)
 
     /* Check Arguments */
     HDassert(struct_ptr);
     HDassert(data);
-    HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
+    HDassert(struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC);
     HDassert(struct_ptr->use_aio == FALSE);
     HDassert( ( struct_ptr->human_readable == FALSE ) || 
               ( HDstrlen(data) == size ) );
@@ -7946,10 +7946,10 @@ H5C2_jb_sio__write_to_buffer(H5C2_jbrb_t * struct_ptr,
             }
 
 	    /* flush buffers */
-	    if ( H5C2_jb_sio__flush_full_buffers(struct_ptr) < 0 ) {
+	    if ( H5C_jb_sio__flush_full_buffers(struct_ptr) < 0 ) {
 
 		 HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                             "H5C2_jb_sio__flush_full_buffers() failed.\n")
+                             "H5C_jb_sio__flush_full_buffers() failed.\n")
             }
 
 	    /* update remaining size of data to be written */
@@ -8032,10 +8032,10 @@ H5C2_jb_sio__write_to_buffer(H5C2_jbrb_t * struct_ptr,
         } /* end if */
 
 	/* flush buffers */
-	if ( H5C2_jb_sio__flush_full_buffers(struct_ptr) < 0 ) {
+	if ( H5C_jb_sio__flush_full_buffers(struct_ptr) < 0 ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb_siok__flush_full_buffers() failed.\n")
+                        "H5C_jb_siok__flush_full_buffers() failed.\n")
         }
 
 	/* update space left at end of ring buffer */
@@ -8108,10 +8108,10 @@ H5C2_jb_sio__write_to_buffer(H5C2_jbrb_t * struct_ptr,
 
 	    } /* end else */
 
-	    if ( H5C2_jb_sio__flush_full_buffers(struct_ptr) < 0 ) {
+	    if ( H5C_jb_sio__flush_full_buffers(struct_ptr) < 0 ) {
 
                 HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                            "H5C2_jb_sio__flush_full_buffers() failed.\n")
+                            "H5C_jb_sio__flush_full_buffers() failed.\n")
             } /* end if */
 
 	    struct_ptr->cur_buf_free_space = struct_ptr->buf_size;
@@ -8126,20 +8126,20 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb_sio__write_to_buffer */
+} /* end H5C_jb_sio__write_to_buffer */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_stats__dump
+ * Function:		H5C_jb_stats__dump
  *
  * Programmer:		JRM -- 2/21/20
  *
- * Purpose:		If H5C2__JBRB__COLLECT_STATS is TRUE, dump the 
+ * Purpose:		If H5C__JBRB__COLLECT_STATS is TRUE, dump the 
  *			contents of the journal buffer ring buffer stats
  *			fields to stdout.
  *
- *			If H5C2__JBRB__COLLECT_STATS is FALSE, do nothing. 
+ *			If H5C__JBRB__COLLECT_STATS is FALSE, do nothing. 
  *
  * Returns:		void
  *
@@ -8148,25 +8148,25 @@ done:
  ******************************************************************************/
 
 herr_t
-H5C2_jb_stats__dump(H5C2_jbrb_t * struct_ptr)
+H5C_jb_stats__dump(H5C_jbrb_t * struct_ptr)
 {
     herr_t      ret_value = SUCCEED;   /* Return value */
-#if H5C2__JBRB__COLLECT_STATS
+#if H5C__JBRB__COLLECT_STATS
     double	calls_to_aio_error_per_async_sync_await = 0.0;
-#endif /* H5C2__JBRB__COLLECT_STATS */
+#endif /* H5C__JBRB__COLLECT_STATS */
 
-    FUNC_ENTER_NOAPI(H5C2_jb_stats__dump, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_stats__dump, FAIL)
 
     /* This would normally be an assert, but we need to use an HGOTO_ERROR
      * call to shut up the compiler.
      */
     if ( ( struct_ptr == NULL ) ||
-         ( struct_ptr->magic != H5C2__H5C2_JBRB_T_MAGIC ) ) {
+         ( struct_ptr->magic != H5C__H5C_JBRB_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad struct_ptr on entry")
     }
 
-#if H5C2__JBRB__COLLECT_STATS
+#if H5C__JBRB__COLLECT_STATS
     if ( struct_ptr->async_syncs_completed_by_await > 0 ) {
 
         calls_to_aio_error_per_async_sync_await = 
@@ -8208,26 +8208,26 @@ H5C2_jb_stats__dump(H5C2_jbrb_t * struct_ptr)
 
      HDfprintf(stdout, "calls to fsync() = %lld.\n",
 	       (long long)(struct_ptr->calls_to_fsync));
-#endif /* H5C2__JBRB__COLLECT_STATS */
+#endif /* H5C__JBRB__COLLECT_STATS */
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_stats__dump() */
+} /* H5C_jb_stats__dump() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb_stats__reset
+ * Function:		H5C_jb_stats__reset
  *
  * Programmer:		JRM -- 2/21/20
  *
- * Purpose:		If H5C2__JBRB__COLLECT_STATS is TRUE, reset the 
- *			stats fields in the instance of H5C2_jbrb_t 
+ * Purpose:		If H5C__JBRB__COLLECT_STATS is TRUE, reset the 
+ *			stats fields in the instance of H5C_jbrb_t 
  *			pointed to by struct_ptr.  
  *
- *			If H5C2__JBRB__COLLECT_STATS is FALSE, do nothing. 
+ *			If H5C__JBRB__COLLECT_STATS is FALSE, do nothing. 
  *
  * Returns:		void
  *
@@ -8236,22 +8236,22 @@ done:
  ******************************************************************************/
 
 herr_t
-H5C2_jb_stats__reset(H5C2_jbrb_t * struct_ptr)
+H5C_jb_stats__reset(H5C_jbrb_t * struct_ptr)
 {
     herr_t      ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_NOAPI(H5C2_jb_stats__reset, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb_stats__reset, FAIL)
 
     /* This would normally be an assert, but we need to use an HGOTO_ERROR
      * call to shut up the compiler.
      */
     if ( ( struct_ptr == NULL ) ||
-         ( struct_ptr->magic != H5C2__H5C2_JBRB_T_MAGIC ) ) {
+         ( struct_ptr->magic != H5C__H5C_JBRB_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad struct_ptr")
     }
 
-#if H5C2__JBRB__COLLECT_STATS
+#if H5C__JBRB__COLLECT_STATS
     struct_ptr->transactions_completed           = 0;
     struct_ptr->buf_writes_queued                = 0;
     struct_ptr->full_buf_writes_queued           = 0;
@@ -8266,18 +8266,18 @@ H5C2_jb_stats__reset(H5C2_jbrb_t * struct_ptr)
     struct_ptr->calls_to_aio_error_awaiting_sync = 0;
     struct_ptr->max_sync_q_len                   = 0;
     struct_ptr->calls_to_fsync                   = 0;
-#endif /* H5C2__JBRB__COLLECT_STATS */
+#endif /* H5C__JBRB__COLLECT_STATS */
 
 done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb_stats__reset() */
+} /* H5C_jb_stats__reset() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb__start_transaction
+ * Function:		H5C_jb__start_transaction
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Wednesday, February 6, 2008
@@ -8297,40 +8297,40 @@ done:
  *			by struct_ptr->human_readable.  
  *
  *			The original version of this file has been renamed
- *			to H5C2_jb_hrjf__start_transaction().
+ *			to H5C_jb_hrjf__start_transaction().
  *
  *							JRM -- 4/2/09
  *
  ******************************************************************************/
 
 herr_t 
-H5C2_jb__start_transaction(H5C2_jbrb_t * struct_ptr,
+H5C_jb__start_transaction(H5C_jbrb_t * struct_ptr,
 			   uint64_t trans_num)
 
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb__start_transaction, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb__start_transaction, FAIL)
 
     /* Check Arguments */
     HDassert( struct_ptr != NULL );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
 
     if ( struct_ptr->human_readable ) {
 
-        if ( H5C2_jb_hrjf__start_transaction(struct_ptr, trans_num) 
+        if ( H5C_jb_hrjf__start_transaction(struct_ptr, trans_num) 
              != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb_hrjf__start_transaction() failed.")
+                        "H5C_jb_hrjf__start_transaction() failed.")
         }
     } else {
 
-        if ( H5C2_jb_bjf__start_transaction(struct_ptr, trans_num) 
+        if ( H5C_jb_bjf__start_transaction(struct_ptr, trans_num) 
              != SUCCEED ) {
 
             HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                        "H5C2_jb_bjf__start_transaction() failed.")
+                        "H5C_jb_bjf__start_transaction() failed.")
         }
     }
 	
@@ -8338,12 +8338,12 @@ done:
 	
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* H5C2_jb__start_transaction() */
+} /* H5C_jb__start_transaction() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb__takedown
+ * Function:		H5C_jb__takedown
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Thursday, February 7, 2008
@@ -8360,33 +8360,33 @@ done:
  *			Added code to free the aio control blocks if necessary.
  *
  *			JRM -- 2/21/10
- *			Added call to H5C2_jb_stats__dump().
+ *			Added call to H5C_jb_stats__dump().
  *
  ******************************************************************************/
 
 herr_t 
-H5C2_jb__takedown(H5C2_jbrb_t * struct_ptr)
+H5C_jb__takedown(H5C_jbrb_t * struct_ptr)
 
 {
     herr_t ret_value = SUCCEED;
 	
-    FUNC_ENTER_NOAPI(H5C2_jb__takedown, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb__takedown, FAIL)
 
     /* Check Arguments */
     HDassert(struct_ptr);
-    HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
+    HDassert(struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC);
 
     /* dump the stats before we start the takedown, as the dump
      * routine may want to look at some of *struct_ptr's regular 
      * fields, as well as the stats fields.
      */
-#if H5C2__JBRB__DUMP_STATS_ON_TAKEDOWN
-    if ( H5C2_jb_stats__dump(struct_ptr) != SUCCEED ) {
+#if H5C__JBRB__DUMP_STATS_ON_TAKEDOWN
+    if ( H5C_jb_stats__dump(struct_ptr) != SUCCEED ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
-	            "H5C2_jb_stats__dump() failed.")
+	            "H5C_jb_stats__dump() failed.")
     }
-#endif /* H5C2__JBRB__DUMP_STATS_ON_TAKEDOWN */
+#endif /* H5C__JBRB__DUMP_STATS_ON_TAKEDOWN */
 	
     /* Verify that the journal buffers are empty */
     if ( struct_ptr->bufs_in_use != 0 ) {
@@ -8487,12 +8487,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb__takedown */
+} /* end H5C_jb__takedown */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb__trunc
+ * Function:		H5C_jb__trunc
  *
  * Programmer:		Mike McGreevy <mcgreevy@hdfgroup.org>
  *			Thursday, February 7, 2008
@@ -8511,17 +8511,17 @@ done:
  ******************************************************************************/
 
 herr_t 
-H5C2_jb__trunc(H5C2_jbrb_t * struct_ptr)
+H5C_jb__trunc(H5C_jbrb_t * struct_ptr)
 
 {
     int i;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI(H5C2_jb__trunc, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb__trunc, FAIL)
 
     /* Check Arguments */
     HDassert(struct_ptr);
-    HDassert(struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC);
+    HDassert(struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC);
 	
     /* Verify that there is no transaction in progress */
     if ( struct_ptr->trans_in_prog != FALSE ) {
@@ -8569,12 +8569,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb__trunc */
+} /* end H5C_jb__trunc */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb__write_header_entry
+ * Function:		H5C_jb__write_header_entry
  *
  * Programmer:		John Mainzer
  *			2/12/09
@@ -8604,7 +8604,7 @@ done:
  ******************************************************************************/
 
 herr_t 
-H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
+H5C_jb__write_header_entry(H5C_jbrb_t * struct_ptr)
 
 {
     herr_t      ret_value = SUCCEED;
@@ -8617,11 +8617,11 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
     size_t	buf_len;
     time_t      current_date;
 	
-    FUNC_ENTER_NOAPI(H5C2_jb__write_header_entry, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb__write_header_entry, FAIL)
 
     /* Check Arguments */
     HDassert( struct_ptr );
-    HDassert( struct_ptr->magic == H5C2__H5C2_JBRB_T_MAGIC );
+    HDassert( struct_ptr->magic == H5C__H5C_JBRB_T_MAGIC );
     HDassert( struct_ptr->hdf5_file_name != NULL );
     HDassert( struct_ptr->header_present == FALSE );
     HDassert( struct_ptr->journal_is_empty == TRUE );
@@ -8689,15 +8689,15 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
             HDsnprintf(buf, 
                        buf_len - 1,
                        "0 %s %ld %s %s %s %d %s %10.10s %s %d\n",
-                       H5C2_JNL__VER_NUM_TAG,
+                       H5C_JNL__VER_NUM_TAG,
 	               struct_ptr->jvers, 
-                       H5C2_JNL__TGT_FILE_NAME_TAG,
+                       H5C_JNL__TGT_FILE_NAME_TAG,
 	               struct_ptr->hdf5_file_name, 
-                       H5C2_JNL__JNL_MAGIC_TAG,
+                       H5C_JNL__JNL_MAGIC_TAG,
                        (int)(struct_ptr->journal_magic),
-                       H5C2_JNL__CREATION_DATE_TAG,
+                       H5C_JNL__CREATION_DATE_TAG,
 	               time_buf,
-                       H5C2_JNL__HUMAN_READABLE_TAG,
+                       H5C_JNL__HUMAN_READABLE_TAG,
 	               struct_ptr->human_readable);
 
     } else {
@@ -8716,19 +8716,19 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
             HDsnprintf(buf, 
                        buf_len - 1,
                        "0 %s %ld %s %s %s %d %s %10.10s %s %d %s %d %s %d\n",
-                       H5C2_JNL__VER_NUM_TAG,
+                       H5C_JNL__VER_NUM_TAG,
 	               struct_ptr->jvers, 
-                       H5C2_JNL__TGT_FILE_NAME_TAG,
+                       H5C_JNL__TGT_FILE_NAME_TAG,
 	               struct_ptr->hdf5_file_name, 
-                       H5C2_JNL__JNL_MAGIC_TAG,
+                       H5C_JNL__JNL_MAGIC_TAG,
                        (int)(struct_ptr->journal_magic),
-                       H5C2_JNL__CREATION_DATE_TAG,
+                       H5C_JNL__CREATION_DATE_TAG,
 	               time_buf,
-                       H5C2_JNL__HUMAN_READABLE_TAG,
+                       H5C_JNL__HUMAN_READABLE_TAG,
 	               struct_ptr->human_readable,
-                       H5C2_JNL__OFFSET_WIDTH_TAG,
+                       H5C_JNL__OFFSET_WIDTH_TAG,
                        struct_ptr->offset_width,
-                       H5C2_JNL__LENGTH_WIDTH_TAG,
+                       H5C_JNL__LENGTH_WIDTH_TAG,
                        struct_ptr->length_width);
 
     }
@@ -8742,13 +8742,13 @@ H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr)
     HDassert( HDstrlen(buf) < buf_len );
 
     /* Write the header message into the ring buffer */
-    if ( H5C2_jb__write_to_buffer(struct_ptr, HDstrlen(buf), buf, FALSE, 
+    if ( H5C_jb__write_to_buffer(struct_ptr, HDstrlen(buf), buf, FALSE, 
 			          (uint64_t)0) < 0) {
 #if 1 /* JRM */
-    HDfprintf(stdout, "%s: H5C2_jb__write_to_buffer() failed.\n", FUNC);
+    HDfprintf(stdout, "%s: H5C_jb__write_to_buffer() failed.\n", FUNC);
 #endif /* JRM */
         HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL, \
-                    "H5C2_jb__write_to_buffer() failed.\n")
+                    "H5C_jb__write_to_buffer() failed.\n")
     } /* end if */
 
     /* Update boolean flags */
@@ -8770,12 +8770,12 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb__write_header_entry() */
+} /* end H5C_jb__write_header_entry() */
 
 
 /******************************************************************************
  *
- * Function:		H5C2_jb__write_to_buffer
+ * Function:		H5C_jb__write_to_buffer
  *
  * Programmer:		John Mainzer
  *			1/14/10
@@ -8784,14 +8784,14 @@ done:
  *			call the appropriate version of the function.
  *
  *			At some point we may wish to replace this switch
- *			function with a function pointer in struct H5C2_jbrb_t.
+ *			function with a function pointer in struct H5C_jbrb_t.
  *
  * Returns:		SUCCEED on success.
  *
  ******************************************************************************/
 
 herr_t 
-H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,	
+H5C_jb__write_to_buffer(H5C_jbrb_t * struct_ptr,	
 			 size_t size,			
 			 const char * data,
                          hbool_t is_end_trans,
@@ -8799,11 +8799,11 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
 {
     herr_t ret_value = SUCCEED;
 	
-    FUNC_ENTER_NOAPI(H5C2_jb__write_to_buffer, FAIL)
+    FUNC_ENTER_NOAPI(H5C_jb__write_to_buffer, FAIL)
 
     /* Check Arguments */
     if ( ( struct_ptr == NULL ) ||
-         ( struct_ptr->magic != H5C2__H5C2_JBRB_T_MAGIC ) ) {
+         ( struct_ptr->magic != H5C__H5C_JBRB_T_MAGIC ) ) {
 
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, \
 	     "bad struct_ptr on entry.")
@@ -8811,7 +8811,7 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
 
     if ( struct_ptr->use_aio ) {
 
-        ret_value = H5C2_jb_aio__write_to_buffer(struct_ptr,
+        ret_value = H5C_jb_aio__write_to_buffer(struct_ptr,
                                                  size,
                                                  data,
                                                  is_end_trans,
@@ -8819,7 +8819,7 @@ H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
 
     } else {
 
-        ret_value = H5C2_jb_sio__write_to_buffer(struct_ptr,
+        ret_value = H5C_jb_sio__write_to_buffer(struct_ptr,
                                                  size,
                                                  data,
                                                  is_end_trans,
@@ -8831,5 +8831,5 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 
-} /* end H5C2_jb__write_to_buffer */
+} /* end H5C_jb__write_to_buffer */
 
diff --git a/src/H5C2pkg.h b/src/H5Cpkg.h
index 473636a..08581e6 100644
--- a/src/H5C2pkg.h
+++ b/src/H5Cpkg.h
@@ -17,23 +17,23 @@
  * Programmer: John Mainzer -- 10/12/04
  *
  * Purpose:     This file contains declarations which are normally visible
- *              only within the H5C2 package (just H5C2.c at present).
+ *              only within the H5C package.
  *
- *		Source files outside the H5C2 package should include
- *		H5C2private.h instead.
+ *		Source files outside the H5C package should include
+ *		H5Cprivate.h instead.
  *
- *		The one exception to this rule is test/cache2.c.  The test
+ *		The one exception to this rule is test/cache.c.  The test
  *		code is easier to write if it can look at the cache's
  *		internal data structures.  Indeed, this is the main
  *		reason why this file was created.
  */
 
-#ifndef H5C2_PACKAGE
-#error "Do not include this file outside the H5C2 package!"
+#ifndef H5C_PACKAGE
+#error "Do not include this file outside the H5C package!"
 #endif
 
-#ifndef _H5C2pkg_H
-#define _H5C2pkg_H
+#ifndef _H5Cpkg_H
+#define _H5Cpkg_H
 
 #include <aio.h>
 #include <strings.h>
@@ -41,7 +41,7 @@
 
 
 /* Get package's private header */
-#include "H5C2private.h"
+#include "H5Cprivate.h"
 
 
 /* Get needed headers */
@@ -50,12 +50,12 @@
 
 /******************************************************************************
  *
- * Structure: 		H5C2_jbrb_sync_q_entry_t
+ * Structure: 		H5C_jbrb_sync_q_entry_t
  *
  * Programmer: 		John Mainzer
  * 			2/6/10
  *
- * Purpose:		Instances of the H5C2_jbrb_sync_q_entry_t structure 
+ * Purpose:		Instances of the H5C_jbrb_sync_q_entry_t structure 
  *			are used to maintain a queue of pending aio_fsync()
  *			operations.
  *
@@ -72,9 +72,9 @@
  *
  *
  * magic:		Unsigned 32-bit integer always set to 
- * 			H5C2__H5C2_JBRB_SYNC_Q_T_MAGIC.  This field is used 
+ * 			H5C__H5C_JBRB_SYNC_Q_T_MAGIC.  This field is used 
  *			to validate pointers to instances of 
- *			H5C2_jbrb_sync_q_entry_t.
+ *			H5C_jbrb_sync_q_entry_t.
  *
  * last_trans_in_sync:  ID of the last transaction that will be on disk
  *			when the associated aio_fsync() completes.
@@ -83,29 +83,29 @@
  *			aio_fsync().
  *
  * next:		Pointer to the next instance of 
- *			H5C2_jbrb_sync_q_entry_t in the list of same,
+ *			H5C_jbrb_sync_q_entry_t in the list of same,
  *			or NULL if there is no next instance.
  *
  ******************************************************************************/
 
-#define H5C2__H5C2_JBRB_SYNC_Q_T_MAGIC	(unsigned)0x00DA030
+#define H5C__H5C_JBRB_SYNC_Q_T_MAGIC	(unsigned)0x00DA030
 
-struct H5C2_jbrb_sync_q_entry_t
+struct H5C_jbrb_sync_q_entry_t
 {
     uint32_t				magic;
     uint64_t				last_trans_in_sync;
     struct aiocb			ctl_blk;
-    struct H5C2_jbrb_sync_q_entry_t * 	next;
+    struct H5C_jbrb_sync_q_entry_t * 	next;
 };
 
 /******************************************************************************
  *
- * Structure: 		H5C2_jbrb_t
+ * Structure: 		H5C_jbrb_t
  *
  * Programmer: 		Mike McGreevy <mcgreevy@hdfgroup.org>
  * 			Tuesday, February 5, 2008
  *
- * Purpose:		Instances of the H5C2_jbrb_t structure are used to
+ * Purpose:		Instances of the H5C_jbrb_t structure are used to
  * 			implement a ring buffer of journal buffers. This
  * 			structure is used in association with HDF5 File
  * 			Recovery. It is used to journal metadata cache
@@ -116,8 +116,8 @@ struct H5C2_jbrb_sync_q_entry_t
  *
  *
  * magic:		Unsigned 32-bit integer always set to 
- * 			H5C2__H5C2_JBRB_T_MAGIC.  This field is used to 
- *			validate pointers to instances of H5C2_jbrb_t.
+ * 			H5C__H5C_JBRB_T_MAGIC.  This field is used to 
+ *			validate pointers to instances of H5C_jbrb_t.
  *
  * journal_magic:	int32_t used to store a randomly selected integer
  *			used to tag both the journal file and the 
@@ -291,12 +291,12 @@ struct H5C2_jbrb_sync_q_entry_t
  *
  * The following fields are used to collect statistics on the activities
  * of the journal entry write code.  These fields are only defined when
- * H5C2__JBRB__COLLECT_STATS is TRUE.  Descriptions of the individual
+ * H5C__JBRB__COLLECT_STATS is TRUE.  Descriptions of the individual
  * stats collection fields follow:
  *
  * transactions_completed: uint64_t used to track the number of transactions
  *			completed.  This is simply the number of calls to 
- *			H5C2_jb__end_transaction().
+ *			H5C_jb__end_transaction().
  *
  * buf_writes_queued:	uint64_t used to track the number of asynchronous 
  *			buffer writes queued (via aio_write()).  
@@ -354,35 +354,35 @@ struct H5C2_jbrb_sync_q_entry_t
  *
  ******************************************************************************/
 
-#define H5C2__H5C2_JBRB_T_MAGIC   		(unsigned)0x00D0A03
-#define H5C2__JOURNAL_VERSION			1
-#define H5C2__JBRB__COLLECT_STATS		0
-#define H5C2__JBRB__DUMP_STATS_ON_TAKEDOWN	0
+#define H5C__H5C_JBRB_T_MAGIC   		(unsigned)0x00D0A03
+#define H5C__JOURNAL_VERSION			1
+#define H5C__JBRB__COLLECT_STATS		0
+#define H5C__JBRB__DUMP_STATS_ON_TAKEDOWN	0
 
 /* tags used to mark entries in the journal file header */
-#define H5C2_JNL__VER_NUM_TAG		"ver_num"
-#define H5C2_JNL__TGT_FILE_NAME_TAG	"target_file_name"
-#define H5C2_JNL__JNL_MAGIC_TAG		"journal_magic"
-#define H5C2_JNL__CREATION_DATE_TAG	"creation_date"
-#define H5C2_JNL__HUMAN_READABLE_TAG	"human_readable"
-#define H5C2_JNL__OFFSET_WIDTH_TAG	"offset_width"
-#define H5C2_JNL__LENGTH_WIDTH_TAG	"length_width"
+#define H5C_JNL__VER_NUM_TAG		"ver_num"
+#define H5C_JNL__TGT_FILE_NAME_TAG	"target_file_name"
+#define H5C_JNL__JNL_MAGIC_TAG		"journal_magic"
+#define H5C_JNL__CREATION_DATE_TAG	"creation_date"
+#define H5C_JNL__HUMAN_READABLE_TAG	"human_readable"
+#define H5C_JNL__OFFSET_WIDTH_TAG	"offset_width"
+#define H5C_JNL__LENGTH_WIDTH_TAG	"length_width"
 
 /* signatures and versions used to mark the beginnings of journal file 
  * messages in binary journal files.
  */
 
-#define H5C2_BJNL__SIG_LEN		((size_t)(4))
-#define H5C2_BJNL__BEGIN_TRANS_SIG	"btrn"
-#define H5C2_BJNL__BEGIN_TRANS_VER	((uint8_t)(0))
-#define H5C2_BJNL__JOURNAL_ENTRY_SIG	"jent"
-#define H5C2_BJNL__JOURNAL_ENTRY_VER	((uint8_t)(0))
-#define H5C2_BJNL__END_TRANS_SIG	"etrn"
-#define H5C2_BJNL__END_TRANS_VER	((uint8_t)(0))
-#define H5C2_BJNL__END_ADDR_SPACE_SIG	"eoas"
-#define H5C2_BJNL__END_ADDR_SPACE_VER	((uint8_t)(0))
-
-struct H5C2_jbrb_t 
+#define H5C_BJNL__SIG_LEN		((size_t)(4))
+#define H5C_BJNL__BEGIN_TRANS_SIG	"btrn"
+#define H5C_BJNL__BEGIN_TRANS_VER	((uint8_t)(0))
+#define H5C_BJNL__JOURNAL_ENTRY_SIG	"jent"
+#define H5C_BJNL__JOURNAL_ENTRY_VER	((uint8_t)(0))
+#define H5C_BJNL__END_TRANS_SIG	"etrn"
+#define H5C_BJNL__END_TRANS_VER	((uint8_t)(0))
+#define H5C_BJNL__END_ADDR_SPACE_SIG	"eoas"
+#define H5C_BJNL__END_ADDR_SPACE_VER	((uint8_t)(0))
+
+struct H5C_jbrb_t 
 {
     uint32_t				magic;
     int32_t				journal_magic;
@@ -418,11 +418,11 @@ struct H5C2_jbrb_t
     struct aiocb    			(*aio_ctl_blks)[];
     off_t				aio_next_buf_offset;
     hbool_t				use_aio_fsync;
-    struct H5C2_jbrb_sync_q_entry_t   * aio_sync_q_head;
-    struct H5C2_jbrb_sync_q_entry_t   * aio_sync_q_tail;
+    struct H5C_jbrb_sync_q_entry_t   * aio_sync_q_head;
+    struct H5C_jbrb_sync_q_entry_t   * aio_sync_q_tail;
     uint64_t			 	aio_sync_q_len;
     char 			        *((*buf)[]);
-#if H5C2__JBRB__COLLECT_STATS
+#if H5C__JBRB__COLLECT_STATS
     uint64_t				transactions_completed;
     uint64_t				buf_writes_queued;
     uint64_t				full_buf_writes_queued;
@@ -437,14 +437,14 @@ struct H5C2_jbrb_t
     uint64_t				calls_to_aio_error_awaiting_sync;
     uint64_t				max_sync_q_len;
     uint64_t				calls_to_fsync;
-#endif /* H5C2__JBRB__COLLECT_STATS */
+#endif /* H5C__JBRB__COLLECT_STATS */
 };
 
 
 /* With the introduction of the fractal heap, it is now possible for 
  * entries to be dirtied, resized, and/or renamed in the flush callbacks.
  * As a result, on flushes, it may be necessary to make multiple passes
- * through the slist before it is empty.  The H5C2__MAX_PASSES_ON_FLUSH
+ * through the slist before it is empty.  The H5C__MAX_PASSES_ON_FLUSH
  * #define is used to set an upper limit on the number of passes.
  * The current value was obtained via personal communication with 
  * Quincey.  I have applied a fudge factor of 2.
@@ -452,20 +452,20 @@ struct H5C2_jbrb_t
  *						-- JRM
  */
 
-#define H5C2__MAX_PASSES_ON_FLUSH	4
+#define H5C__MAX_PASSES_ON_FLUSH	4
 
 
 /****************************************************************************
  *
- * structure H5C2_mdjsc_record_t
+ * structure H5C_mdjsc_record_t
  *
- * A dynamically allocate array of instances of H5C2_mdjsc_record_t is 
+ * A dynamically allocate array of instances of H5C_mdjsc_record_t is 
  * used to record metadata journaling status change callbacks -- of which 
  * there can be an arbitrary number.
  *
  * The fields in the structure are discussed individually below:
  *
- * fcn_ptr:	Pointer to the instance of H5C2_mdj_status_change_func_t
+ * fcn_ptr:	Pointer to the instance of H5C_mdj_status_change_func_t
  * 		to be called on metadata journaling start or stop.  NULL
  * 		if this record is not in use.
  *
@@ -482,17 +482,17 @@ struct H5C2_jbrb_t
  *
  ****************************************************************************/
 
-typedef struct H5C2_mdjsc_record_t 
+typedef struct H5C_mdjsc_record_t 
 {
-    H5C2_mdj_status_change_func_t	fcn_ptr;
+    H5C_mdj_status_change_func_t	fcn_ptr;
     void *				data_ptr;
     int32_t				fl_next;
-} H5C2_mdjsc_record_t;
+} H5C_mdjsc_record_t;
 
 
 /****************************************************************************
  *
- * structure H5C2_t
+ * structure H5C_t
  *
  * Catchall structure for all variables specific to an instance of the cache.
  *
@@ -528,9 +528,9 @@ typedef struct H5C2_mdjsc_record_t
  *
  *						JRM - 9/26/05
  *
- * magic:	Unsigned 32 bit integer always set to H5C2__H5C2_T_MAGIC.  
+ * magic:	Unsigned 32 bit integer always set to H5C__H5C_T_MAGIC.  
  * 		This field is used to validate pointers to instances of 
- * 		H5C2_t.
+ * 		H5C_t.
  *
  * flush_in_progress: Boolean flag indicating whether a flush is in 
  * 		progress.
@@ -542,13 +542,13 @@ typedef struct H5C2_mdjsc_record_t
  *
  *              Since much of the code supporting the parallel metadata
  *              cache is in H5AC, we don't write the trace file from 
- *              H5C2.  Instead, H5AC reads the trace_file_ptr as needed.
+ *              H5C.  Instead, H5AC reads the trace_file_ptr as needed.
  *
- *              When we get to using H5C2 in other places, we may add
- *              code to write trace file data at the H5C2 level as well.
+ *              When we get to using H5C in other places, we may add
+ *              code to write trace file data at the H5C level as well.
  *
  * aux_ptr:	Pointer to void used to allow wrapper code to associate
- *		its data with an instance of H5C2_t.  The H5C2 cache code
+ *		its data with an instance of H5C_t.  The H5C cache code
  *		sets this field to NULL, and otherwise leaves it alone.
  *
  * max_type_id:	Integer field containing the maximum type id number assigned
@@ -636,8 +636,8 @@ typedef struct H5C2_mdjsc_record_t
  *              index_size by two should yield a conservative estimate
  *              of the cache's memory footprint.
  *
- * index:	Array of pointer to H5C2_cache_entry_t of size
- *		H5C2__HASH_TABLE_LEN.  At present, this value is a power
+ * index:	Array of pointer to H5C_cache_entry_t of size
+ *		H5C__HASH_TABLE_LEN.  At present, this value is a power
  *		of two, not the usual prime number.
  *
  *		I hope that the variable size of cache elements, the large
@@ -648,8 +648,8 @@ typedef struct H5C2_mdjsc_record_t
  *
  *		If not, it will become evident in the statistics. Changing
  *		to the usual prime number length hash table will require
- *		changing the H5C2__HASH_FCN macro and the deletion of the
- *		H5C2__HASH_MASK #define.  No other changes should be required.
+ *		changing the H5C__HASH_FCN macro and the deletion of the
+ *		H5C__HASH_MASK #define.  No other changes should be required.
  *
  *
  * When we flush the cache, we need to write entries out in increasing
@@ -686,7 +686,7 @@ typedef struct H5C2_mdjsc_record_t
  * the case in which entries may be dirtied, renamed, or have their sizes
  * changed during a flush.  To allow sanity checks in this situation, the
  * following two fields have been added.  They are only compiled in when
- * H5C2_DO_SANITY_CHECKS is TRUE.
+ * H5C_DO_SANITY_CHECKS is TRUE.
  *
  * slist_len_increase: Number of entries that have been added to the 
  * 		slist since the last time this field was set to zero.
@@ -932,20 +932,20 @@ typedef struct H5C2_mdjsc_record_t
  *
  * size_decreased:  Boolean flag set to TRUE whenever the maximun cache
  *		size is decreased.  The flag triggers a call to
- *		H5C2_make_space_in_cache() on the next call to H5C2_protect().
+ *		H5C_make_space_in_cache() on the next call to H5C_protect().
  *
- * resize_ctl:	Instance of H5C2_auto_size_ctl_t containing configuration
+ * resize_ctl:	Instance of H5C_auto_size_ctl_t containing configuration
  * 		data for automatic cache resizing.
  *
  * epoch_markers_active:  Integer field containing the number of epoch
  *		markers currently in use in the LRU list.  This value
- *		must be in the range [0, H5C2__MAX_EPOCH_MARKERS - 1].
+ *		must be in the range [0, H5C__MAX_EPOCH_MARKERS - 1].
  *
- * epoch_marker_active:  Array of boolean of length H5C2__MAX_EPOCH_MARKERS.
+ * epoch_marker_active:  Array of boolean of length H5C__MAX_EPOCH_MARKERS.
  *		This array is used to track which epoch markers are currently
  *		in use.
  *
- * epoch_marker_ringbuf:  Array of int of length H5C2__MAX_EPOCH_MARKERS + 1.
+ * epoch_marker_ringbuf:  Array of int of length H5C__MAX_EPOCH_MARKERS + 1.
  *
  *		To manage the epoch marker cache entries, it is necessary
  *		to track their order in the LRU list.  This is done with
@@ -966,8 +966,8 @@ typedef struct H5C2_mdjsc_record_t
  * epoch_marker_ringbuf_size: Integer field containing the number of entries
  *		in the ring buffer.
  *
- * epoch_markers:  Array of instances of H5C2_cache_entry_t of length
- *		H5C2__MAX_EPOCH_MARKERS.  The entries are used as markers
+ * epoch_markers:  Array of instances of H5C_cache_entry_t of length
+ *		H5C__MAX_EPOCH_MARKERS.  The entries are used as markers
  *		in the LRU list to identify cache entries that haven't
  *		been accessed for some (small) specified number of
  *		epochs.  These entries (if any) can then be evicted and
@@ -979,14 +979,14 @@ typedef struct H5C2_mdjsc_record_t
  *
  *		Epoch markers only appear in the LRU list, never in
  *		the index or slist.  While they are of type
- *		H5C2__EPOCH_MARKER_TYPE, and have associated class
+ *		H5C__EPOCH_MARKER_TYPE, and have associated class
  *		functions, these functions should never be called.
  *
- *		The addr fields of these instances of H5C2_cache_entry_t
+ *		The addr fields of these instances of H5C_cache_entry_t
  *		are set to the index of the instance in the epoch_markers
  *		array, the size is set to 0, and the type field points
  *		to the constant structure epoch_marker_class defined
- *		in H5C2.c.  The next and prev fields are used as usual
+ *		in H5C.c.  The next and prev fields are used as usual
  *		to link the entry into the LRU list.
  *
  *		All other fields are unused.
@@ -1032,7 +1032,7 @@ typedef struct H5C2_mdjsc_record_t
  * 		At least to begin with, transactions will be closely tied
  * 		to user level API calls.
  *
- * trans_api_name: Array of char of length H5C2__MAX_API_NAME_LEN + 1. Used 
+ * trans_api_name: Array of char of length H5C__MAX_API_NAME_LEN + 1. Used 
  * 		to store the name of the API call associated with the 
  * 		current transaction.
  *
@@ -1060,10 +1060,10 @@ typedef struct H5C2_mdjsc_record_t
  * jnl_file_name_len: Length of the journal file name, or zero if the
  *		journal file name is undefined.
  *
- * jnl_file_name: Array of char of length H5C2__MAX_JOURNAL_FILE_NAME_LEN 
+ * jnl_file_name: Array of char of length H5C__MAX_JOURNAL_FILE_NAME_LEN 
  *		+ 1 used to store the journal file path.
  *
- * mdj_jbrb:    Instance of H5C2_jbrb_t used to manage logging of journal
+ * mdj_jbrb:    Instance of H5C_jbrb_t used to manage logging of journal
  * 		entries to the journal file.
  *
  * While a transaction is in progress, we must maintain a list of the 
@@ -1133,15 +1133,15 @@ typedef struct H5C2_mdjsc_record_t
  * cache must be clean when these function are called.
  *
  * The metadata journaling status change callback table is initaly allocated
- * with H5C2__MIN_MDJSC_CB_TBL_LEN entries.  The table size is doubled
+ * with H5C__MIN_MDJSC_CB_TBL_LEN entries.  The table size is doubled
  * whenever an entry is added to a full table, and halved whenever the 
  * active entries to total entries ratio drops below 
- * H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO and the upper half of the table is 
+ * H5C__MDJSC_CB_TBL_MIN_ACTIVE_RATIO and the upper half of the table is 
  * empty (Since entries are removed from the table by specifying the 
  * index of the entry, we can't compress the table).
  *
  * mdjsc_cb_tbl: Base address of a dynamically allocated array of instances
- * 		of H5C2_mdjsc_record_t used to record an arbitrarily long 
+ * 		of H5C_mdjsc_record_t used to record an arbitrarily long 
  * 		list of functions to call whenever journaling is enabled or 
  * 		disabled.
  *
@@ -1160,120 +1160,120 @@ typedef struct H5C2_mdjsc_record_t
  * Statistics collection fields:
  *
  * When enabled, these fields are used to collect statistics as described
- * below.  The first set are collected only when H5C2_COLLECT_CACHE_STATS
+ * below.  The first set are collected only when H5C_COLLECT_CACHE_STATS
  * is true.
  *
- * hits:        Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * hits:        Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *		are used to record the number of times an entry with type id
  *		equal to the array index has been in cache when requested in
  *		the current epoch.
  *
- * misses:      Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * misses:      Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *		are used to record the number of times an entry with type id
  *		equal to the array index has not been in cache when
  *		requested in the current epoch.
  *
- * write_protects:  Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The 
+ * write_protects:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The 
  * 		cells are used to record the number of times an entry with 
  * 		type id equal to the array index has been write protected 
  * 		in the current epoch.
  *
  * 		Observe that (hits + misses) = (write_protects + read_protects).
  *
- * read_protects: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The 
+ * read_protects: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The 
  * 		cells are used to record the number of times an entry with 
  * 		type id equal to the array index has been read protected in 
  * 		the current epoch.
  *
  *              Observe that (hits + misses) = (write_protects + read_protects).
  *
- * max_read_protects:  Array of int32 of length H5C2__MAX_NUM_TYPE_IDS + 1. 
+ * max_read_protects:  Array of int32 of length H5C__MAX_NUM_TYPE_IDS + 1. 
  * 		The cells are used to maximum number of simultaneous read 
  * 		protects on any entry with type id equal to the array index 
  * 		in the current epoch.
  *
- * insertions:  Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * insertions:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *		are used to record the number of times an entry with type
  *		id equal to the array index has been inserted into the
  *		cache in the current epoch.
  *
- * pinned_insertions:  Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  
+ * pinned_insertions:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  
  * 		The cells are used to record the number of times an entry 
  * 		with type id equal to the array index has been inserted 
  * 		pinned into the cache in the current epoch.
  *
- * clears:      Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * clears:      Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *		are used to record the number of times an entry with type
  *		id equal to the array index has been cleared in the current
  *		epoch.
  *
- * flushes:     Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * flushes:     Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *		are used to record the number of times an entry with type id
  *		equal to the array index has been written to disk in the
  *              current epoch.
  *
- * evictions:   Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * evictions:   Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *		are used to record the number of times an entry with type id
  *		equal to the array index has been evicted from the cache in
  *		the current epoch.
  *
- * renames:     Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * renames:     Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *		are used to record the number of times an entry with type
  *		id equal to the array index has been renamed in the current
  *		epoch.
  *
- * entry_flush_renames: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  
+ * entry_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  
  * 		The cells are used to record the number of times an entry 
  * 		with type id equal to the array index has been renamed
  * 		during its flush callback in the current epoch.
  *
- * cache_flush_renames: Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  
+ * cache_flush_renames: Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  
  * 		The cells are used to record the number of times an entry 
  * 		with type id equal to the array index has been renamed
  * 		during a cache flush in the current epoch.
  *
- * pins:        Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * pins:        Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *		are used to record the number of times an entry with type
  *		id equal to the array index has been pinned in the current
  *		epoch.
  *
- * unpins:      Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * unpins:      Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *		are used to record the number of times an entry with type
  *		id equal to the array index has been unpinned in the current
  *		epoch.
  *
- * dirty_pins:	Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * dirty_pins:	Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *		are used to record the number of times an entry with type
  *		id equal to the array index has been marked dirty while pinned
  *		in the current epoch.
  *
- * pinned_flushes:  Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The
+ * pinned_flushes:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The
  * 		cells are used to record the number of times an  entry
  * 		with type id equal to the array index has been flushed while
  * 		pinned in the current epoch.
  *
- * pinned_cleared:  Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The
+ * pinned_cleared:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.  The
  * 		cells are used to record the number of times an  entry
  * 		with type id equal to the array index has been cleared while
  * 		pinned in the current epoch.
  *
- * size_increases:  Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.
+ * size_increases:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.
  *		The cells are used to record the number of times an entry
  *		with type id equal to the array index has increased in
  *		size in the current epoch.
  *
- * size_decreases:  Array of int64 of length H5C2__MAX_NUM_TYPE_IDS + 1.
+ * size_decreases:  Array of int64 of length H5C__MAX_NUM_TYPE_IDS + 1.
  *		The cells are used to record the number of times an entry
  *		with type id equal to the array index has decreased in
  *		size in the current epoch.
  *
  * entry_flush_size_changes:  Array of int64 of length 
- * 		H5C2__MAX_NUM_TYPE_IDS + 1.  The cells are used to record 
+ * 		H5C__MAX_NUM_TYPE_IDS + 1.  The cells are used to record 
  * 		the number of times an entry with type id equal to the 
  * 		array index has changed size while in its flush callback.
  *
  * cache_flush_size_changes:  Array of int64 of length 
- * 		H5C2__MAX_NUM_TYPE_IDS + 1.  The cells are used to record 
+ * 		H5C__MAX_NUM_TYPE_IDS + 1.  The cells are used to record 
  * 		the number of times an entry with type id equal to the 
  * 		array index has changed size during a cache flush
  *
@@ -1321,35 +1321,35 @@ typedef struct H5C2_mdjsc_record_t
  * max_pel_size: Largest value attained by the pel_size field in the
  *              current epoch.
  *
- * The remaining stats are collected only when both H5C2_COLLECT_CACHE_STATS
- * and H5C2_COLLECT_CACHE_ENTRY_STATS are true.
+ * The remaining stats are collected only when both H5C_COLLECT_CACHE_STATS
+ * and H5C_COLLECT_CACHE_ENTRY_STATS are true.
  *
- * max_accesses: Array of int32 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * max_accesses: Array of int32 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *		are used to record the maximum number of times any single
  *		entry with type id equal to the array index has been
  *		accessed in the current epoch.
  *
- * min_accesses: Array of int32 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * min_accesses: Array of int32 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *		are used to record the minimum number of times any single
  *		entry with type id equal to the array index has been
  *		accessed in the current epoch.
  *
- * max_clears:  Array of int32 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * max_clears:  Array of int32 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *		are used to record the maximum number of times any single
  *		entry with type id equal to the array index has been cleared
  *		in the current epoch.
  *
- * max_flushes: Array of int32 of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * max_flushes: Array of int32 of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *		are used to record the maximum number of times any single
  *		entry with type id equal to the array index has been
  *		flushed in the current epoch.
  *
- * max_size:	Array of size_t of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * max_size:	Array of size_t of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *              are used to record the maximum size of any single entry
  *		with type id equal to the array index that has resided in
  *		the cache in the current epoch.
  *
- * max_pins:	Array of size_t of length H5C2__MAX_NUM_TYPE_IDS + 1.  The cells
+ * max_pins:	Array of size_t of length H5C__MAX_NUM_TYPE_IDS + 1.  The cells
  *              are used to record the maximum number of times that any single
  *              entry with type id equal to the array index that has been
  *              marked as pinned in the cache in the current epoch.
@@ -1382,17 +1382,17 @@ typedef struct H5C2_mdjsc_record_t
  *
  ****************************************************************************/
 
-#define H5C2__HASH_TABLE_LEN     (64 * 1024) /* must be a power of 2 */
+#define H5C__HASH_TABLE_LEN     (64 * 1024) /* must be a power of 2 */
 
-#define H5C2__H5C2_T_MAGIC		0x005CAC0F
-#define H5C2__MAX_NUM_TYPE_IDS		18
-#define H5C2__PREFIX_LEN		32
-#define H5C2__MAX_API_NAME_LEN		128
+#define H5C__H5C_T_MAGIC		0x005CAC0F
+#define H5C__MAX_NUM_TYPE_IDS		18
+#define H5C__PREFIX_LEN		32
+#define H5C__MAX_API_NAME_LEN		128
 
-#define H5C2__MIN_MDJSC_CB_TBL_LEN		16
-#define H5C2__MDJSC_CB_TBL_MIN_ACTIVE_RATIO	0.25
+#define H5C__MIN_MDJSC_CB_TBL_LEN		16
+#define H5C__MDJSC_CB_TBL_MIN_ACTIVE_RATIO	0.25
 
-struct H5C2_t
+struct H5C_t
 {
     uint32_t			magic;
 
@@ -1408,50 +1408,50 @@ struct H5C2_t
     size_t                      max_cache_size;
     size_t                      min_clean_size;
 
-    H5C2_write_permitted_func_t	check_write_permitted;
+    H5C_write_permitted_func_t	check_write_permitted;
     hbool_t			write_permitted;
 
-    H5C2_log_flush_func_t	log_flush;
+    H5C_log_flush_func_t	log_flush;
 
     hbool_t			evictions_enabled;
 
     int32_t                     index_len;
     size_t                      index_size;
-    H5C2_cache_entry_t *	(index[H5C2__HASH_TABLE_LEN]);
+    H5C_cache_entry_t *	(index[H5C__HASH_TABLE_LEN]);
 
 
     int32_t                     slist_len;
     size_t                      slist_size;
     H5SL_t *                    slist_ptr;
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
     int64_t			slist_len_increase;
     int64_t			slist_size_increase;
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
     int32_t                     pl_len;
     size_t                      pl_size;
-    H5C2_cache_entry_t *	pl_head_ptr;
-    H5C2_cache_entry_t *  	pl_tail_ptr;
+    H5C_cache_entry_t *	pl_head_ptr;
+    H5C_cache_entry_t *  	pl_tail_ptr;
 
     int32_t                     pel_len;
     size_t                      pel_size;
-    H5C2_cache_entry_t *        pel_head_ptr;
-    H5C2_cache_entry_t *  	pel_tail_ptr;
+    H5C_cache_entry_t *        pel_head_ptr;
+    H5C_cache_entry_t *  	pel_tail_ptr;
 
     int32_t                     LRU_list_len;
     size_t                      LRU_list_size;
-    H5C2_cache_entry_t *	LRU_head_ptr;
-    H5C2_cache_entry_t *	LRU_tail_ptr;
+    H5C_cache_entry_t *	LRU_head_ptr;
+    H5C_cache_entry_t *	LRU_tail_ptr;
 
     int32_t                     cLRU_list_len;
     size_t                      cLRU_list_size;
-    H5C2_cache_entry_t *	cLRU_head_ptr;
-    H5C2_cache_entry_t *	cLRU_tail_ptr;
+    H5C_cache_entry_t *	cLRU_head_ptr;
+    H5C_cache_entry_t *	cLRU_tail_ptr;
 
     int32_t                     dLRU_list_len;
     size_t                      dLRU_list_size;
-    H5C2_cache_entry_t *	dLRU_head_ptr;
-    H5C2_cache_entry_t *	dLRU_tail_ptr;
+    H5C_cache_entry_t *	dLRU_head_ptr;
+    H5C_cache_entry_t *	dLRU_tail_ptr;
 
     hbool_t			size_increase_possible;
     hbool_t                     flash_size_increase_possible;
@@ -1460,70 +1460,70 @@ struct H5C2_t
     hbool_t			resize_enabled;
     hbool_t			cache_full;
     hbool_t			size_decreased;
-    H5C2_auto_size_ctl_t	resize_ctl;
+    H5C_auto_size_ctl_t	resize_ctl;
 
     int32_t			epoch_markers_active;
-    hbool_t			epoch_marker_active[H5C2__MAX_EPOCH_MARKERS];
-    int32_t			epoch_marker_ringbuf[H5C2__MAX_EPOCH_MARKERS+1];
+    hbool_t			epoch_marker_active[H5C__MAX_EPOCH_MARKERS];
+    int32_t			epoch_marker_ringbuf[H5C__MAX_EPOCH_MARKERS+1];
     int32_t			epoch_marker_ringbuf_first;
     int32_t			epoch_marker_ringbuf_last;
     int32_t			epoch_marker_ringbuf_size;
-    H5C2_cache_entry_t		epoch_markers[H5C2__MAX_EPOCH_MARKERS];
+    H5C_cache_entry_t		epoch_markers[H5C__MAX_EPOCH_MARKERS];
 
     int64_t			cache_hits;
     int64_t			cache_accesses;
  
     hbool_t			mdj_enabled;
     hbool_t			trans_in_progress;
-    char			trans_api_name[H5C2__MAX_API_NAME_LEN];
+    char			trans_api_name[H5C__MAX_API_NAME_LEN];
     uint64_t			trans_num;
     uint64_t			last_trans_on_disk;
     int32_t			jnl_magic;
     int32_t			jnl_file_name_len;
-    char 			jnl_file_name[H5C2__MAX_JOURNAL_FILE_NAME_LEN 
+    char 			jnl_file_name[H5C__MAX_JOURNAL_FILE_NAME_LEN 
                                               + 1];
-    struct H5C2_jbrb_t		mdj_jbrb;
+    struct H5C_jbrb_t		mdj_jbrb;
     int32_t			tl_len;
     size_t			tl_size;
-    H5C2_cache_entry_t *	tl_head_ptr;
-    H5C2_cache_entry_t *	tl_tail_ptr;
+    H5C_cache_entry_t *	tl_head_ptr;
+    H5C_cache_entry_t *	tl_tail_ptr;
     int32_t			jwipl_len;
     size_t			jwipl_size;
-    H5C2_cache_entry_t *	jwipl_head_ptr;
-    H5C2_cache_entry_t *	jwipl_tail_ptr;
-    H5C2_mdjsc_record_t *	mdjsc_cb_tbl;
+    H5C_cache_entry_t *	jwipl_head_ptr;
+    H5C_cache_entry_t *	jwipl_tail_ptr;
+    H5C_mdjsc_record_t *	mdjsc_cb_tbl;
     int32_t			mdjsc_cb_tbl_len;
     int32_t			num_mdjsc_cbs;
     int32_t			mdjsc_cb_tbl_fl_head;
     int32_t			mdjsc_cb_tbl_max_idx_in_use;
     
-#if H5C2_COLLECT_CACHE_STATS
+#if H5C_COLLECT_CACHE_STATS
 
     /* stats fields */
-    int64_t                     hits[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     misses[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     write_protects[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     read_protects[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int32_t                     max_read_protects[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     insertions[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     pinned_insertions[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     clears[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     flushes[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     evictions[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     renames[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     entry_flush_renames[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     cache_flush_renames[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     pins[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     unpins[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     dirty_pins[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     pinned_flushes[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     pinned_clears[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     size_increases[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int64_t                     size_decreases[H5C2__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     hits[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     misses[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     write_protects[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     read_protects[H5C__MAX_NUM_TYPE_IDS + 1];
+    int32_t                     max_read_protects[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     insertions[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     pinned_insertions[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     clears[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     flushes[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     evictions[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     renames[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     entry_flush_renames[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     cache_flush_renames[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     pins[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     unpins[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     dirty_pins[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     pinned_flushes[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     pinned_clears[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     size_increases[H5C__MAX_NUM_TYPE_IDS + 1];
+    int64_t                     size_decreases[H5C__MAX_NUM_TYPE_IDS + 1];
     int64_t                     entry_flush_size_changes
-	    				[H5C2__MAX_NUM_TYPE_IDS + 1];
+	    				[H5C__MAX_NUM_TYPE_IDS + 1];
     int64_t                     cache_flush_size_changes
-	    				[H5C2__MAX_NUM_TYPE_IDS + 1];
+	    				[H5C__MAX_NUM_TYPE_IDS + 1];
 
     int64_t			total_ht_insertions;
     int64_t			total_ht_deletions;
@@ -1544,22 +1544,22 @@ struct H5C2_t
     int32_t                     max_pel_len;
     size_t                      max_pel_size;
 
-#if H5C2_COLLECT_CACHE_ENTRY_STATS
+#if H5C_COLLECT_CACHE_ENTRY_STATS
 
-    int32_t                     max_accesses[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int32_t                     min_accesses[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int32_t                     max_clears[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int32_t                     max_flushes[H5C2__MAX_NUM_TYPE_IDS + 1];
-    size_t                      max_size[H5C2__MAX_NUM_TYPE_IDS + 1];
-    int32_t                     max_pins[H5C2__MAX_NUM_TYPE_IDS + 1];
+    int32_t                     max_accesses[H5C__MAX_NUM_TYPE_IDS + 1];
+    int32_t                     min_accesses[H5C__MAX_NUM_TYPE_IDS + 1];
+    int32_t                     max_clears[H5C__MAX_NUM_TYPE_IDS + 1];
+    int32_t                     max_flushes[H5C__MAX_NUM_TYPE_IDS + 1];
+    size_t                      max_size[H5C__MAX_NUM_TYPE_IDS + 1];
+    int32_t                     max_pins[H5C__MAX_NUM_TYPE_IDS + 1];
 
-#endif /* H5C2_COLLECT_CACHE_ENTRY_STATS */
+#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
 
-#endif /* H5C2_COLLECT_CACHE_STATS */
+#endif /* H5C_COLLECT_CACHE_STATS */
 
     hbool_t			skip_file_checks;
     hbool_t			skip_dxpl_id_checks;
-    char			prefix[H5C2__PREFIX_LEN];
+    char			prefix[H5C__PREFIX_LEN];
 };
 
 
@@ -1569,10 +1569,10 @@ struct H5C2_t
 
 /****************************************************************************
  *
- * We maintain doubly linked lists of instances of H5C2_cache_entry_t for a
+ * We maintain doubly linked lists of instances of H5C_cache_entry_t for a
  * variety of reasons -- protected list, LRU list, and the clean and dirty
  * LRU lists at present.  The following macros support linking and unlinking
- * of instances of H5C2_cache_entry_t by both their regular and auxilary next
+ * of instances of H5C_cache_entry_t by both their regular and auxilary next
  * and previous pointers.
  *
  * The size and length fields are also maintained.
@@ -1581,7 +1581,7 @@ struct H5C2_t
  * NULL on entry in the insertion macros.
  *
  * Finally, observe that the sanity checking macros evaluate to the empty
- * string when H5C2_DO_SANITY_CHECKS is FALSE.  They also contain calls
+ * string when H5C_DO_SANITY_CHECKS is FALSE.  They also contain calls
  * to the HGOTO_ERROR macro, which may not be appropriate in all cases.
  * If so, we will need versions of the insertion and deletion macros which
  * do not reference the sanity checking macros.
@@ -1593,7 +1593,7 @@ struct H5C2_t
  *
  *        ( ( (Size) == (entry_ptr)->size ) && ( (len) != 1 ) ) ||
  *
- *    from the H5C2__DLL_PRE_REMOVE_SC macro.  With the addition of the
+ *    from the H5C__DLL_PRE_REMOVE_SC macro.  With the addition of the
  *    epoch markers used in the age out based cache size reduction algorithm,
  *    this invarient need not hold, as the epoch markers are of size 0.
  *
@@ -1610,7 +1610,7 @@ struct H5C2_t
  *                                                     JRM - 12/9/04
  *
  *
- *  - In the H5C2__DLL_PRE_INSERT_SC macro, replaced the lines:
+ *  - In the H5C__DLL_PRE_INSERT_SC macro, replaced the lines:
  *
  *    ( ( (len) == 1 ) &&
  *      ( ( (head_ptr) != (tail_ptr) ) || ( (Size) <= 0 ) ||
@@ -1633,7 +1633,7 @@ struct H5C2_t
  *    caused compiler warnings.
  *                                                     JRM - 12/22/04
  *
- *  - In the H5C2__DLL_SC macro, replaced the lines:
+ *  - In the H5C__DLL_SC macro, replaced the lines:
  *
  *    ( ( (len) == 1 ) &&
  *      ( ( (head_ptr) != (tail_ptr) ) || ( (cache_ptr)->size <= 0 ) ||
@@ -1656,14 +1656,14 @@ struct H5C2_t
  *    caused compiler warnings.
  *                                                     JRM - 1/10/05
  *
- *  - Added the H5C2__DLL_UPDATE_FOR_SIZE_CHANGE macro and the associated
+ *  - Added the H5C__DLL_UPDATE_FOR_SIZE_CHANGE macro and the associated
  *    sanity checking macros.  These macro are used to update the size of
  *    a DLL when one of its entries changes size.
  *
  *							JRM - 9/8/05
  *
  *  - Added a set of macros supporting doubly linked lists using the new 
- *    trans_next and trans_prev fields in H5C2_cache_entry_t.  These 
+ *    trans_next and trans_prev fields in H5C_cache_entry_t.  These 
  *    fields are used to maintain a list of entries that have been dirtied
  *    in the current transaction.  At the end of the transaction, this 
  *    list is used to generate the needed journal entries.
@@ -1672,9 +1672,9 @@ struct H5C2_t
  *
  ****************************************************************************/
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
 
-#define H5C2__DLL_PRE_REMOVE_SC(entry_ptr, head_ptr, tail_ptr, len, Size, fv) \
+#define H5C__DLL_PRE_REMOVE_SC(entry_ptr, head_ptr, tail_ptr, len, Size, fv) \
 if ( ( (head_ptr) == NULL ) ||                                               \
      ( (tail_ptr) == NULL ) ||                                               \
      ( (entry_ptr) == NULL ) ||                                              \
@@ -1695,7 +1695,7 @@ if ( ( (head_ptr) == NULL ) ||                                               \
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, (fv), "DLL pre remove SC failed")     \
 }
 
-#define H5C2__DLL_SC(head_ptr, tail_ptr, len, Size, fv)                   \
+#define H5C__DLL_SC(head_ptr, tail_ptr, len, Size, fv)                   \
 if ( ( ( ( (head_ptr) == NULL ) || ( (tail_ptr) == NULL ) ) &&           \
        ( (head_ptr) != (tail_ptr) )                                      \
      ) ||                                                                \
@@ -1715,7 +1715,7 @@ if ( ( ( ( (head_ptr) == NULL ) || ( (tail_ptr) == NULL ) ) &&           \
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, (fv), "DLL sanity check failed")  \
 }
 
-#define H5C2__DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len, Size, fv) \
+#define H5C__DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len, Size, fv) \
 if ( ( (entry_ptr) == NULL ) ||                                              \
      ( (entry_ptr)->next != NULL ) ||                                        \
      ( (entry_ptr)->prev != NULL ) ||                                        \
@@ -1737,7 +1737,7 @@ if ( ( (entry_ptr) == NULL ) ||                                              \
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, (fv), "DLL pre insert SC failed")     \
 }
 
-#define H5C2__DLL_PRE_SIZE_UPDATE_SC(dll_len, dll_size, old_size, new_size)    \
+#define H5C__DLL_PRE_SIZE_UPDATE_SC(dll_len, dll_size, old_size, new_size)    \
 if ( ( (dll_len) <= 0 ) ||                                                    \
      ( (dll_size) <= 0 ) ||                                                   \
      ( (old_size) <= 0 ) ||                                                   \
@@ -1747,25 +1747,25 @@ if ( ( (dll_len) <= 0 ) ||                                                    \
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "DLL pre size update SC failed") \
 }
 
-#define H5C2__DLL_POST_SIZE_UPDATE_SC(dll_len, dll_size, old_size, new_size)    \
+#define H5C__DLL_POST_SIZE_UPDATE_SC(dll_len, dll_size, old_size, new_size)    \
 if ( ( (new_size) > (dll_size) ) ||                                            \
      ( ( (dll_len) == 1 ) && ( (new_size) != (dll_size) ) ) ) {                \
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "DLL post size update SC failed") \
 }
 
-#else /* H5C2_DO_SANITY_CHECKS */
+#else /* H5C_DO_SANITY_CHECKS */
 
-#define H5C2__DLL_PRE_REMOVE_SC(entry_ptr, head_ptr, tail_ptr, len, Size, fv)
-#define H5C2__DLL_SC(head_ptr, tail_ptr, len, Size, fv)
-#define H5C2__DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len, Size, fv)
-#define H5C2__DLL_PRE_SIZE_UPDATE_SC(dll_len, dll_size, old_size, new_size)
-#define H5C2__DLL_POST_SIZE_UPDATE_SC(dll_len, dll_size, old_size, new_size)
+#define H5C__DLL_PRE_REMOVE_SC(entry_ptr, head_ptr, tail_ptr, len, Size, fv)
+#define H5C__DLL_SC(head_ptr, tail_ptr, len, Size, fv)
+#define H5C__DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len, Size, fv)
+#define H5C__DLL_PRE_SIZE_UPDATE_SC(dll_len, dll_size, old_size, new_size)
+#define H5C__DLL_POST_SIZE_UPDATE_SC(dll_len, dll_size, old_size, new_size)
 
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
 
-#define H5C2__DLL_APPEND(entry_ptr, head_ptr, tail_ptr, len, Size, fail_val) \
-        H5C2__DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len, Size,    \
+#define H5C__DLL_APPEND(entry_ptr, head_ptr, tail_ptr, len, Size, fail_val) \
+        H5C__DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len, Size,    \
                                fail_val)                                    \
         if ( (head_ptr) == NULL )                                           \
         {                                                                   \
@@ -1781,8 +1781,8 @@ if ( ( (new_size) > (dll_size) ) ||                                            \
         (len)++;                                                            \
         (Size) += (entry_ptr)->size;
 
-#define H5C2__DLL_PREPEND(entry_ptr, head_ptr, tail_ptr, len, Size, fail_val) \
-        H5C2__DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len, Size,     \
+#define H5C__DLL_PREPEND(entry_ptr, head_ptr, tail_ptr, len, Size, fail_val) \
+        H5C__DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len, Size,     \
                                fail_val)                                     \
         if ( (head_ptr) == NULL )                                            \
         {                                                                    \
@@ -1798,8 +1798,8 @@ if ( ( (new_size) > (dll_size) ) ||                                            \
         (len)++;                                                             \
         (Size) += entry_ptr->size;
 
-#define H5C2__DLL_REMOVE(entry_ptr, head_ptr, tail_ptr, len, Size, fail_val) \
-        H5C2__DLL_PRE_REMOVE_SC(entry_ptr, head_ptr, tail_ptr, len, Size,    \
+#define H5C__DLL_REMOVE(entry_ptr, head_ptr, tail_ptr, len, Size, fail_val) \
+        H5C__DLL_PRE_REMOVE_SC(entry_ptr, head_ptr, tail_ptr, len, Size,    \
                                fail_val)                                    \
         {                                                                   \
            if ( (head_ptr) == (entry_ptr) )                                 \
@@ -1832,15 +1832,15 @@ if ( ( (new_size) > (dll_size) ) ||                                            \
            (Size) -= entry_ptr->size;                                       \
         }
 
-#define H5C2__DLL_UPDATE_FOR_SIZE_CHANGE(dll_len, dll_size, old_size, new_size) \
-        H5C2__DLL_PRE_SIZE_UPDATE_SC(dll_len, dll_size, old_size, new_size)     \
+#define H5C__DLL_UPDATE_FOR_SIZE_CHANGE(dll_len, dll_size, old_size, new_size) \
+        H5C__DLL_PRE_SIZE_UPDATE_SC(dll_len, dll_size, old_size, new_size)     \
 	(dll_size) -= (old_size);                                              \
 	(dll_size) += (new_size);                                              \
-        H5C2__DLL_POST_SIZE_UPDATE_SC(dll_len, dll_size, old_size, new_size)
+        H5C__DLL_POST_SIZE_UPDATE_SC(dll_len, dll_size, old_size, new_size)
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
 
-#define H5C2__AUX_DLL_PRE_REMOVE_SC(entry_ptr, hd_ptr, tail_ptr, len, Size, fv) \
+#define H5C__AUX_DLL_PRE_REMOVE_SC(entry_ptr, hd_ptr, tail_ptr, len, Size, fv) \
 if ( ( (hd_ptr) == NULL ) ||                                                   \
      ( (tail_ptr) == NULL ) ||                                                 \
      ( (entry_ptr) == NULL ) ||                                                \
@@ -1861,7 +1861,7 @@ if ( ( (hd_ptr) == NULL ) ||                                                   \
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, (fv), "aux DLL pre remove SC failed")   \
 }
 
-#define H5C2__AUX_DLL_SC(head_ptr, tail_ptr, len, Size, fv)                 \
+#define H5C__AUX_DLL_SC(head_ptr, tail_ptr, len, Size, fv)                 \
 if ( ( ( ( (head_ptr) == NULL ) || ( (tail_ptr) == NULL ) ) &&              \
        ( (head_ptr) != (tail_ptr) )                                         \
      ) ||                                                                   \
@@ -1881,7 +1881,7 @@ if ( ( ( ( (head_ptr) == NULL ) || ( (tail_ptr) == NULL ) ) &&              \
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, (fv), "AUX DLL sanity check failed") \
 }
 
-#define H5C2__AUX_DLL_PRE_INSERT_SC(entry_ptr, hd_ptr, tail_ptr, len, Size, fv)\
+#define H5C__AUX_DLL_PRE_INSERT_SC(entry_ptr, hd_ptr, tail_ptr, len, Size, fv)\
 if ( ( (entry_ptr) == NULL ) ||                                                \
      ( (entry_ptr)->aux_next != NULL ) ||                                      \
      ( (entry_ptr)->aux_prev != NULL ) ||                                      \
@@ -1903,17 +1903,17 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, (fv), "AUX DLL pre insert SC failed")   \
 }
 
-#else /* H5C2_DO_SANITY_CHECKS */
+#else /* H5C_DO_SANITY_CHECKS */
 
-#define H5C2__AUX_DLL_PRE_REMOVE_SC(entry_ptr, hd_ptr, tail_ptr, len, Size, fv)
-#define H5C2__AUX_DLL_SC(head_ptr, tail_ptr, len, Size, fv)
-#define H5C2__AUX_DLL_PRE_INSERT_SC(entry_ptr, hd_ptr, tail_ptr, len, Size, fv)
+#define H5C__AUX_DLL_PRE_REMOVE_SC(entry_ptr, hd_ptr, tail_ptr, len, Size, fv)
+#define H5C__AUX_DLL_SC(head_ptr, tail_ptr, len, Size, fv)
+#define H5C__AUX_DLL_PRE_INSERT_SC(entry_ptr, hd_ptr, tail_ptr, len, Size, fv)
 
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
 
-#define H5C2__AUX_DLL_APPEND(entry_ptr, head_ptr, tail_ptr, len, Size, fail_val)\
-        H5C2__AUX_DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len, Size,   \
+#define H5C__AUX_DLL_APPEND(entry_ptr, head_ptr, tail_ptr, len, Size, fail_val)\
+        H5C__AUX_DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len, Size,   \
                                    fail_val)                                    \
         if ( (head_ptr) == NULL )                                               \
         {                                                                       \
@@ -1929,8 +1929,8 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
         (len)++;                                                                \
         (Size) += entry_ptr->size;
 
-#define H5C2__AUX_DLL_PREPEND(entry_ptr, head_ptr, tail_ptr, len, Size, fv)   \
-        H5C2__AUX_DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len, Size, \
+#define H5C__AUX_DLL_PREPEND(entry_ptr, head_ptr, tail_ptr, len, Size, fv)   \
+        H5C__AUX_DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len, Size, \
                                    fv)                                        \
         if ( (head_ptr) == NULL )                                             \
         {                                                                     \
@@ -1946,8 +1946,8 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
         (len)++;                                                              \
         (Size) += entry_ptr->size;
 
-#define H5C2__AUX_DLL_REMOVE(entry_ptr, head_ptr, tail_ptr, len, Size, fv)    \
-        H5C2__AUX_DLL_PRE_REMOVE_SC(entry_ptr, head_ptr, tail_ptr, len, Size, \
+#define H5C__AUX_DLL_REMOVE(entry_ptr, head_ptr, tail_ptr, len, Size, fv)    \
+        H5C__AUX_DLL_PRE_REMOVE_SC(entry_ptr, head_ptr, tail_ptr, len, Size, \
                                    fv)                                        \
         {                                                                     \
            if ( (head_ptr) == (entry_ptr) )                                   \
@@ -1980,9 +1980,9 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
            (Size) -= entry_ptr->size;                                         \
         }
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
 
-#define H5C2__TRANS_DLL_PRE_REMOVE_SC(entry_ptr, hd_ptr, tail_ptr,             \
+#define H5C__TRANS_DLL_PRE_REMOVE_SC(entry_ptr, hd_ptr, tail_ptr,             \
 		                      len, Size, fv)                           \
 if ( ( (hd_ptr) == NULL ) ||                                                   \
      ( (tail_ptr) == NULL ) ||                                                 \
@@ -2025,7 +2025,7 @@ if ( ( (hd_ptr) == NULL ) ||                                                   \
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, (fv), "TRANS DLL pre remove SC failed") \
 }
 
-#define H5C2__TRANS_DLL_SC(head_ptr, tail_ptr, len, Size, fv)                 \
+#define H5C__TRANS_DLL_SC(head_ptr, tail_ptr, len, Size, fv)                 \
 if ( ( ( ( (head_ptr) == NULL ) || ( (tail_ptr) == NULL ) ) &&                \
        ( (head_ptr) != (tail_ptr) )                                           \
      ) ||                                                                     \
@@ -2045,7 +2045,7 @@ if ( ( ( ( (head_ptr) == NULL ) || ( (tail_ptr) == NULL ) ) &&                \
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, (fv), "TRANS DLL sanity check failed") \
 }
 
-#define H5C2__TRANS_DLL_PRE_INSERT_SC(entry_ptr, hd_ptr, tail_ptr,             \
+#define H5C__TRANS_DLL_PRE_INSERT_SC(entry_ptr, hd_ptr, tail_ptr,             \
 		                      len, Size, fv)                           \
 if ( ( (entry_ptr) == NULL ) ||                                                \
      ( ! ((entry_ptr)->is_dirty) ) ||                                          \
@@ -2069,18 +2069,18 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, (fv), "TRANS DLL pre insert SC failed") \
 }
 
-#else /* H5C2_DO_SANITY_CHECKS */
+#else /* H5C_DO_SANITY_CHECKS */
 
-#define H5C2__TRANS_DLL_PRE_REMOVE_SC(entry_ptr, hd_ptr, tail_ptr, len, Size, fv)
-#define H5C2__TRANS_DLL_SC(head_ptr, tail_ptr, len, Size, fv)
-#define H5C2__TRANS_DLL_PRE_INSERT_SC(entry_ptr, hd_ptr, tail_ptr, len, Size, fv)
+#define H5C__TRANS_DLL_PRE_REMOVE_SC(entry_ptr, hd_ptr, tail_ptr, len, Size, fv)
+#define H5C__TRANS_DLL_SC(head_ptr, tail_ptr, len, Size, fv)
+#define H5C__TRANS_DLL_PRE_INSERT_SC(entry_ptr, hd_ptr, tail_ptr, len, Size, fv)
 
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
 
-#define H5C2__TRANS_DLL_APPEND(entry_ptr, head_ptr, tail_ptr, len,             \
+#define H5C__TRANS_DLL_APPEND(entry_ptr, head_ptr, tail_ptr, len,             \
 		               Size, fail_val)                                 \
-        H5C2__TRANS_DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len,      \
+        H5C__TRANS_DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len,      \
 			              Size, fail_val)                          \
         if ( (head_ptr) == NULL )                                              \
         {                                                                      \
@@ -2096,8 +2096,8 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
         (len)++;                                                               \
         (Size) += entry_ptr->size;
 
-#define H5C2__TRANS_DLL_PREPEND(entry_ptr, head_ptr, tail_ptr, len, Size, fv)  \
-        H5C2__TRANS_DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len,      \
+#define H5C__TRANS_DLL_PREPEND(entry_ptr, head_ptr, tail_ptr, len, Size, fv)  \
+        H5C__TRANS_DLL_PRE_INSERT_SC(entry_ptr, head_ptr, tail_ptr, len,      \
 			              Size, fv)                                \
         if ( (head_ptr) == NULL )                                              \
         {                                                                      \
@@ -2113,8 +2113,8 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
         (len)++;                                                               \
         (Size) += entry_ptr->size;
 
-#define H5C2__TRANS_DLL_REMOVE(entry_ptr, head_ptr, tail_ptr, len, Size, fv) \
-        H5C2__TRANS_DLL_PRE_REMOVE_SC(entry_ptr, head_ptr, tail_ptr, len,    \
+#define H5C__TRANS_DLL_REMOVE(entry_ptr, head_ptr, tail_ptr, len, Size, fv) \
+        H5C__TRANS_DLL_PRE_REMOVE_SC(entry_ptr, head_ptr, tail_ptr, len,    \
 			              Size, fv)                              \
         {                                                                    \
            if ( (head_ptr) == (entry_ptr) )                                  \
@@ -2156,7 +2156,7 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
  * is enabled, and evaluate to the empty string when it is not.
  *
  * The sole exception to this rule is
- * H5C2__UPDATE_CACHE_HIT_RATE_STATS(), which is always active as
+ * H5C__UPDATE_CACHE_HIT_RATE_STATS(), which is always active as
  * the cache hit rate stats are always collected and available.
  *
  * Changes:
@@ -2168,23 +2168,23 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
  * 	More pinned entry stats related updates.
  *
  * 	JRM -- 3/31/07
- * 	Updated H5C2__UPDATE_STATS_FOR_PROTECT() to keep stats on 
+ * 	Updated H5C__UPDATE_STATS_FOR_PROTECT() to keep stats on 
  * 	read and write protects.
  *
  ***********************************************************************/
 
-#define H5C2__UPDATE_CACHE_HIT_RATE_STATS(cache_ptr, hit) \
+#define H5C__UPDATE_CACHE_HIT_RATE_STATS(cache_ptr, hit) \
         (cache_ptr->cache_accesses)++;                   \
         if ( hit ) {                                     \
             (cache_ptr->cache_hits)++;                   \
         }                                                \
 
-#if H5C2_COLLECT_CACHE_STATS
+#if H5C_COLLECT_CACHE_STATS
 
-#define H5C2__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr) \
+#define H5C__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr) \
 	(((cache_ptr)->dirty_pins)[(entry_ptr)->type->id])++;
 
-#define H5C2__UPDATE_STATS_FOR_UNPROTECT(cache_ptr)                   \
+#define H5C__UPDATE_STATS_FOR_UNPROTECT(cache_ptr)                   \
         if ( (cache_ptr)->slist_len > (cache_ptr)->max_slist_len )   \
 	    (cache_ptr)->max_slist_len = (cache_ptr)->slist_len;     \
         if ( (cache_ptr)->slist_size > (cache_ptr)->max_slist_size ) \
@@ -2194,7 +2194,7 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
 	if ( (cache_ptr)->pel_size > (cache_ptr)->max_pel_size )     \
 	    (cache_ptr)->max_pel_size = (cache_ptr)->pel_size;
 
-#define H5C2__UPDATE_STATS_FOR_RENAME(cache_ptr, entry_ptr)               \
+#define H5C__UPDATE_STATS_FOR_RENAME(cache_ptr, entry_ptr)               \
 	if ( cache_ptr->flush_in_progress ) {                            \
             ((cache_ptr)->cache_flush_renames[(entry_ptr)->type->id])++; \
 	}                                                                \
@@ -2203,7 +2203,7 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
 	}                                                                \
 	(((cache_ptr)->renames)[(entry_ptr)->type->id])++;
 
-#define H5C2__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(cache_ptr, entry_ptr, new_size)\
+#define H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(cache_ptr, entry_ptr, new_size)\
 	if ( cache_ptr->flush_in_progress ) {                                   \
             ((cache_ptr)->cache_flush_size_changes[(entry_ptr)->type->id])++;   \
 	}                                                                       \
@@ -2222,13 +2222,13 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
 	    ((cache_ptr)->size_decreases[(entry_ptr)->type->id])++;             \
 	}
 
-#define H5C2__UPDATE_STATS_FOR_HT_INSERTION(cache_ptr) \
+#define H5C__UPDATE_STATS_FOR_HT_INSERTION(cache_ptr) \
 	(cache_ptr)->total_ht_insertions++;
 
-#define H5C2__UPDATE_STATS_FOR_HT_DELETION(cache_ptr) \
+#define H5C__UPDATE_STATS_FOR_HT_DELETION(cache_ptr) \
 	(cache_ptr)->total_ht_deletions++;
 
-#define H5C2__UPDATE_STATS_FOR_HT_SEARCH(cache_ptr, success, depth) \
+#define H5C__UPDATE_STATS_FOR_HT_SEARCH(cache_ptr, success, depth) \
 	if ( success ) {                                            \
 	    (cache_ptr)->successful_ht_searches++;                  \
 	    (cache_ptr)->total_successful_ht_search_depth += depth; \
@@ -2237,32 +2237,32 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
 	    (cache_ptr)->total_failed_ht_search_depth += depth;     \
 	}
 
-#define H5C2__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr) \
+#define H5C__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr) \
 	((cache_ptr)->unpins)[(entry_ptr)->type->id]++;
 
-#if H5C2_COLLECT_CACHE_ENTRY_STATS
+#if H5C_COLLECT_CACHE_ENTRY_STATS
 
-#define H5C2__RESET_CACHE_ENTRY_STATS(entry_ptr) \
+#define H5C__RESET_CACHE_ENTRY_STATS(entry_ptr) \
         (entry_ptr)->accesses = 0;               \
         (entry_ptr)->clears   = 0;               \
         (entry_ptr)->flushes  = 0;               \
 	(entry_ptr)->pins     = 0;
 
-#define H5C2__UPDATE_STATS_FOR_CLEAR(cache_ptr, entry_ptr)           \
+#define H5C__UPDATE_STATS_FOR_CLEAR(cache_ptr, entry_ptr)           \
 	(((cache_ptr)->clears)[(entry_ptr)->type->id])++;            \
         if ( (entry_ptr)->is_pinned ) {                              \
 	    (((cache_ptr)->pinned_clears)[(entry_ptr)->type->id])++; \
 	}                                                            \
         ((entry_ptr)->clears)++;
 
-#define H5C2__UPDATE_STATS_FOR_FLUSH(cache_ptr, entry_ptr)            \
+#define H5C__UPDATE_STATS_FOR_FLUSH(cache_ptr, entry_ptr)            \
 	(((cache_ptr)->flushes)[(entry_ptr)->type->id])++;            \
         if ( (entry_ptr)->is_pinned ) {                               \
 	    (((cache_ptr)->pinned_flushes)[(entry_ptr)->type->id])++; \
 	}                                                             \
         ((entry_ptr)->flushes)++;
 
-#define H5C2__UPDATE_STATS_FOR_EVICTION(cache_ptr, entry_ptr)       \
+#define H5C__UPDATE_STATS_FOR_EVICTION(cache_ptr, entry_ptr)       \
 	(((cache_ptr)->evictions)[(entry_ptr)->type->id])++;        \
         if ( (entry_ptr)->accesses >                                \
              ((cache_ptr)->max_accesses)[(entry_ptr)->type->id] ) { \
@@ -2295,7 +2295,7 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
                  = (entry_ptr)->pins;                               \
         }
 
-#define H5C2__UPDATE_STATS_FOR_INSERTION(cache_ptr, entry_ptr)           \
+#define H5C__UPDATE_STATS_FOR_INSERTION(cache_ptr, entry_ptr)           \
 	(((cache_ptr)->insertions)[(entry_ptr)->type->id])++;            \
 	if ( (entry_ptr)->is_pinned ) {                                  \
 	    (((cache_ptr)->pinned_insertions)[(entry_ptr)->type->id])++; \
@@ -2320,7 +2320,7 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
                  = (entry_ptr)->size;                                    \
         }
 
-#define H5C2__UPDATE_STATS_FOR_PROTECT(cache_ptr, entry_ptr, hit)            \
+#define H5C__UPDATE_STATS_FOR_PROTECT(cache_ptr, entry_ptr, hit)            \
 	if ( hit )                                                           \
             ((cache_ptr)->hits)[(entry_ptr)->type->id]++;                    \
 	else                                                                 \
@@ -2350,7 +2350,7 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
         }                                                                    \
         ((entry_ptr)->accesses)++;
 
-#define H5C2__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)         \
+#define H5C__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)         \
 	((cache_ptr)->pins)[(entry_ptr)->type->id]++;            \
         (entry_ptr)->pins++;                                     \
 	if ( (cache_ptr)->pel_len > (cache_ptr)->max_pel_len )   \
@@ -2358,26 +2358,26 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
 	if ( (cache_ptr)->pel_size > (cache_ptr)->max_pel_size ) \
 	    (cache_ptr)->max_pel_size = (cache_ptr)->pel_size;
 
-#else /* H5C2_COLLECT_CACHE_ENTRY_STATS */
+#else /* H5C_COLLECT_CACHE_ENTRY_STATS */
 
-#define H5C2__RESET_CACHE_ENTRY_STATS(entry_ptr)
+#define H5C__RESET_CACHE_ENTRY_STATS(entry_ptr)
 
-#define H5C2__UPDATE_STATS_FOR_CLEAR(cache_ptr, entry_ptr)            \
+#define H5C__UPDATE_STATS_FOR_CLEAR(cache_ptr, entry_ptr)            \
         if ( (entry_ptr)->is_pinned ) {                               \
 	    (((cache_ptr)->pinned_clears)[(entry_ptr)->type->id])++;  \
 	}                                                             \
 	(((cache_ptr)->clears)[(entry_ptr)->type->id])++;
 
-#define H5C2__UPDATE_STATS_FOR_FLUSH(cache_ptr, entry_ptr)            \
+#define H5C__UPDATE_STATS_FOR_FLUSH(cache_ptr, entry_ptr)            \
 	(((cache_ptr)->flushes)[(entry_ptr)->type->id])++;            \
         if ( (entry_ptr)->is_pinned ) {                               \
 	    (((cache_ptr)->pinned_flushes)[(entry_ptr)->type->id])++; \
 	}
 
-#define H5C2__UPDATE_STATS_FOR_EVICTION(cache_ptr, entry_ptr) \
+#define H5C__UPDATE_STATS_FOR_EVICTION(cache_ptr, entry_ptr) \
 	(((cache_ptr)->evictions)[(entry_ptr)->type->id])++;
 
-#define H5C2__UPDATE_STATS_FOR_INSERTION(cache_ptr, entry_ptr)           \
+#define H5C__UPDATE_STATS_FOR_INSERTION(cache_ptr, entry_ptr)           \
 	(((cache_ptr)->insertions)[(entry_ptr)->type->id])++;            \
 	if ( (entry_ptr)->is_pinned ) {                                  \
 	    (((cache_ptr)->pinned_insertions)[(entry_ptr)->type->id])++; \
@@ -2396,7 +2396,7 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
         if ( (cache_ptr)->slist_size > (cache_ptr)->max_slist_size )     \
 	    (cache_ptr)->max_slist_size = (cache_ptr)->slist_size;
 
-#define H5C2__UPDATE_STATS_FOR_PROTECT(cache_ptr, entry_ptr, hit)            \
+#define H5C__UPDATE_STATS_FOR_PROTECT(cache_ptr, entry_ptr, hit)            \
 	if ( hit )                                                           \
             ((cache_ptr)->hits)[(entry_ptr)->type->id]++;                    \
 	else                                                                 \
@@ -2420,34 +2420,34 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
         if ( (cache_ptr)->pl_size > (cache_ptr)->max_pl_size )               \
             (cache_ptr)->max_pl_size = (cache_ptr)->pl_size;
 
-#define H5C2__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)         \
+#define H5C__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)         \
 	((cache_ptr)->pins)[(entry_ptr)->type->id]++;            \
 	if ( (cache_ptr)->pel_len > (cache_ptr)->max_pel_len )   \
 	    (cache_ptr)->max_pel_len = (cache_ptr)->pel_len;     \
 	if ( (cache_ptr)->pel_size > (cache_ptr)->max_pel_size ) \
 	    (cache_ptr)->max_pel_size = (cache_ptr)->pel_size;
 
-#endif /* H5C2_COLLECT_CACHE_ENTRY_STATS */
+#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
 
-#else /* H5C2_COLLECT_CACHE_STATS */
+#else /* H5C_COLLECT_CACHE_STATS */
 
-#define H5C2__RESET_CACHE_ENTRY_STATS(entry_ptr)
-#define H5C2__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr)
-#define H5C2__UPDATE_STATS_FOR_UNPROTECT(cache_ptr)
-#define H5C2__UPDATE_STATS_FOR_RENAME(cache_ptr, entry_ptr)
-#define H5C2__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(cache_ptr, entry_ptr, new_size)
-#define H5C2__UPDATE_STATS_FOR_HT_INSERTION(cache_ptr)
-#define H5C2__UPDATE_STATS_FOR_HT_DELETION(cache_ptr)
-#define H5C2__UPDATE_STATS_FOR_HT_SEARCH(cache_ptr, success, depth)
-#define H5C2__UPDATE_STATS_FOR_INSERTION(cache_ptr, entry_ptr)
-#define H5C2__UPDATE_STATS_FOR_CLEAR(cache_ptr, entry_ptr)
-#define H5C2__UPDATE_STATS_FOR_FLUSH(cache_ptr, entry_ptr)
-#define H5C2__UPDATE_STATS_FOR_EVICTION(cache_ptr, entry_ptr)
-#define H5C2__UPDATE_STATS_FOR_PROTECT(cache_ptr, entry_ptr, hit)
-#define H5C2__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)
-#define H5C2__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr)
+#define H5C__RESET_CACHE_ENTRY_STATS(entry_ptr)
+#define H5C__UPDATE_STATS_FOR_DIRTY_PIN(cache_ptr, entry_ptr)
+#define H5C__UPDATE_STATS_FOR_UNPROTECT(cache_ptr)
+#define H5C__UPDATE_STATS_FOR_RENAME(cache_ptr, entry_ptr)
+#define H5C__UPDATE_STATS_FOR_ENTRY_SIZE_CHANGE(cache_ptr, entry_ptr, new_size)
+#define H5C__UPDATE_STATS_FOR_HT_INSERTION(cache_ptr)
+#define H5C__UPDATE_STATS_FOR_HT_DELETION(cache_ptr)
+#define H5C__UPDATE_STATS_FOR_HT_SEARCH(cache_ptr, success, depth)
+#define H5C__UPDATE_STATS_FOR_INSERTION(cache_ptr, entry_ptr)
+#define H5C__UPDATE_STATS_FOR_CLEAR(cache_ptr, entry_ptr)
+#define H5C__UPDATE_STATS_FOR_FLUSH(cache_ptr, entry_ptr)
+#define H5C__UPDATE_STATS_FOR_EVICTION(cache_ptr, entry_ptr)
+#define H5C__UPDATE_STATS_FOR_PROTECT(cache_ptr, entry_ptr, hit)
+#define H5C__UPDATE_STATS_FOR_PIN(cache_ptr, entry_ptr)
+#define H5C__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr)
 
-#endif /* H5C2_COLLECT_CACHE_STATS */
+#endif /* H5C_COLLECT_CACHE_STATS */
 
 
 /***********************************************************************
@@ -2462,61 +2462,61 @@ if ( ( (entry_ptr) == NULL ) ||                                                \
  *
  ***********************************************************************/
 
-/* H5C2__HASH_TABLE_LEN is defined in H5C2pkg.h.  It mut be a power of two. */
+/* H5C__HASH_TABLE_LEN is defined in H5Cpkg.h.  It mut be a power of two. */
 
-#define H5C2__HASH_MASK		((size_t)(H5C2__HASH_TABLE_LEN - 1) << 3)
+#define H5C__HASH_MASK		((size_t)(H5C__HASH_TABLE_LEN - 1) << 3)
 
-#define H5C2__HASH_FCN(x)	(int)(((x) & H5C2__HASH_MASK) >> 3)
+#define H5C__HASH_FCN(x)	(int)(((x) & H5C__HASH_MASK) >> 3)
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
 
-#define H5C2__PRE_HT_INSERT_SC(cache_ptr, entry_ptr, fail_val) \
+#define H5C__PRE_HT_INSERT_SC(cache_ptr, entry_ptr, fail_val) \
 if ( ( (cache_ptr) == NULL ) ||                                \
-     ( (cache_ptr)->magic != H5C2__H5C2_T_MAGIC ) ||           \
+     ( (cache_ptr)->magic != H5C__H5C_T_MAGIC ) ||           \
      ( (entry_ptr) == NULL ) ||                                \
      ( ! H5F_addr_defined((entry_ptr)->addr) ) ||              \
      ( (entry_ptr)->ht_next != NULL ) ||                       \
      ( (entry_ptr)->ht_prev != NULL ) ||                       \
      ( (entry_ptr)->size <= 0 ) ||                             \
-     ( (k = H5C2__HASH_FCN((entry_ptr)->addr)) < 0 ) ||        \
-     ( k >= H5C2__HASH_TABLE_LEN ) ) {                         \
+     ( (k = H5C__HASH_FCN((entry_ptr)->addr)) < 0 ) ||        \
+     ( k >= H5C__HASH_TABLE_LEN ) ) {                         \
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, fail_val,               \
                "Pre HT insert SC failed")                      \
 }
 
-#define H5C2__PRE_HT_REMOVE_SC(cache_ptr, entry_ptr)                    \
+#define H5C__PRE_HT_REMOVE_SC(cache_ptr, entry_ptr)                    \
 if ( ( (cache_ptr) == NULL ) ||                                         \
-     ( (cache_ptr)->magic != H5C2__H5C2_T_MAGIC ) ||                    \
+     ( (cache_ptr)->magic != H5C__H5C_T_MAGIC ) ||                    \
      ( (cache_ptr)->index_len < 1 ) ||                                  \
      ( (entry_ptr) == NULL ) ||                                         \
      ( (cache_ptr)->index_size < (entry_ptr)->size ) ||                 \
      ( ! H5F_addr_defined((entry_ptr)->addr) ) ||                       \
      ( (entry_ptr)->size <= 0 ) ||                                      \
-     ( H5C2__HASH_FCN((entry_ptr)->addr) < 0 ) ||                       \
-     ( H5C2__HASH_FCN((entry_ptr)->addr) >= H5C2__HASH_TABLE_LEN ) ||   \
-     ( ((cache_ptr)->index)[(H5C2__HASH_FCN((entry_ptr)->addr))]        \
+     ( H5C__HASH_FCN((entry_ptr)->addr) < 0 ) ||                       \
+     ( H5C__HASH_FCN((entry_ptr)->addr) >= H5C__HASH_TABLE_LEN ) ||   \
+     ( ((cache_ptr)->index)[(H5C__HASH_FCN((entry_ptr)->addr))]        \
        == NULL ) ||                                                     \
-     ( ( ((cache_ptr)->index)[(H5C2__HASH_FCN((entry_ptr)->addr))]      \
+     ( ( ((cache_ptr)->index)[(H5C__HASH_FCN((entry_ptr)->addr))]      \
        != (entry_ptr) ) &&                                              \
        ( (entry_ptr)->ht_prev == NULL ) ) ||                            \
-     ( ( ((cache_ptr)->index)[(H5C2__HASH_FCN((entry_ptr)->addr))] ==   \
+     ( ( ((cache_ptr)->index)[(H5C__HASH_FCN((entry_ptr)->addr))] ==   \
          (entry_ptr) ) &&                                               \
        ( (entry_ptr)->ht_prev != NULL ) ) ) {                           \
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Pre HT remove SC failed") \
 }
 
-#define H5C2__PRE_HT_SEARCH_SC(cache_ptr, Addr, fail_val)                    \
+#define H5C__PRE_HT_SEARCH_SC(cache_ptr, Addr, fail_val)                    \
 if ( ( (cache_ptr) == NULL ) ||                                              \
-     ( (cache_ptr)->magic != H5C2__H5C2_T_MAGIC ) ||                         \
+     ( (cache_ptr)->magic != H5C__H5C_T_MAGIC ) ||                         \
      ( ! H5F_addr_defined(Addr) ) ||                                         \
-     ( H5C2__HASH_FCN(Addr) < 0 ) ||                                         \
-     ( H5C2__HASH_FCN(Addr) >= H5C2__HASH_TABLE_LEN ) ) {                    \
+     ( H5C__HASH_FCN(Addr) < 0 ) ||                                         \
+     ( H5C__HASH_FCN(Addr) >= H5C__HASH_TABLE_LEN ) ) {                    \
     HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, fail_val, "Pre HT search SC failed")  \
 }
 
-#define H5C2__POST_SUC_HT_SEARCH_SC(cache_ptr, entry_ptr, Addr, k, fail_val) \
+#define H5C__POST_SUC_HT_SEARCH_SC(cache_ptr, entry_ptr, Addr, k, fail_val) \
 if ( ( (cache_ptr) == NULL ) ||                                              \
-     ( (cache_ptr)->magic != H5C2__H5C2_T_MAGIC ) ||                         \
+     ( (cache_ptr)->magic != H5C__H5C_T_MAGIC ) ||                         \
      ( (cache_ptr)->index_len < 1 ) ||                                       \
      ( (entry_ptr) == NULL ) ||                                              \
      ( (cache_ptr)->index_size < (entry_ptr)->size ) ||                      \
@@ -2535,7 +2535,7 @@ if ( ( (cache_ptr) == NULL ) ||                                              \
                 "Post successful HT search SC failed")                       \
 }
 
-#define H5C2__POST_HT_SHIFT_TO_FRONT(cache_ptr, entry_ptr, k, fail_val) \
+#define H5C__POST_HT_SHIFT_TO_FRONT(cache_ptr, entry_ptr, k, fail_val) \
 if ( ( (cache_ptr) == NULL ) ||                                         \
      ( ((cache_ptr)->index)[k] != (entry_ptr) ) ||                      \
      ( (entry_ptr)->ht_prev != NULL ) ) {                               \
@@ -2543,7 +2543,7 @@ if ( ( (cache_ptr) == NULL ) ||                                         \
                 "Post HT shift to front SC failed")                     \
 }
 
-#define H5C2__PRE_HT_ENTRY_SIZE_CHANGE_SC(cache_ptr, old_size, new_size) \
+#define H5C__PRE_HT_ENTRY_SIZE_CHANGE_SC(cache_ptr, old_size, new_size) \
 if ( ( (cache_ptr) == NULL ) ||                                          \
      ( (cache_ptr)->index_len <= 0 ) ||                                  \
      ( (cache_ptr)->index_size <= 0 ) ||                                 \
@@ -2556,7 +2556,7 @@ if ( ( (cache_ptr) == NULL ) ||                                          \
                 "Pre HT entry size change SC failed")                    \
 }
 
-#define H5C2__POST_HT_ENTRY_SIZE_CHANGE_SC(cache_ptr, old_size, new_size) \
+#define H5C__POST_HT_ENTRY_SIZE_CHANGE_SC(cache_ptr, old_size, new_size) \
 if ( ( (cache_ptr) == NULL ) ||                                           \
      ( (cache_ptr)->index_len <= 0 ) ||                                   \
      ( (cache_ptr)->index_size <= 0 ) ||                                  \
@@ -2567,24 +2567,24 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                 "Post HT entry size change SC failed")                    \
 }
 
-#else /* H5C2_DO_SANITY_CHECKS */
+#else /* H5C_DO_SANITY_CHECKS */
 
-#define H5C2__PRE_HT_INSERT_SC(cache_ptr, entry_ptr, fail_val)
-#define H5C2__PRE_HT_REMOVE_SC(cache_ptr, entry_ptr)
-#define H5C2__PRE_HT_SEARCH_SC(cache_ptr, Addr, fail_val)
-#define H5C2__POST_SUC_HT_SEARCH_SC(cache_ptr, entry_ptr, Addr, k, fail_val)
-#define H5C2__POST_HT_SHIFT_TO_FRONT(cache_ptr, entry_ptr, k, fail_val)
-#define H5C2__PRE_HT_ENTRY_SIZE_CHANGE_SC(cache_ptr, old_size, new_size)
-#define H5C2__POST_HT_ENTRY_SIZE_CHANGE_SC(cache_ptr, old_size, new_size)
+#define H5C__PRE_HT_INSERT_SC(cache_ptr, entry_ptr, fail_val)
+#define H5C__PRE_HT_REMOVE_SC(cache_ptr, entry_ptr)
+#define H5C__PRE_HT_SEARCH_SC(cache_ptr, Addr, fail_val)
+#define H5C__POST_SUC_HT_SEARCH_SC(cache_ptr, entry_ptr, Addr, k, fail_val)
+#define H5C__POST_HT_SHIFT_TO_FRONT(cache_ptr, entry_ptr, k, fail_val)
+#define H5C__PRE_HT_ENTRY_SIZE_CHANGE_SC(cache_ptr, old_size, new_size)
+#define H5C__POST_HT_ENTRY_SIZE_CHANGE_SC(cache_ptr, old_size, new_size)
 
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
 
-#define H5C2__INSERT_IN_INDEX(cache_ptr, entry_ptr, fail_val) \
+#define H5C__INSERT_IN_INDEX(cache_ptr, entry_ptr, fail_val) \
 {                                                             \
     int k;                                                    \
-    H5C2__PRE_HT_INSERT_SC(cache_ptr, entry_ptr, fail_val)    \
-    k = H5C2__HASH_FCN((entry_ptr)->addr);                    \
+    H5C__PRE_HT_INSERT_SC(cache_ptr, entry_ptr, fail_val)    \
+    k = H5C__HASH_FCN((entry_ptr)->addr);                    \
     if ( ((cache_ptr)->index)[k] == NULL )                    \
     {                                                         \
         ((cache_ptr)->index)[k] = (entry_ptr);                \
@@ -2597,14 +2597,14 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     }                                                         \
     (cache_ptr)->index_len++;                                 \
     (cache_ptr)->index_size += (entry_ptr)->size;             \
-    H5C2__UPDATE_STATS_FOR_HT_INSERTION(cache_ptr)            \
+    H5C__UPDATE_STATS_FOR_HT_INSERTION(cache_ptr)            \
 }
 
-#define H5C2__DELETE_FROM_INDEX(cache_ptr, entry_ptr)         \
+#define H5C__DELETE_FROM_INDEX(cache_ptr, entry_ptr)         \
 {                                                             \
     int k;                                                    \
-    H5C2__PRE_HT_REMOVE_SC(cache_ptr, entry_ptr)              \
-    k = H5C2__HASH_FCN((entry_ptr)->addr);                    \
+    H5C__PRE_HT_REMOVE_SC(cache_ptr, entry_ptr)              \
+    k = H5C__HASH_FCN((entry_ptr)->addr);                    \
     if ( (entry_ptr)->ht_next )                               \
     {                                                         \
         (entry_ptr)->ht_next->ht_prev = (entry_ptr)->ht_prev; \
@@ -2621,15 +2621,15 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     (entry_ptr)->ht_prev = NULL;                              \
     (cache_ptr)->index_len--;                                 \
     (cache_ptr)->index_size -= (entry_ptr)->size;             \
-    H5C2__UPDATE_STATS_FOR_HT_DELETION(cache_ptr)             \
+    H5C__UPDATE_STATS_FOR_HT_DELETION(cache_ptr)             \
 }
 
-#define H5C2__SEARCH_INDEX(cache_ptr, Addr, entry_ptr, fail_val)             \
+#define H5C__SEARCH_INDEX(cache_ptr, Addr, entry_ptr, fail_val)             \
 {                                                                            \
     int k;                                                                   \
     int depth = 0;                                                           \
-    H5C2__PRE_HT_SEARCH_SC(cache_ptr, Addr, fail_val)                        \
-    k = H5C2__HASH_FCN(Addr);                                                \
+    H5C__PRE_HT_SEARCH_SC(cache_ptr, Addr, fail_val)                        \
+    k = H5C__HASH_FCN(Addr);                                                \
     entry_ptr = ((cache_ptr)->index)[k];                                     \
     while ( ( entry_ptr ) && ( H5F_addr_ne(Addr, (entry_ptr)->addr) ) )      \
     {                                                                        \
@@ -2638,7 +2638,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     }                                                                        \
     if ( entry_ptr )                                                         \
     {                                                                        \
-        H5C2__POST_SUC_HT_SEARCH_SC(cache_ptr, entry_ptr, Addr, k, fail_val) \
+        H5C__POST_SUC_HT_SEARCH_SC(cache_ptr, entry_ptr, Addr, k, fail_val) \
         if ( entry_ptr != ((cache_ptr)->index)[k] )                          \
         {                                                                    \
             if ( (entry_ptr)->ht_next )                                      \
@@ -2651,18 +2651,18 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
             (entry_ptr)->ht_next = ((cache_ptr)->index)[k];                  \
             (entry_ptr)->ht_prev = NULL;                                     \
             ((cache_ptr)->index)[k] = (entry_ptr);                           \
-            H5C2__POST_HT_SHIFT_TO_FRONT(cache_ptr, entry_ptr, k, fail_val)  \
+            H5C__POST_HT_SHIFT_TO_FRONT(cache_ptr, entry_ptr, k, fail_val)  \
         }                                                                    \
     }                                                                        \
-    H5C2__UPDATE_STATS_FOR_HT_SEARCH(cache_ptr, (entry_ptr != NULL), depth)  \
+    H5C__UPDATE_STATS_FOR_HT_SEARCH(cache_ptr, (entry_ptr != NULL), depth)  \
 }
 
-#define H5C2__SEARCH_INDEX_NO_STATS(cache_ptr, Addr, entry_ptr, fail_val)    \
+#define H5C__SEARCH_INDEX_NO_STATS(cache_ptr, Addr, entry_ptr, fail_val)    \
 {                                                                            \
     int k;                                                                   \
     int depth = 0;                                                           \
-    H5C2__PRE_HT_SEARCH_SC(cache_ptr, Addr, fail_val)                        \
-    k = H5C2__HASH_FCN(Addr);                                                \
+    H5C__PRE_HT_SEARCH_SC(cache_ptr, Addr, fail_val)                        \
+    k = H5C__HASH_FCN(Addr);                                                \
     entry_ptr = ((cache_ptr)->index)[k];                                     \
     while ( ( entry_ptr ) && ( H5F_addr_ne(Addr, (entry_ptr)->addr) ) )      \
     {                                                                        \
@@ -2671,7 +2671,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     }                                                                        \
     if ( entry_ptr )                                                         \
     {                                                                        \
-        H5C2__POST_SUC_HT_SEARCH_SC(cache_ptr, entry_ptr, Addr, k, fail_val) \
+        H5C__POST_SUC_HT_SEARCH_SC(cache_ptr, entry_ptr, Addr, k, fail_val) \
         if ( entry_ptr != ((cache_ptr)->index)[k] )                          \
         {                                                                    \
             if ( (entry_ptr)->ht_next )                                      \
@@ -2684,17 +2684,17 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
             (entry_ptr)->ht_next = ((cache_ptr)->index)[k];                  \
             (entry_ptr)->ht_prev = NULL;                                     \
             ((cache_ptr)->index)[k] = (entry_ptr);                           \
-            H5C2__POST_HT_SHIFT_TO_FRONT(cache_ptr, entry_ptr, k, fail_val)  \
+            H5C__POST_HT_SHIFT_TO_FRONT(cache_ptr, entry_ptr, k, fail_val)  \
         }                                                                    \
     }                                                                        \
 }
 
-#define H5C2__UPDATE_INDEX_FOR_SIZE_CHANGE(cache_ptr, old_size, new_size) \
+#define H5C__UPDATE_INDEX_FOR_SIZE_CHANGE(cache_ptr, old_size, new_size) \
 {                                                                         \
-    H5C2__PRE_HT_ENTRY_SIZE_CHANGE_SC(cache_ptr, old_size, new_size)      \
+    H5C__PRE_HT_ENTRY_SIZE_CHANGE_SC(cache_ptr, old_size, new_size)      \
     (cache_ptr)->index_size -= old_size;                                  \
     (cache_ptr)->index_size += new_size;                                  \
-    H5C2__POST_HT_ENTRY_SIZE_CHANGE_SC(cache_ptr, old_size, new_size)     \
+    H5C__POST_HT_ENTRY_SIZE_CHANGE_SC(cache_ptr, old_size, new_size)     \
 }
 
 
@@ -2709,10 +2709,10 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__INSERT_ENTRY_IN_SLIST
+ * Macro:	H5C__INSERT_ENTRY_IN_SLIST
  *
- * Purpose:     Insert the specified instance of H5C2_cache_entry_t into
- *		the skip list in the specified instance of H5C2_t.  Update
+ * Purpose:     Insert the specified instance of H5C_cache_entry_t into
+ *		the skip list in the specified instance of H5C_t.  Update
  *		the associated length and size fields.
  *
  * Return:      N/A
@@ -2731,8 +2731,8 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *		hash table.
  *
  *		JRM -- 7/27/04
- *		Converted the function H5C2_insert_entry_in_tree() into
- *		the macro H5C2__INSERT_ENTRY_IN_TREE in the hopes of
+ *		Converted the function H5C_insert_entry_in_tree() into
+ *		the macro H5C__INSERT_ENTRY_IN_TREE in the hopes of
  *		wringing a little more speed out of the cache.
  *
  *		Note that we don't bother to check if the entry is already
@@ -2745,7 +2745,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *		Added fail_val parameter.
  *
  *		JRM -- 8/25/06
- *		Added the H5C2_DO_SANITY_CHECKS version of the macro.
+ *		Added the H5C_DO_SANITY_CHECKS version of the macro.
  *
  *		This version maintains the slist_len_increase and 
  *		slist_size_increase fields that are used in sanity
@@ -2758,12 +2758,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *-------------------------------------------------------------------------
  */
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
 
-#define H5C2__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, fail_val)            \
+#define H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, fail_val)            \
 {                                                                              \
     HDassert( (cache_ptr) );                                                   \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                      \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                      \
     HDassert( (entry_ptr) );                                                   \
     HDassert( (entry_ptr)->size > 0 );                                         \
     HDassert( H5F_addr_defined((entry_ptr)->addr) );                           \
@@ -2783,14 +2783,14 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     HDassert( (cache_ptr)->slist_len > 0 );                                    \
     HDassert( (cache_ptr)->slist_size > 0 );                                   \
                                                                                \
-} /* H5C2__INSERT_ENTRY_IN_SLIST */
+} /* H5C__INSERT_ENTRY_IN_SLIST */
 
-#else /* H5C2_DO_SANITY_CHECKS */
+#else /* H5C_DO_SANITY_CHECKS */
 
-#define H5C2__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, fail_val)            \
+#define H5C__INSERT_ENTRY_IN_SLIST(cache_ptr, entry_ptr, fail_val)            \
 {                                                                              \
     HDassert( (cache_ptr) );                                                   \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                      \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                      \
     HDassert( (entry_ptr) );                                                   \
     HDassert( (entry_ptr)->size > 0 );                                         \
     HDassert( H5F_addr_defined((entry_ptr)->addr) );                           \
@@ -2808,17 +2808,17 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     HDassert( (cache_ptr)->slist_len > 0 );                                    \
     HDassert( (cache_ptr)->slist_size > 0 );                                   \
                                                                                \
-} /* H5C2__INSERT_ENTRY_IN_SLIST */
+} /* H5C__INSERT_ENTRY_IN_SLIST */
 
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2__REMOVE_ENTRY_FROM_SLIST
+ * Function:    H5C__REMOVE_ENTRY_FROM_SLIST
  *
- * Purpose:     Remove the specified instance of H5C2_cache_entry_t from the
- *		index skip list in the specified instance of H5C2_t.  Update
+ * Purpose:     Remove the specified instance of H5C_cache_entry_t from the
+ *		index skip list in the specified instance of H5C_t.  Update
  *		the associated length and size fields.
  *
  * Return:      N/A
@@ -2831,8 +2831,8 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *		Updated function for the addition of the hash table.
  *
  *		JRM - 7/27/04
- *		Converted from the function H5C2_remove_entry_from_tree()
- *		to the macro H5C2__REMOVE_ENTRY_FROM_TREE in the hopes of
+ *		Converted from the function H5C_remove_entry_from_tree()
+ *		to the macro H5C__REMOVE_ENTRY_FROM_TREE in the hopes of
  *		wringing a little more performance out of the cache.
  *
  *		QAK -- 11/27/04
@@ -2840,15 +2840,15 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *
  *		JRM -- 3/28/07
  *		Updated sanity checks for the new is_read_only and 
- *		ro_ref_count fields in H5C2_cache_entry_t.
+ *		ro_ref_count fields in H5C_cache_entry_t.
  *
  *-------------------------------------------------------------------------
  */
 
-#define H5C2__REMOVE_ENTRY_FROM_SLIST(cache_ptr, entry_ptr)         \
+#define H5C__REMOVE_ENTRY_FROM_SLIST(cache_ptr, entry_ptr)         \
 {                                                                   \
     HDassert( (cache_ptr) );                                        \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );           \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );           \
     HDassert( (entry_ptr) );                                        \
     HDassert( !((entry_ptr)->is_protected) );                       \
     HDassert( !((entry_ptr)->is_read_only) );                       \
@@ -2868,12 +2868,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     HDassert( (cache_ptr)->slist_size >= (entry_ptr)->size );       \
     (cache_ptr)->slist_size -= (entry_ptr)->size;                   \
     (entry_ptr)->in_slist = FALSE;                                  \
-} /* H5C2__REMOVE_ENTRY_FROM_SLIST */
+} /* H5C__REMOVE_ENTRY_FROM_SLIST */
 
 
 /*-------------------------------------------------------------------------
  *
- * Function:    H5C2__UPDATE_SLIST_FOR_SIZE_CHANGE
+ * Function:    H5C__UPDATE_SLIST_FOR_SIZE_CHANGE
  *
  * Purpose:     Update cache_ptr->slist_size for a change in the size of
  *		and entry in the slist.
@@ -2885,7 +2885,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  * Modifications:
  *
  *		JRM -- 8/27/06
- *		Added the H5C2_DO_SANITY_CHECKS version of the macro.
+ *		Added the H5C_DO_SANITY_CHECKS version of the macro.
  *
  *		This version maintains the slist_size_increase field 
  *		that are used in sanity checks in the flush routines.
@@ -2897,12 +2897,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *-------------------------------------------------------------------------
  */
 
-#if H5C2_DO_SANITY_CHECKS
+#if H5C_DO_SANITY_CHECKS
 
-#define H5C2__UPDATE_SLIST_FOR_SIZE_CHANGE(cache_ptr, old_size, new_size) \
+#define H5C__UPDATE_SLIST_FOR_SIZE_CHANGE(cache_ptr, old_size, new_size) \
 {                                                                         \
     HDassert( (cache_ptr) );                                              \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                 \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                 \
     HDassert( (old_size) > 0 );                                           \
     HDassert( (new_size) > 0 );                                           \
     HDassert( (old_size) <= (cache_ptr)->slist_size );                    \
@@ -2919,14 +2919,14 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     HDassert( (new_size) <= (cache_ptr)->slist_size );                    \
     HDassert( ( (cache_ptr)->slist_len > 1 ) ||                           \
               ( (cache_ptr)->slist_size == (new_size) ) );                \
-} /* H5C2__REMOVE_ENTRY_FROM_SLIST */
+} /* H5C__REMOVE_ENTRY_FROM_SLIST */
 
-#else /* H5C2_DO_SANITY_CHECKS */
+#else /* H5C_DO_SANITY_CHECKS */
 
-#define H5C2__UPDATE_SLIST_FOR_SIZE_CHANGE(cache_ptr, old_size, new_size) \
+#define H5C__UPDATE_SLIST_FOR_SIZE_CHANGE(cache_ptr, old_size, new_size) \
 {                                                                         \
     HDassert( (cache_ptr) );                                              \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                 \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                 \
     HDassert( (old_size) > 0 );                                           \
     HDassert( (new_size) > 0 );                                           \
     HDassert( (old_size) <= (cache_ptr)->slist_size );                    \
@@ -2940,9 +2940,9 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     HDassert( (new_size) <= (cache_ptr)->slist_size );                    \
     HDassert( ( (cache_ptr)->slist_len > 1 ) ||                           \
               ( (cache_ptr)->slist_size == (new_size) ) );                \
-} /* H5C2__REMOVE_ENTRY_FROM_SLIST */
+} /* H5C__REMOVE_ENTRY_FROM_SLIST */
 
-#endif /* H5C2_DO_SANITY_CHECKS */
+#endif /* H5C_DO_SANITY_CHECKS */
 
 
 /**************************************************************************
@@ -2956,7 +2956,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__FAKE_RP_FOR_MOST_RECENT_ACCESS
+ * Macro:	H5C__FAKE_RP_FOR_MOST_RECENT_ACCESS
  *
  * Purpose:     For efficiency, we sometimes change the order of flushes --
  *		but doing so can confuse the replacement policy.  This
@@ -2983,7 +2983,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *
  *		JRM -- 3/28/07
  *		Added sanity checks using the new is_read_only and 
- *		ro_ref_count fields of struct H5C2_cache_entry_t.
+ *		ro_ref_count fields of struct H5C_cache_entry_t.
  *
  *		JRM -- 3/29/08
  *		Added a sanity check to verify that the target entry
@@ -2992,12 +2992,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *-------------------------------------------------------------------------
  */
 
-#if H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
+#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
 
-#define H5C2__FAKE_RP_FOR_MOST_RECENT_ACCESS(cache_ptr, entry_ptr, fail_val) \
+#define H5C__FAKE_RP_FOR_MOST_RECENT_ACCESS(cache_ptr, entry_ptr, fail_val) \
 {                                                                            \
     HDassert( (cache_ptr) );                                                 \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                    \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                    \
     HDassert( (entry_ptr) );                                                 \
     HDassert( !((entry_ptr)->is_protected) );                                \
     HDassert( !((entry_ptr)->is_read_only) );                                \
@@ -3012,12 +3012,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
         /* remove the entry from the LRU list, and re-insert it at the head. \
 	 */                                                                  \
                                                                              \
-        H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,             \
+        H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,             \
                         (cache_ptr)->LRU_tail_ptr,                           \
 			(cache_ptr)->LRU_list_len,                           \
                         (cache_ptr)->LRU_list_size, (fail_val))              \
                                                                              \
-        H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,            \
+        H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,            \
                          (cache_ptr)->LRU_tail_ptr,                          \
 			 (cache_ptr)->LRU_list_len,                          \
                          (cache_ptr)->LRU_list_size, (fail_val))             \
@@ -3031,22 +3031,22 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
          */                                                                  \
                                                                              \
         if ( (entry_ptr)->is_dirty ) {                                       \
-            H5C2__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->dLRU_head_ptr,    \
+            H5C__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->dLRU_head_ptr,    \
                                 (cache_ptr)->dLRU_tail_ptr,                  \
                                 (cache_ptr)->dLRU_list_len,                  \
                                 (cache_ptr)->dLRU_list_size, (fail_val))     \
                                                                              \
-            H5C2__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->dLRU_head_ptr,   \
+            H5C__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->dLRU_head_ptr,   \
                                  (cache_ptr)->dLRU_tail_ptr,                 \
                                  (cache_ptr)->dLRU_list_len,                 \
                                  (cache_ptr)->dLRU_list_size, (fail_val))    \
         } else {                                                             \
-            H5C2__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->cLRU_head_ptr,    \
+            H5C__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->cLRU_head_ptr,    \
                                 (cache_ptr)->cLRU_tail_ptr,                  \
                                 (cache_ptr)->cLRU_list_len,                  \
                                 (cache_ptr)->cLRU_list_size, (fail_val))     \
                                                                              \
-            H5C2__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->cLRU_head_ptr,   \
+            H5C__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->cLRU_head_ptr,   \
                                  (cache_ptr)->cLRU_tail_ptr,                 \
                                  (cache_ptr)->cLRU_list_len,                 \
                                  (cache_ptr)->cLRU_list_size, (fail_val))    \
@@ -3054,14 +3054,14 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                              \
         /* End modified LRU specific code. */                                \
     }                                                                        \
-} /* H5C2__FAKE_RP_FOR_MOST_RECENT_ACCESS */
+} /* H5C__FAKE_RP_FOR_MOST_RECENT_ACCESS */
 
-#else /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#else /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
-#define H5C2__FAKE_RP_FOR_MOST_RECENT_ACCESS(cache_ptr, entry_ptr, fail_val) \
+#define H5C__FAKE_RP_FOR_MOST_RECENT_ACCESS(cache_ptr, entry_ptr, fail_val) \
 {                                                                            \
     HDassert( (cache_ptr) );                                                 \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                    \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                    \
     HDassert( (entry_ptr) );                                                 \
     HDassert( !((entry_ptr)->is_protected) );                                \
     HDassert( !((entry_ptr)->is_read_only) );                                \
@@ -3076,26 +3076,26 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
         /* remove the entry from the LRU list, and re-insert it at the head  \
 	 */                                                                  \
                                                                              \
-        H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,             \
+        H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,             \
                         (cache_ptr)->LRU_tail_ptr,                           \
 			(cache_ptr)->LRU_list_len,                           \
                         (cache_ptr)->LRU_list_size, (fail_val))              \
                                                                              \
-        H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,            \
+        H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,            \
                          (cache_ptr)->LRU_tail_ptr,                          \
 			 (cache_ptr)->LRU_list_len,                          \
                          (cache_ptr)->LRU_list_size, (fail_val))             \
                                                                              \
         /* End modified LRU specific code. */                                \
     }                                                                        \
-} /* H5C2__FAKE_RP_FOR_MOST_RECENT_ACCESS */
+} /* H5C__FAKE_RP_FOR_MOST_RECENT_ACCESS */
 
-#endif /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__UPDATE_RP_FOR_EVICTION
+ * Macro:	H5C__UPDATE_RP_FOR_EVICTION
  *
  * Purpose:     Update the replacement policy data structures for an
  *		eviction of the specified cache entry.
@@ -3112,8 +3112,8 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  * Modifications:
  *
  *		JRM - 7/27/04
- *		Converted the function H5C2_update_rp_for_eviction() to the
- *		macro H5C2__UPDATE_RP_FOR_EVICTION in an effort to squeeze
+ *		Converted the function H5C_update_rp_for_eviction() to the
+ *		macro H5C__UPDATE_RP_FOR_EVICTION in an effort to squeeze
  *		a bit more performance out of the cache.
  *
  *		At least for the first cut, I am leaving the comments and
@@ -3131,7 +3131,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *
  *		JRM -- 3/28/07
  *		Added sanity checks for the new is_read_only and 
- *		ro_ref_count fields of struct H5C2_cache_entry_t.
+ *		ro_ref_count fields of struct H5C_cache_entry_t.
  *
  *		JRM -- 3/29/08
  *		Added sanity check to verify that the evicted entry
@@ -3140,12 +3140,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *-------------------------------------------------------------------------
  */
 
-#if H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
+#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
 
-#define H5C2__UPDATE_RP_FOR_EVICTION(cache_ptr, entry_ptr, fail_val)         \
+#define H5C__UPDATE_RP_FOR_EVICTION(cache_ptr, entry_ptr, fail_val)         \
 {                                                                            \
     HDassert( (cache_ptr) );                                                 \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                    \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                    \
     HDassert( (entry_ptr) );                                                 \
     HDassert( !((entry_ptr)->is_protected) );                                \
     HDassert( !((entry_ptr)->is_read_only) );                                \
@@ -3158,7 +3158,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                              \
     /* remove the entry from the LRU list. */                                \
                                                                              \
-    H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,                 \
+    H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,                 \
                     (cache_ptr)->LRU_tail_ptr, (cache_ptr)->LRU_list_len,    \
                     (cache_ptr)->LRU_list_size, (fail_val))                  \
                                                                              \
@@ -3170,25 +3170,25 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                              \
     if ( (entry_ptr)->is_dirty ) {                                           \
                                                                              \
-        H5C2__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->dLRU_head_ptr,        \
+        H5C__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->dLRU_head_ptr,        \
                             (cache_ptr)->dLRU_tail_ptr,                      \
                             (cache_ptr)->dLRU_list_len,                      \
                             (cache_ptr)->dLRU_list_size, (fail_val))         \
     } else {                                                                 \
-        H5C2__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->cLRU_head_ptr,        \
+        H5C__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->cLRU_head_ptr,        \
                             (cache_ptr)->cLRU_tail_ptr,                      \
                             (cache_ptr)->cLRU_list_len,                      \
                             (cache_ptr)->cLRU_list_size, (fail_val))         \
     }                                                                        \
                                                                              \
-} /* H5C2__UPDATE_RP_FOR_EVICTION */
+} /* H5C__UPDATE_RP_FOR_EVICTION */
 
-#else /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#else /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
-#define H5C2__UPDATE_RP_FOR_EVICTION(cache_ptr, entry_ptr, fail_val)         \
+#define H5C__UPDATE_RP_FOR_EVICTION(cache_ptr, entry_ptr, fail_val)         \
 {                                                                            \
     HDassert( (cache_ptr) );                                                 \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                    \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                    \
     HDassert( (entry_ptr) );                                                 \
     HDassert( !((entry_ptr)->is_protected) );                                \
     HDassert( !((entry_ptr)->is_read_only) );                                \
@@ -3201,18 +3201,18 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                              \
     /* remove the entry from the LRU list. */                                \
                                                                              \
-    H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,                 \
+    H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,                 \
                     (cache_ptr)->LRU_tail_ptr, (cache_ptr)->LRU_list_len,    \
                     (cache_ptr)->LRU_list_size, (fail_val))                  \
                                                                              \
-} /* H5C2__UPDATE_RP_FOR_EVICTION */
+} /* H5C__UPDATE_RP_FOR_EVICTION */
 
-#endif /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__UPDATE_RP_FOR_FLUSH
+ * Macro:	H5C__UPDATE_RP_FOR_FLUSH
  *
  * Purpose:     Update the replacement policy data structures for a flush
  *		of the specified cache entry.
@@ -3229,8 +3229,8 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  * Modifications:
  *
  *		JRM - 7/27/04
- *		Converted the function H5C2_update_rp_for_flush() to the
- *		macro H5C2__UPDATE_RP_FOR_FLUSH in an effort to squeeze
+ *		Converted the function H5C_update_rp_for_flush() to the
+ *		macro H5C__UPDATE_RP_FOR_FLUSH in an effort to squeeze
  *		a bit more performance out of the cache.
  *
  *		At least for the first cut, I am leaving the comments and
@@ -3250,7 +3250,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *
  *		JRM - 3/28/07
  *		Added sanity checks based on the new is_read_only and
- *		ro_ref_count fields of struct H5C2_cache_entry_t.
+ *		ro_ref_count fields of struct H5C_cache_entry_t.
  *
  *		JRM -- 3/29/08
  *		Added sanity check to verify that the flushed entry
@@ -3259,12 +3259,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *-------------------------------------------------------------------------
  */
 
-#if H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
+#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
 
-#define H5C2__UPDATE_RP_FOR_FLUSH(cache_ptr, entry_ptr, fail_val)           \
+#define H5C__UPDATE_RP_FOR_FLUSH(cache_ptr, entry_ptr, fail_val)           \
 {                                                                           \
     HDassert( (cache_ptr) );                                                \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                   \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                   \
     HDassert( (entry_ptr) );                                                \
     HDassert( !((entry_ptr)->is_protected) );                               \
     HDassert( !((entry_ptr)->is_read_only) );                               \
@@ -3280,12 +3280,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 	 * head.                                                            \
 	 */                                                                 \
                                                                             \
-        H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,            \
+        H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,            \
                         (cache_ptr)->LRU_tail_ptr,                          \
 			(cache_ptr)->LRU_list_len,                          \
                         (cache_ptr)->LRU_list_size, (fail_val))             \
                                                                             \
-        H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,           \
+        H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,           \
                          (cache_ptr)->LRU_tail_ptr,                         \
 			 (cache_ptr)->LRU_list_len,                         \
                          (cache_ptr)->LRU_list_size, (fail_val))            \
@@ -3302,32 +3302,32 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
          */                                                                 \
                                                                             \
         if ( (entry_ptr)->is_dirty ) {                                      \
-            H5C2__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->dLRU_head_ptr,   \
+            H5C__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->dLRU_head_ptr,   \
                                 (cache_ptr)->dLRU_tail_ptr,                 \
                                 (cache_ptr)->dLRU_list_len,                 \
                                 (cache_ptr)->dLRU_list_size, (fail_val))    \
         } else {                                                            \
-            H5C2__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->cLRU_head_ptr,   \
+            H5C__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->cLRU_head_ptr,   \
                                 (cache_ptr)->cLRU_tail_ptr,                 \
                                 (cache_ptr)->cLRU_list_len,                 \
                                 (cache_ptr)->cLRU_list_size, (fail_val))    \
         }                                                                   \
                                                                             \
-        H5C2__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->cLRU_head_ptr,      \
+        H5C__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->cLRU_head_ptr,      \
                              (cache_ptr)->cLRU_tail_ptr,                    \
                              (cache_ptr)->cLRU_list_len,                    \
                              (cache_ptr)->cLRU_list_size, (fail_val))       \
                                                                             \
         /* End modified LRU specific code. */                               \
     }                                                                       \
-} /* H5C2__UPDATE_RP_FOR_FLUSH */
+} /* H5C__UPDATE_RP_FOR_FLUSH */
 
-#else /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#else /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
-#define H5C2__UPDATE_RP_FOR_FLUSH(cache_ptr, entry_ptr, fail_val)           \
+#define H5C__UPDATE_RP_FOR_FLUSH(cache_ptr, entry_ptr, fail_val)           \
 {                                                                           \
     HDassert( (cache_ptr) );                                                \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                   \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                   \
     HDassert( (entry_ptr) );                                                \
     HDassert( !((entry_ptr)->is_protected) );                               \
     HDassert( !((entry_ptr)->is_read_only) );                               \
@@ -3343,26 +3343,26 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 	 * head.                                                            \
 	 */                                                                 \
                                                                             \
-        H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,            \
+        H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,            \
                         (cache_ptr)->LRU_tail_ptr,                          \
 			(cache_ptr)->LRU_list_len,                          \
                         (cache_ptr)->LRU_list_size, (fail_val))             \
                                                                             \
-        H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,           \
+        H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,           \
                          (cache_ptr)->LRU_tail_ptr,                         \
 			 (cache_ptr)->LRU_list_len,                         \
                          (cache_ptr)->LRU_list_size, (fail_val))            \
                                                                             \
         /* End modified LRU specific code. */                               \
     }                                                                       \
-} /* H5C2__UPDATE_RP_FOR_FLUSH */
+} /* H5C__UPDATE_RP_FOR_FLUSH */
 
-#endif /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__UPDATE_RP_FOR_INSERTION
+ * Macro:	H5C__UPDATE_RP_FOR_INSERTION
  *
  * Purpose:     Update the replacement policy data structures for an
  *		insertion of the specified cache entry.
@@ -3379,8 +3379,8 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  * Modifications:
  *
  *		JRM - 7/27/04
- *		Converted the function H5C2_update_rp_for_insertion() to the
- *		macro H5C2__UPDATE_RP_FOR_INSERTION in an effort to squeeze
+ *		Converted the function H5C_update_rp_for_insertion() to the
+ *		macro H5C__UPDATE_RP_FOR_INSERTION in an effort to squeeze
  *		a bit more performance out of the cache.
  *
  *		At least for the first cut, I am leaving the comments and
@@ -3402,7 +3402,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *
  *		JRM - 3/28/07
  *		Added sanity checks using the new is_read_only and
- *		ro_ref_count fields of struct H5C2_cache_entry_t.
+ *		ro_ref_count fields of struct H5C_cache_entry_t.
  *
  *		JRM - 3/29/30
  *		Added sanity check that verifies that the last_trans field 
@@ -3418,12 +3418,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *-------------------------------------------------------------------------
  */
 
-#if H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
+#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
 
-#define H5C2__UPDATE_RP_FOR_INSERTION(cache_ptr, entry_ptr, fail_val)      \
+#define H5C__UPDATE_RP_FOR_INSERTION(cache_ptr, entry_ptr, fail_val)      \
 {                                                                          \
     HDassert( (cache_ptr) );                                               \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                  \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                  \
     HDassert( (entry_ptr) );                                               \
     HDassert( !((entry_ptr)->is_protected) );                              \
     HDassert( !((entry_ptr)->is_read_only) );                              \
@@ -3435,7 +3435,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                            \
     if ( (entry_ptr)->is_pinned ) {                                        \
                                                                            \
-        H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->pel_head_ptr,          \
+        H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->pel_head_ptr,          \
                          (cache_ptr)->pel_tail_ptr,                        \
                          (cache_ptr)->pel_len,                             \
                          (cache_ptr)->pel_size, (fail_val))                \
@@ -3444,7 +3444,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 	                                                                   \
         HDassert( (cache_ptr)->mdj_enabled );                              \
 	HDassert( (cache_ptr)->trans_in_progress );                        \
-        H5C2__DLL_PREPEND((entry_ptr),                                     \
+        H5C__DLL_PREPEND((entry_ptr),                                     \
 		          ((cache_ptr)->jwipl_head_ptr),                   \
 		          ((cache_ptr)->jwipl_tail_ptr),                   \
 			  ((cache_ptr)->jwipl_len),                        \
@@ -3456,7 +3456,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                            \
         /* insert the entry at the head of the LRU list. */                \
                                                                            \
-        H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,          \
+        H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,          \
                          (cache_ptr)->LRU_tail_ptr,                        \
 			 (cache_ptr)->LRU_list_len,                        \
                          (cache_ptr)->LRU_list_size, (fail_val))           \
@@ -3466,12 +3466,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
          */                                                                \
                                                                            \
         if ( entry_ptr->is_dirty ) {                                       \
-            H5C2__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->dLRU_head_ptr, \
+            H5C__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->dLRU_head_ptr, \
                                  (cache_ptr)->dLRU_tail_ptr,               \
                                  (cache_ptr)->dLRU_list_len,               \
                                  (cache_ptr)->dLRU_list_size, (fail_val))  \
         } else {                                                           \
-            H5C2__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->cLRU_head_ptr, \
+            H5C__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->cLRU_head_ptr, \
                                  (cache_ptr)->cLRU_tail_ptr,               \
                                  (cache_ptr)->cLRU_list_len,               \
                                  (cache_ptr)->cLRU_list_size, (fail_val))  \
@@ -3481,12 +3481,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     }                                                                      \
 }
 
-#else /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#else /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
-#define H5C2__UPDATE_RP_FOR_INSERTION(cache_ptr, entry_ptr, fail_val)      \
+#define H5C__UPDATE_RP_FOR_INSERTION(cache_ptr, entry_ptr, fail_val)      \
 {                                                                          \
     HDassert( (cache_ptr) );                                               \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                  \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                  \
     HDassert( (entry_ptr) );                                               \
     HDassert( !((entry_ptr)->is_protected) );                              \
     HDassert( !((entry_ptr)->is_read_only) );                              \
@@ -3498,7 +3498,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                            \
     if ( (entry_ptr)->is_pinned ) {                                        \
                                                                            \
-        H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->pel_head_ptr,          \
+        H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->pel_head_ptr,          \
                          (cache_ptr)->pel_tail_ptr,                        \
                          (cache_ptr)->pel_len,                             \
                          (cache_ptr)->pel_size, (fail_val))                \
@@ -3507,7 +3507,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 	                                                                   \
         HDassert( (cache_ptr)->mdj_enabled );                              \
 	HDassert( (cache_ptr)->trans_in_progress );                        \
-        H5C2__DLL_PREPEND((entry_ptr),                                     \
+        H5C__DLL_PREPEND((entry_ptr),                                     \
 		          ((cache_ptr)->jwipl_head_ptr),                   \
 		          ((cache_ptr)->jwipl_tail_ptr),                   \
 			  ((cache_ptr)->jwipl_len),                        \
@@ -3519,7 +3519,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                            \
         /* insert the entry at the head of the LRU list. */                \
                                                                            \
-        H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,          \
+        H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,          \
                          (cache_ptr)->LRU_tail_ptr,                        \
 			 (cache_ptr)->LRU_list_len,                        \
                          (cache_ptr)->LRU_list_size, (fail_val))           \
@@ -3528,12 +3528,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     }                                                                      \
 }
 
-#endif /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE
+ * Macro:	H5C__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE
  *
  * Purpose:     Update the replacement policy data structures for the 
  *              completion of the last pending journal write for the 
@@ -3563,13 +3563,13 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *-------------------------------------------------------------------------
  */
 
-#if H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
+#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
 
-#define H5C2__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE(cache_ptr, entry_ptr,  \
+#define H5C__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE(cache_ptr, entry_ptr,  \
 		                                   fail_val)              \
 {                                                                         \
     HDassert( (cache_ptr) );                                              \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                 \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                 \
     HDassert( (cache_ptr)->mdj_enabled );                                 \
     HDassert( (entry_ptr) );                                              \
     HDassert( !((entry_ptr)->is_protected) );                             \
@@ -3580,7 +3580,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     HDassert( (entry_ptr)->is_dirty );                                    \
     HDassert( (entry_ptr)->last_trans == 0 );                             \
 									  \
-    H5C2__DLL_REMOVE((entry_ptr),                                         \
+    H5C__DLL_REMOVE((entry_ptr),                                         \
                      ((cache_ptr)->jwipl_head_ptr),                       \
                      ((cache_ptr)->jwipl_tail_ptr),                       \
                      ((cache_ptr)->jwipl_len),                            \
@@ -3591,7 +3591,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                           \
     /* insert the entry at the head of the LRU list. */                   \
                                                                           \
-    H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,             \
+    H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,             \
                       (cache_ptr)->LRU_tail_ptr,                          \
                       (cache_ptr)->LRU_list_len,                          \
                       (cache_ptr)->LRU_list_size, (fail_val))             \
@@ -3601,12 +3601,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
      */                                                                   \
                                                                           \
     if ( entry_ptr->is_dirty ) {                                          \
-        H5C2__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->dLRU_head_ptr,    \
+        H5C__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->dLRU_head_ptr,    \
                               (cache_ptr)->dLRU_tail_ptr,                 \
                               (cache_ptr)->dLRU_list_len,                 \
                               (cache_ptr)->dLRU_list_size, (fail_val))    \
     } else {                                                              \
-        H5C2__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->cLRU_head_ptr,    \
+        H5C__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->cLRU_head_ptr,    \
                               (cache_ptr)->cLRU_tail_ptr,                 \
                               (cache_ptr)->cLRU_list_len,                 \
                               (cache_ptr)->cLRU_list_size, (fail_val))    \
@@ -3614,15 +3614,15 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                           \
     /* End modified LRU specific code. */                                 \
                                                                           \
-} /* H5C2__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE */
+} /* H5C__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE */
 
-#else /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#else /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
-#define H5C2__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE(cache_ptr, entry_ptr,  \
+#define H5C__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE(cache_ptr, entry_ptr,  \
 		                                   fail_val)              \
 {                                                                         \
     HDassert( (cache_ptr) );                                              \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                 \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                 \
     HDassert( (cache_ptr)->mdj_enabled );                                 \
     HDassert( (entry_ptr) );                                              \
     HDassert( !((entry_ptr)->is_protected) );                             \
@@ -3633,7 +3633,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     HDassert( (entry_ptr)->is_dirty );                                    \
     HDassert( (entry_ptr)->last_trans == 0 );                             \
 									  \
-    H5C2__DLL_REMOVE((entry_ptr),                                         \
+    H5C__DLL_REMOVE((entry_ptr),                                         \
                      ((cache_ptr)->jwipl_head_ptr),                       \
                      ((cache_ptr)->jwipl_tail_ptr),                       \
                      ((cache_ptr)->jwipl_len),                            \
@@ -3644,21 +3644,21 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                           \
     /* insert the entry at the head of the LRU list. */                   \
                                                                           \
-    H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,             \
+    H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,             \
                       (cache_ptr)->LRU_tail_ptr,                          \
                       (cache_ptr)->LRU_list_len,                          \
                       (cache_ptr)->LRU_list_size, (fail_val))             \
                                                                           \
     /* End modified LRU specific code. */                                 \
                                                                           \
-} /* H5C2__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE */
+} /* H5C__UPDATE_RP_FOR_JOURNAL_WRITE_COMPLETE */
 
-#endif /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__UPDATE_RP_FOR_LOAD
+ * Macro:	H5C__UPDATE_RP_FOR_LOAD
  *
  * Purpose:     Update the replacement policy data structures for a
  *		load from disk of the specified cache entry.
@@ -3689,12 +3689,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *-------------------------------------------------------------------------
  */
 
-#if H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
+#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
 
-#define H5C2__UPDATE_RP_FOR_LOAD(cache_ptr, entry_ptr, fail_val)           \
+#define H5C__UPDATE_RP_FOR_LOAD(cache_ptr, entry_ptr, fail_val)           \
 {                                                                          \
     HDassert( (cache_ptr) );                                               \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                  \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                  \
     HDassert( (entry_ptr) );                                               \
     HDassert( !((entry_ptr)->is_protected) );                              \
     HDassert( !((entry_ptr)->is_pinned) );                                 \
@@ -3707,7 +3707,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                            \
     /* insert the entry at the head of the LRU list. */                    \
                                                                            \
-    H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,              \
+    H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,              \
                       (cache_ptr)->LRU_tail_ptr,                           \
                       (cache_ptr)->LRU_list_len,                           \
                       (cache_ptr)->LRU_list_size, (fail_val))              \
@@ -3717,12 +3717,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
      */                                                                    \
                                                                            \
     if ( entry_ptr->is_dirty ) {                                           \
-        H5C2__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->dLRU_head_ptr,     \
+        H5C__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->dLRU_head_ptr,     \
                               (cache_ptr)->dLRU_tail_ptr,                  \
                               (cache_ptr)->dLRU_list_len,                  \
                               (cache_ptr)->dLRU_list_size, (fail_val))     \
     } else {                                                               \
-        H5C2__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->cLRU_head_ptr,     \
+        H5C__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->cLRU_head_ptr,     \
                               (cache_ptr)->cLRU_tail_ptr,                  \
                               (cache_ptr)->cLRU_list_len,                  \
                               (cache_ptr)->cLRU_list_size, (fail_val))     \
@@ -3731,12 +3731,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     /* End modified LRU specific code. */                                  \
 }
 
-#else /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#else /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
-#define H5C2__UPDATE_RP_FOR_LOAD(cache_ptr, entry_ptr, fail_val)           \
+#define H5C__UPDATE_RP_FOR_LOAD(cache_ptr, entry_ptr, fail_val)           \
 {                                                                          \
     HDassert( (cache_ptr) );                                               \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                  \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                  \
     HDassert( (entry_ptr) );                                               \
     HDassert( !((entry_ptr)->is_protected) );                              \
     HDassert( !((entry_ptr)->is_pinned) );                                 \
@@ -3749,7 +3749,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                            \
     /* insert the entry at the head of the LRU list. */                    \
                                                                            \
-    H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,              \
+    H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,              \
                       (cache_ptr)->LRU_tail_ptr,                           \
                       (cache_ptr)->LRU_list_len,                           \
                       (cache_ptr)->LRU_list_size, (fail_val))              \
@@ -3757,12 +3757,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     /* End modified LRU specific code. */                                  \
 }
 
-#endif /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__UPDATE_RP_FOR_PROTECT
+ * Macro:	H5C__UPDATE_RP_FOR_PROTECT
  *
  * Purpose:     Update the replacement policy data structures for a
  *		protect of the specified cache entry.
@@ -3783,8 +3783,8 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  * Modifications:
  *
  *		JRM - 7/27/04
- *		Converted the function H5C2_update_rp_for_protect() to the
- *		macro H5C2__UPDATE_RP_FOR_PROTECT in an effort to squeeze
+ *		Converted the function H5C_update_rp_for_protect() to the
+ *		macro H5C__UPDATE_RP_FOR_PROTECT in an effort to squeeze
  *		a bit more performance out of the cache.
  *
  *		At least for the first cut, I am leaving the comments and
@@ -3803,7 +3803,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *
  *		JRM - 3/28/07
  *		Added sanity checks based on the new is_read_only and 
- *		ro_ref_count fields of struct H5C2_cache_entry_t.
+ *		ro_ref_count fields of struct H5C_cache_entry_t.
  *
  *		JRM - 3/29/08
  *		Added code to remove the entry from the journal write in
@@ -3812,12 +3812,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *-------------------------------------------------------------------------
  */
 
-#if H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
+#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
 
-#define H5C2__UPDATE_RP_FOR_PROTECT(cache_ptr, entry_ptr, fail_val)       \
+#define H5C__UPDATE_RP_FOR_PROTECT(cache_ptr, entry_ptr, fail_val)       \
 {                                                                         \
     HDassert( (cache_ptr) );                                              \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                 \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                 \
     HDassert( (entry_ptr) );                                              \
     HDassert( !((entry_ptr)->is_protected) );                             \
     HDassert( !((entry_ptr)->is_read_only) );                             \
@@ -3826,7 +3826,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 									  \
     if ( (entry_ptr)->is_pinned ) {                                       \
                                                                           \
-        H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->pel_head_ptr,          \
+        H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->pel_head_ptr,          \
                         (cache_ptr)->pel_tail_ptr, 			  \
 			(cache_ptr)->pel_len,                             \
                         (cache_ptr)->pel_size, (fail_val))                \
@@ -3835,7 +3835,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 	                                                                  \
         HDassert( (cache_ptr)->mdj_enabled );                             \
         HDassert( (entry_ptr)->is_dirty );                                \
-        H5C2__DLL_REMOVE((entry_ptr),                                     \
+        H5C__DLL_REMOVE((entry_ptr),                                     \
                          ((cache_ptr)->jwipl_head_ptr),                   \
                          ((cache_ptr)->jwipl_tail_ptr),                   \
                          ((cache_ptr)->jwipl_len),                        \
@@ -3848,7 +3848,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                           \
         /* remove the entry from the LRU list. */                         \
                                                                           \
-        H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,          \
+        H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,          \
                         (cache_ptr)->LRU_tail_ptr,                        \
 			(cache_ptr)->LRU_list_len,                        \
                         (cache_ptr)->LRU_list_size, (fail_val))           \
@@ -3859,14 +3859,14 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                           \
         if ( (entry_ptr)->is_dirty ) {                                    \
                                                                           \
-            H5C2__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->dLRU_head_ptr, \
+            H5C__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->dLRU_head_ptr, \
                                 (cache_ptr)->dLRU_tail_ptr,               \
                                 (cache_ptr)->dLRU_list_len,               \
                                 (cache_ptr)->dLRU_list_size, (fail_val))  \
                                                                           \
         } else {                                                          \
                                                                           \
-            H5C2__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->cLRU_head_ptr, \
+            H5C__AUX_DLL_REMOVE((entry_ptr), (cache_ptr)->cLRU_head_ptr, \
                                 (cache_ptr)->cLRU_tail_ptr,               \
                                 (cache_ptr)->cLRU_list_len,               \
                                 (cache_ptr)->cLRU_list_size, (fail_val))  \
@@ -3879,18 +3879,18 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
      * pinned, now add the entry to the protected list.                   \
      */                                                                   \
                                                                           \
-    H5C2__DLL_APPEND((entry_ptr), (cache_ptr)->pl_head_ptr,               \
+    H5C__DLL_APPEND((entry_ptr), (cache_ptr)->pl_head_ptr,               \
                     (cache_ptr)->pl_tail_ptr,                             \
                     (cache_ptr)->pl_len,                                  \
                     (cache_ptr)->pl_size, (fail_val))                     \
-} /* H5C2__UPDATE_RP_FOR_PROTECT */
+} /* H5C__UPDATE_RP_FOR_PROTECT */
 
-#else /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#else /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
-#define H5C2__UPDATE_RP_FOR_PROTECT(cache_ptr, entry_ptr, fail_val)       \
+#define H5C__UPDATE_RP_FOR_PROTECT(cache_ptr, entry_ptr, fail_val)       \
 {                                                                         \
     HDassert( (cache_ptr) );                                              \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                 \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                 \
     HDassert( (entry_ptr) );                                              \
     HDassert( !((entry_ptr)->is_protected) );                             \
     HDassert( !((entry_ptr)->is_read_only) );                             \
@@ -3899,7 +3899,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 									  \
     if ( (entry_ptr)->is_pinned ) {                                       \
                                                                           \
-        H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->pel_head_ptr,          \
+        H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->pel_head_ptr,          \
                         (cache_ptr)->pel_tail_ptr, 			  \
 			(cache_ptr)->pel_len,                             \
                         (cache_ptr)->pel_size, (fail_val))                \
@@ -3908,7 +3908,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 	                                                                  \
         HDassert( (cache_ptr)->mdj_enabled );                             \
         HDassert( (entry_ptr)->is_dirty );                                \
-        H5C2__DLL_REMOVE((entry_ptr),                                     \
+        H5C__DLL_REMOVE((entry_ptr),                                     \
                          ((cache_ptr)->jwipl_head_ptr),                   \
                          ((cache_ptr)->jwipl_tail_ptr),                   \
                          ((cache_ptr)->jwipl_len),                        \
@@ -3921,7 +3921,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                           \
         /* remove the entry from the LRU list. */                         \
                                                                           \
-        H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,          \
+        H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,          \
                         (cache_ptr)->LRU_tail_ptr,                        \
 			(cache_ptr)->LRU_list_len,                        \
                         (cache_ptr)->LRU_list_size, (fail_val))           \
@@ -3933,18 +3933,18 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
      * pinned, now add the entry to the protected list.                   \
      */                                                                   \
                                                                           \
-    H5C2__DLL_APPEND((entry_ptr), (cache_ptr)->pl_head_ptr,               \
+    H5C__DLL_APPEND((entry_ptr), (cache_ptr)->pl_head_ptr,               \
                      (cache_ptr)->pl_tail_ptr,                            \
                      (cache_ptr)->pl_len,                                 \
                      (cache_ptr)->pl_size, (fail_val))                    \
-} /* H5C2__UPDATE_RP_FOR_PROTECT */
+} /* H5C__UPDATE_RP_FOR_PROTECT */
 
-#endif /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__UPDATE_RP_FOR_RENAME
+ * Macro:	H5C__UPDATE_RP_FOR_RENAME
  *
  * Purpose:     Update the replacement policy data structures for a
  *		rename of the specified cache entry.
@@ -3961,8 +3961,8 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  * Modifications:
  *
  *		JRM - 7/27/04
- *		Converted the function H5C2_update_rp_for_rename() to the
- *		macro H5C2__UPDATE_RP_FOR_RENAME in an effort to squeeze
+ *		Converted the function H5C_update_rp_for_rename() to the
+ *		macro H5C__UPDATE_RP_FOR_RENAME in an effort to squeeze
  *		a bit more performance out of the cache.
  *
  *		At least for the first cut, I am leaving the comments and
@@ -3993,7 +3993,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *
  *		JRM - 3/28/07
  *		Added sanity checks using the new is_read_only and 
- *		ro_ref_count fields of struct H5C2_cache_entry_t.
+ *		ro_ref_count fields of struct H5C_cache_entry_t.
  *
  *		JRM - 3/29/08
  *		Reworked macro to handle the case in which the renamed
@@ -4004,13 +4004,13 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *-------------------------------------------------------------------------
  */
 
-#if H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
+#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
 
-#define H5C2__UPDATE_RP_FOR_RENAME(cache_ptr, entry_ptr, was_dirty,          \
+#define H5C__UPDATE_RP_FOR_RENAME(cache_ptr, entry_ptr, was_dirty,          \
 		                   had_jwip, fail_val)                       \
 {                                                                            \
     HDassert( (cache_ptr) );                                                 \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                    \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                    \
     HDassert( (entry_ptr) );                                                 \
     HDassert( !((entry_ptr)->is_protected) );                                \
     HDassert( !((entry_ptr)->is_read_only) );                                \
@@ -4031,7 +4031,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 	    HDassert( (entry_ptr)->last_trans != 0 );                        \
 	    HDassert( was_dirty );                                           \
 	    HDassert( (entry_ptr)->is_dirty );                               \
-            H5C2__DLL_REMOVE((entry_ptr),                                    \
+            H5C__DLL_REMOVE((entry_ptr),                                    \
 	  		     ((cache_ptr)->jwipl_head_ptr),                  \
                              ((cache_ptr)->jwipl_tail_ptr),                  \
                              ((cache_ptr)->jwipl_len),                       \
@@ -4044,7 +4044,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                              \
             /* remove the entry from the LRU list */                         \
                                                                              \
-            H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,         \
+            H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,         \
                              (cache_ptr)->LRU_tail_ptr,                      \
 			     (cache_ptr)->LRU_list_len,                      \
                              (cache_ptr)->LRU_list_size, (fail_val))         \
@@ -4054,7 +4054,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
              */                                                              \
             if ( was_dirty ) {                                               \
                                                                              \
-                H5C2__AUX_DLL_REMOVE((entry_ptr),                            \
+                H5C__AUX_DLL_REMOVE((entry_ptr),                            \
 				     (cache_ptr)->dLRU_head_ptr,             \
                                      (cache_ptr)->dLRU_tail_ptr,             \
                                      (cache_ptr)->dLRU_list_len,             \
@@ -4063,7 +4063,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                              \
             } else {                                                         \
                                                                              \
-                H5C2__AUX_DLL_REMOVE((entry_ptr),                            \
+                H5C__AUX_DLL_REMOVE((entry_ptr),                            \
 				     (cache_ptr)->cLRU_head_ptr,             \
                                      (cache_ptr)->cLRU_tail_ptr,             \
                                      (cache_ptr)->cLRU_list_len,             \
@@ -4080,7 +4080,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
             HDassert( (cache_ptr)->mdj_enabled );                            \
 	    HDassert( (cache_ptr)->trans_in_progress );                      \
 	    HDassert( (entry_ptr)->is_dirty );                               \
-            H5C2__DLL_PREPEND((entry_ptr),                                   \
+            H5C__DLL_PREPEND((entry_ptr),                                   \
 		              ((cache_ptr)->jwipl_head_ptr),                 \
 		              ((cache_ptr)->jwipl_tail_ptr),                 \
                               ((cache_ptr)->jwipl_len),                      \
@@ -4090,7 +4090,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 		                                                             \
             /* begin modified LRU specific code */                           \
 	                                                                     \
-            H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,        \
+            H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,        \
                               (cache_ptr)->LRU_tail_ptr,                     \
 			      (cache_ptr)->LRU_list_len,                     \
                               (cache_ptr)->LRU_list_size, (fail_val))        \
@@ -4101,7 +4101,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                              \
             if ( (entry_ptr)->is_dirty ) {                                   \
                                                                              \
-                H5C2__AUX_DLL_PREPEND((entry_ptr),                           \
+                H5C__AUX_DLL_PREPEND((entry_ptr),                           \
 				      (cache_ptr)->dLRU_head_ptr,            \
                                       (cache_ptr)->dLRU_tail_ptr,            \
                                       (cache_ptr)->dLRU_list_len,            \
@@ -4110,7 +4110,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                              \
             } else {                                                         \
                                                                              \
-                H5C2__AUX_DLL_PREPEND((entry_ptr),                           \
+                H5C__AUX_DLL_PREPEND((entry_ptr),                           \
 				      (cache_ptr)->cLRU_head_ptr,            \
                                       (cache_ptr)->cLRU_tail_ptr,            \
                                       (cache_ptr)->cLRU_list_len,            \
@@ -4121,15 +4121,15 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
             /* End modified LRU specific code. */                            \
         }                                                                    \
     }                                                                        \
-} /* H5C2__UPDATE_RP_FOR_RENAME */
+} /* H5C__UPDATE_RP_FOR_RENAME */
 
-#else /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#else /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
-#define H5C2__UPDATE_RP_FOR_RENAME(cache_ptr, entry_ptr, was_dirty,          \
+#define H5C__UPDATE_RP_FOR_RENAME(cache_ptr, entry_ptr, was_dirty,          \
 		                   had_jwip, fail_val)                       \
 {                                                                            \
     HDassert( (cache_ptr) );                                                 \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                    \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                    \
     HDassert( (entry_ptr) );                                                 \
     HDassert( !((entry_ptr)->is_protected) );                                \
     HDassert( !((entry_ptr)->is_read_only) );                                \
@@ -4150,7 +4150,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 	    HDassert( (entry_ptr)->last_trans != 0 );                        \
 	    HDassert( was_dirty );                                           \
 	    HDassert( (entry_ptr)->is_dirty );                               \
-            H5C2__DLL_REMOVE((entry_ptr),                                    \
+            H5C__DLL_REMOVE((entry_ptr),                                    \
 	  	             ((cache_ptr)->jwipl_head_ptr),                  \
                              ((cache_ptr)->jwipl_tail_ptr),                  \
                              ((cache_ptr)->jwipl_len),                       \
@@ -4163,7 +4163,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                              \
             /* remove the entry from the LRU list */                         \
                                                                              \
-            H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,         \
+            H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->LRU_head_ptr,         \
                              (cache_ptr)->LRU_tail_ptr,                      \
 			     (cache_ptr)->LRU_list_len,                      \
                              (cache_ptr)->LRU_list_size, (fail_val))         \
@@ -4178,7 +4178,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
             HDassert( (cache_ptr)->mdj_enabled );                            \
 	    HDassert( (cache_ptr)->trans_in_progress );                      \
 	    HDassert( (entry_ptr)->is_dirty );                               \
-            H5C2__DLL_PREPEND((entry_ptr),                                   \
+            H5C__DLL_PREPEND((entry_ptr),                                   \
                               ((cache_ptr)->jwipl_head_ptr),                 \
                               ((cache_ptr)->jwipl_tail_ptr),                 \
                               ((cache_ptr)->jwipl_len),                      \
@@ -4188,7 +4188,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 		                                                             \
             /* begin modified LRU specific code */                           \
 	                                                                     \
-            H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,        \
+            H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,        \
                               (cache_ptr)->LRU_tail_ptr,                     \
 			      (cache_ptr)->LRU_list_len,                     \
                               (cache_ptr)->LRU_list_size, (fail_val))        \
@@ -4196,14 +4196,14 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
             /* End modified LRU specific code. */                            \
         }                                                                    \
     }                                                                        \
-} /* H5C2__UPDATE_RP_FOR_RENAME */
+} /* H5C__UPDATE_RP_FOR_RENAME */
 
-#endif /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__UPDATE_RP_FOR_SIZE_CHANGE
+ * Macro:	H5C__UPDATE_RP_FOR_SIZE_CHANGE
  *
  * Purpose:     Update the replacement policy data structures for a
  *		size change of the specified cache entry.
@@ -4228,7 +4228,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *
  * 		JRM -- 3/28/07
  *		Added sanity checks based on the new is_read_only and 
- *		ro_ref_count fields of struct H5C2_cache_entry_t.
+ *		ro_ref_count fields of struct H5C_cache_entry_t.
  *
  *		JRM -- 3/29/08
  *		Added code to deal with the journal write in progress
@@ -4240,12 +4240,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *-------------------------------------------------------------------------
  */
 
-#if H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
+#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
 
-#define H5C2__UPDATE_RP_FOR_SIZE_CHANGE(cache_ptr, entry_ptr, new_size)   \
+#define H5C__UPDATE_RP_FOR_SIZE_CHANGE(cache_ptr, entry_ptr, new_size)   \
 {                                                                         \
     HDassert( (cache_ptr) );                                              \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                 \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                 \
     HDassert( (entry_ptr) );                                              \
     HDassert( !((entry_ptr)->is_protected) );                             \
     HDassert( !((entry_ptr)->is_read_only) );                             \
@@ -4255,7 +4255,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 				  					  \
     if ( (entry_ptr)->is_pinned ) {                                       \
                                                                           \
-	H5C2__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->pel_len,            \
+	H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->pel_len,            \
 			                (cache_ptr)->pel_size,            \
 			                (entry_ptr)->size,                \
 					(new_size));                      \
@@ -4264,7 +4264,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                           \
         HDassert( (cache_ptr)->mdj_enabled );                             \
 	HDassert( (entry_ptr)->is_dirty );                                \
-	H5C2__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->jwipl_len,          \
+	H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->jwipl_len,          \
 			                (cache_ptr)->jwipl_size,          \
 			                (entry_ptr)->size,                \
 					(new_size));                      \
@@ -4275,7 +4275,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                           \
 	/* Update the size of the LRU list */                             \
                                                                           \
-	H5C2__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->LRU_list_len,       \
+	H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->LRU_list_len,       \
 			                (cache_ptr)->LRU_list_size,       \
 			                (entry_ptr)->size,                \
 					(new_size));                      \
@@ -4287,14 +4287,14 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                           \
         if ( (entry_ptr)->is_dirty ) {                                    \
                                                                           \
-	    H5C2__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->dLRU_list_len,  \
+	    H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->dLRU_list_len,  \
 			                    (cache_ptr)->dLRU_list_size,  \
 			                    (entry_ptr)->size,            \
 					    (new_size));                  \
                                                                           \
         } else {                                                          \
                                                                           \
-	    H5C2__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->cLRU_list_len,  \
+	    H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->cLRU_list_len,  \
 			                    (cache_ptr)->cLRU_list_size,  \
 			                    (entry_ptr)->size,            \
 					    (new_size));                  \
@@ -4303,14 +4303,14 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
         /* End modified LRU specific code. */                             \
     }                                                                     \
                                                                           \
-} /* H5C2__UPDATE_RP_FOR_SIZE_CHANGE */
+} /* H5C__UPDATE_RP_FOR_SIZE_CHANGE */
 
-#else /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#else /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
-#define H5C2__UPDATE_RP_FOR_SIZE_CHANGE(cache_ptr, entry_ptr, new_size)   \
+#define H5C__UPDATE_RP_FOR_SIZE_CHANGE(cache_ptr, entry_ptr, new_size)   \
 {                                                                         \
     HDassert( (cache_ptr) );                                              \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                 \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                 \
     HDassert( (entry_ptr) );                                              \
     HDassert( !((entry_ptr)->is_protected) );                             \
     HDassert( !((entry_ptr)->is_read_only) );                             \
@@ -4320,7 +4320,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 				  					  \
     if ( (entry_ptr)->is_pinned ) {                                       \
                                                                           \
-	H5C2__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->pel_len,            \
+	H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->pel_len,            \
 			                (cache_ptr)->pel_size,            \
 			                (entry_ptr)->size,                \
 					(new_size));                      \
@@ -4329,7 +4329,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                           \
         HDassert( (cache_ptr)->mdj_enabled );                             \
 	HDassert( (entry_ptr)->is_dirty );                                \
-	H5C2__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->jwipl_len,          \
+	H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->jwipl_len,          \
 			                (cache_ptr)->jwipl_size,          \
 			                (entry_ptr)->size,                \
 					(new_size));                      \
@@ -4340,7 +4340,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                           \
 	/* Update the size of the LRU list */                             \
                                                                           \
-	H5C2__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->LRU_list_len,       \
+	H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr)->LRU_list_len,       \
 			                (cache_ptr)->LRU_list_size,       \
 			                (entry_ptr)->size,                \
 					(new_size));                      \
@@ -4348,14 +4348,14 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
         /* End modified LRU specific code. */                             \
     }                                                                     \
                                                                           \
-} /* H5C2__UPDATE_RP_FOR_SIZE_CHANGE */
+} /* H5C__UPDATE_RP_FOR_SIZE_CHANGE */
 
-#endif /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__UPDATE_RP_FOR_UNPIN
+ * Macro:	H5C__UPDATE_RP_FOR_UNPIN
  *
  * Purpose:     Update the replacement policy data structures for an
  *		unpin of the specified cache entry.
@@ -4377,7 +4377,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *
  *		JRM -- 3/28/07
  *		Added sanity checks based on the new is_read_only and 
- *		ro_ref_count fields of struct H5C2_cache_entry_t.
+ *		ro_ref_count fields of struct H5C_cache_entry_t.
  *
  *		JRM -- 3/30/08
  *		Added code to place the newly unpinned entry on the 
@@ -4386,12 +4386,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *-------------------------------------------------------------------------
  */
 
-#if H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
+#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
 
-#define H5C2__UPDATE_RP_FOR_UNPIN(cache_ptr, entry_ptr, fail_val)      \
+#define H5C__UPDATE_RP_FOR_UNPIN(cache_ptr, entry_ptr, fail_val)      \
 {                                                                      \
     HDassert( (cache_ptr) );                                           \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );              \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );              \
     HDassert( (entry_ptr) );                                           \
     HDassert( !((entry_ptr)->is_protected) );                          \
     HDassert( !((entry_ptr)->is_read_only) );                          \
@@ -4402,7 +4402,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     /* Regardless of the replacement policy, remove the entry from the \
      * pinned entry list.                                              \
      */                                                                \
-    H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->pel_head_ptr,           \
+    H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->pel_head_ptr,           \
                     (cache_ptr)->pel_tail_ptr, (cache_ptr)->pel_len,   \
                     (cache_ptr)->pel_size, (fail_val))                 \
                                                                        \
@@ -4411,7 +4411,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
         /* put the entry in the jwip list */                           \
         HDassert( (cache_ptr)->mdj_enabled );                          \
         HDassert( (entry_ptr)->is_dirty );                             \
-        H5C2__DLL_PREPEND((entry_ptr),                                 \
+        H5C__DLL_PREPEND((entry_ptr),                                 \
                           ((cache_ptr)->jwipl_head_ptr),               \
                           ((cache_ptr)->jwipl_tail_ptr),               \
                           ((cache_ptr)->jwipl_len),                    \
@@ -4423,7 +4423,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                        \
         /* insert the entry at the head of the LRU list. */            \
                                                                        \
-        H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,      \
+        H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,      \
                          (cache_ptr)->LRU_tail_ptr,                    \
                          (cache_ptr)->LRU_list_len,                    \
                          (cache_ptr)->LRU_list_size, (fail_val))       \
@@ -4434,7 +4434,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                        \
         if ( (entry_ptr)->is_dirty ) {                                 \
                                                                        \
-            H5C2__AUX_DLL_PREPEND((entry_ptr),                         \
+            H5C__AUX_DLL_PREPEND((entry_ptr),                         \
 			          (cache_ptr)->dLRU_head_ptr,          \
                                   (cache_ptr)->dLRU_tail_ptr,          \
                                   (cache_ptr)->dLRU_list_len,          \
@@ -4443,7 +4443,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                        \
         } else {                                                       \
                                                                        \
-            H5C2__AUX_DLL_PREPEND((entry_ptr),                         \
+            H5C__AUX_DLL_PREPEND((entry_ptr),                         \
 			          (cache_ptr)->cLRU_head_ptr,          \
                                   (cache_ptr)->cLRU_tail_ptr,          \
                                   (cache_ptr)->cLRU_list_len,          \
@@ -4454,14 +4454,14 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
         /* End modified LRU specific code. */                          \
     }                                                                  \
                                                                        \
-} /* H5C2__UPDATE_RP_FOR_UNPIN */
+} /* H5C__UPDATE_RP_FOR_UNPIN */
 
-#else /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#else /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
-#define H5C2__UPDATE_RP_FOR_UNPIN(cache_ptr, entry_ptr, fail_val)      \
+#define H5C__UPDATE_RP_FOR_UNPIN(cache_ptr, entry_ptr, fail_val)      \
 {                                                                      \
     HDassert( (cache_ptr) );                                           \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );              \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );              \
     HDassert( (entry_ptr) );                                           \
     HDassert( !((entry_ptr)->is_protected) );                          \
     HDassert( !((entry_ptr)->is_read_only) );                          \
@@ -4472,7 +4472,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     /* Regardless of the replacement policy, remove the entry from the \
      * pinned entry list.                                              \
      */                                                                \
-    H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->pel_head_ptr,           \
+    H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->pel_head_ptr,           \
                     (cache_ptr)->pel_tail_ptr, (cache_ptr)->pel_len,   \
                     (cache_ptr)->pel_size, (fail_val))                 \
                                                                        \
@@ -4481,7 +4481,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
         /* put the entry in the jwip list */                           \
         HDassert( (cache_ptr)->mdj_enabled );                          \
         HDassert( (entry_ptr)->is_dirty );                             \
-        H5C2__DLL_PREPEND((entry_ptr),                                 \
+        H5C__DLL_PREPEND((entry_ptr),                                 \
                           ((cache_ptr)->jwipl_head_ptr),               \
                           ((cache_ptr)->jwipl_tail_ptr),               \
                           ((cache_ptr)->jwipl_len),                    \
@@ -4493,7 +4493,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                        \
         /* insert the entry at the head of the LRU list. */            \
                                                                        \
-        H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,      \
+        H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,      \
                          (cache_ptr)->LRU_tail_ptr,                    \
                          (cache_ptr)->LRU_list_len,                    \
                          (cache_ptr)->LRU_list_size, (fail_val))       \
@@ -4501,14 +4501,14 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
         /* End modified LRU specific code. */                          \
     }                                                                  \
                                                                        \
-} /* H5C2__UPDATE_RP_FOR_UNPIN */
+} /* H5C__UPDATE_RP_FOR_UNPIN */
 
-#endif /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__UPDATE_RP_FOR_UNPROTECT
+ * Macro:	H5C__UPDATE_RP_FOR_UNPROTECT
  *
  * Purpose:     Update the replacement policy data structures for an
  *		unprotect of the specified cache entry.
@@ -4529,8 +4529,8 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  * Modifications:
  *
  *		JRM - 7/27/04
- *		Converted the function H5C2_update_rp_for_unprotect() to
- *		the macro H5C2__UPDATE_RP_FOR_UNPROTECT in an effort to
+ *		Converted the function H5C_update_rp_for_unprotect() to
+ *		the macro H5C__UPDATE_RP_FOR_UNPROTECT in an effort to
  *		squeeze a bit more performance out of the cache.
  *
  *		At least for the first cut, I am leaving the comments and
@@ -4554,12 +4554,12 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *-------------------------------------------------------------------------
  */
 
-#if H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
+#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS
 
-#define H5C2__UPDATE_RP_FOR_UNPROTECT(cache_ptr, entry_ptr, fail_val)      \
+#define H5C__UPDATE_RP_FOR_UNPROTECT(cache_ptr, entry_ptr, fail_val)      \
 {                                                                          \
     HDassert( (cache_ptr) );                                               \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                  \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                  \
     HDassert( (entry_ptr) );                                               \
     HDassert( (entry_ptr)->is_protected);                                  \
     HDassert( (entry_ptr)->size > 0 );                                     \
@@ -4567,13 +4567,13 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     /* Regardless of the replacement policy, remove the entry from the     \
      * protected list.                                                     \
      */                                                                    \
-    H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->pl_head_ptr,                \
+    H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->pl_head_ptr,                \
                     (cache_ptr)->pl_tail_ptr, (cache_ptr)->pl_len,         \
                     (cache_ptr)->pl_size, (fail_val))                      \
                                                                            \
     if ( (entry_ptr)->is_pinned ) {                                        \
                                                                            \
-        H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->pel_head_ptr,          \
+        H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->pel_head_ptr,          \
                           (cache_ptr)->pel_tail_ptr,                       \
                           (cache_ptr)->pel_len,                            \
                           (cache_ptr)->pel_size, (fail_val))               \
@@ -4583,7 +4583,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
         /* put the entry in the jwip list */                               \
         HDassert( (cache_ptr)->mdj_enabled );                              \
         HDassert( (entry_ptr)->is_dirty );                                 \
-        H5C2__DLL_PREPEND((entry_ptr),                                     \
+        H5C__DLL_PREPEND((entry_ptr),                                     \
                           ((cache_ptr)->jwipl_head_ptr),                   \
                           ((cache_ptr)->jwipl_tail_ptr),                   \
                           ((cache_ptr)->jwipl_len),                        \
@@ -4595,7 +4595,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                            \
         /* insert the entry at the head of the LRU list. */                \
                                                                            \
-        H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,          \
+        H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,          \
                           (cache_ptr)->LRU_tail_ptr,                       \
                           (cache_ptr)->LRU_list_len,                       \
                           (cache_ptr)->LRU_list_size, (fail_val))          \
@@ -4606,14 +4606,14 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                            \
         if ( (entry_ptr)->is_dirty ) {                                     \
                                                                            \
-            H5C2__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->dLRU_head_ptr, \
+            H5C__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->dLRU_head_ptr, \
                                   (cache_ptr)->dLRU_tail_ptr,              \
                                   (cache_ptr)->dLRU_list_len,              \
                                   (cache_ptr)->dLRU_list_size, (fail_val)) \
                                                                            \
         } else {                                                           \
                                                                            \
-            H5C2__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->cLRU_head_ptr, \
+            H5C__AUX_DLL_PREPEND((entry_ptr), (cache_ptr)->cLRU_head_ptr, \
                                   (cache_ptr)->cLRU_tail_ptr,              \
                                   (cache_ptr)->cLRU_list_len,              \
                                   (cache_ptr)->cLRU_list_size, (fail_val)) \
@@ -4622,14 +4622,14 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
         /* End modified LRU specific code. */                              \
     }                                                                      \
                                                                            \
-} /* H5C2__UPDATE_RP_FOR_UNPROTECT */
+} /* H5C__UPDATE_RP_FOR_UNPROTECT */
 
-#else /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#else /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
-#define H5C2__UPDATE_RP_FOR_UNPROTECT(cache_ptr, entry_ptr, fail_val)      \
+#define H5C__UPDATE_RP_FOR_UNPROTECT(cache_ptr, entry_ptr, fail_val)      \
 {                                                                          \
     HDassert( (cache_ptr) );                                               \
-    HDassert( (cache_ptr)->magic == H5C2__H5C2_T_MAGIC );                  \
+    HDassert( (cache_ptr)->magic == H5C__H5C_T_MAGIC );                  \
     HDassert( (entry_ptr) );                                               \
     HDassert( (entry_ptr)->is_protected);                                  \
     HDassert( (entry_ptr)->size > 0 );                                     \
@@ -4637,13 +4637,13 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
     /* Regardless of the replacement policy, remove the entry from the     \
      * protected list.                                                     \
      */                                                                    \
-    H5C2__DLL_REMOVE((entry_ptr), (cache_ptr)->pl_head_ptr,                \
+    H5C__DLL_REMOVE((entry_ptr), (cache_ptr)->pl_head_ptr,                \
                     (cache_ptr)->pl_tail_ptr, (cache_ptr)->pl_len,         \
                     (cache_ptr)->pl_size, (fail_val))                      \
                                                                            \
     if ( (entry_ptr)->is_pinned ) {                                        \
                                                                            \
-        H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->pel_head_ptr,          \
+        H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->pel_head_ptr,          \
                          (cache_ptr)->pel_tail_ptr,                        \
                          (cache_ptr)->pel_len,                             \
                          (cache_ptr)->pel_size, (fail_val))                \
@@ -4653,7 +4653,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
         /* put the entry in the jwip list */                               \
         HDassert( (cache_ptr)->mdj_enabled );                              \
         HDassert( (entry_ptr)->is_dirty );                                 \
-        H5C2__DLL_PREPEND((entry_ptr),                                     \
+        H5C__DLL_PREPEND((entry_ptr),                                     \
                           ((cache_ptr)->jwipl_head_ptr),                   \
                           ((cache_ptr)->jwipl_tail_ptr),                   \
                           ((cache_ptr)->jwipl_len),                        \
@@ -4665,16 +4665,16 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
                                                                            \
         /* insert the entry at the head of the LRU list. */                \
                                                                            \
-        H5C2__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,          \
+        H5C__DLL_PREPEND((entry_ptr), (cache_ptr)->LRU_head_ptr,          \
                           (cache_ptr)->LRU_tail_ptr,                       \
                           (cache_ptr)->LRU_list_len,                       \
                           (cache_ptr)->LRU_list_size, (fail_val))          \
                                                                            \
         /* End modified LRU specific code. */                              \
     }                                                                      \
-} /* H5C2__UPDATE_RP_FOR_UNPROTECT */
+} /* H5C__UPDATE_RP_FOR_UNPROTECT */
 
-#endif /* H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
+#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */
 
 
 /**************************************************************************
@@ -4691,7 +4691,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
 
 /*-------------------------------------------------------------------------
  *
- * Macro:       H5C2__INSERT_ENTRY_IN_TL()
+ * Macro:       H5C__INSERT_ENTRY_IN_TL()
  *
  * Purpose:     Check to see if journaling is enabled.
  *
@@ -4710,7 +4710,7 @@ if ( ( (cache_ptr) == NULL ) ||                                           \
  *-------------------------------------------------------------------------
  */
 
-#define H5C2__INSERT_ENTRY_IN_TL(cache_ptr, entry_ptr, fail_val)       \
+#define H5C__INSERT_ENTRY_IN_TL(cache_ptr, entry_ptr, fail_val)       \
 if ( cache_ptr->mdj_enabled )                                          \
 {                                                                      \
     HDassert( cache_ptr->trans_in_progress );                          \
@@ -4718,16 +4718,16 @@ if ( cache_ptr->mdj_enabled )                                          \
                                                                        \
     entry_ptr->last_trans = cache_ptr->trans_num;                      \
                                                                        \
-    H5C2__TRANS_DLL_PREPEND((entry_ptr), (cache_ptr->tl_head_ptr),     \
+    H5C__TRANS_DLL_PREPEND((entry_ptr), (cache_ptr->tl_head_ptr),     \
                             (cache_ptr->tl_tail_ptr),                  \
                             (cache_ptr->tl_len), (cache_ptr->tl_size), \
                             (fail_val));                               \
-} /* H5C2__INSERT_ENTRY_IN_TL */
+} /* H5C__INSERT_ENTRY_IN_TL */
 
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__UPDATE_TL_FOR_ENTRY_CLEAR
+ * Macro:	H5C__UPDATE_TL_FOR_ENTRY_CLEAR
  *
  * Purpose:     Check to see if journaling is enabled.
  *
@@ -4746,7 +4746,7 @@ if ( cache_ptr->mdj_enabled )                                          \
  *-------------------------------------------------------------------------
  */
 
-#define H5C2__UPDATE_TL_FOR_ENTRY_CLEAR(cache_ptr, entry_ptr, fail_val) \
+#define H5C__UPDATE_TL_FOR_ENTRY_CLEAR(cache_ptr, entry_ptr, fail_val) \
 if ( cache_ptr->mdj_enabled )                                           \
 {                                                                       \
     HDassert( cache_ptr->trans_in_progress );                           \
@@ -4754,18 +4754,18 @@ if ( cache_ptr->mdj_enabled )                                           \
                                                                         \
     if ( entry_ptr->last_trans == cache_ptr->trans_num ) {              \
                                                                         \
-        H5C2__TRANS_DLL_REMOVE((entry_ptr), (cache_ptr->tl_head_ptr),   \
+        H5C__TRANS_DLL_REMOVE((entry_ptr), (cache_ptr->tl_head_ptr),   \
                                (cache_ptr->tl_tail_ptr),                \
                                (cache_ptr->tl_len),                     \
                                (cache_ptr->tl_size), (fail_val));       \
         entry_ptr->last_trans = 0;                                      \
     }                                                                   \
-} /* H5C2__UPDATE_TL_FOR_ENTRY_CLEAR */
+} /* H5C__UPDATE_TL_FOR_ENTRY_CLEAR */
 
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__UPDATE_TL_FOR_ENTRY_DIRTY
+ * Macro:	H5C__UPDATE_TL_FOR_ENTRY_DIRTY
  *
  * Purpose:     Check to see if journaling is enabled.
  *
@@ -4788,7 +4788,7 @@ if ( cache_ptr->mdj_enabled )                                           \
  *-------------------------------------------------------------------------
  */
 
-#define H5C2__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, fail_val) \
+#define H5C__UPDATE_TL_FOR_ENTRY_DIRTY(cache_ptr, entry_ptr, fail_val) \
 if ( cache_ptr->mdj_enabled )                                           \
 {                                                                       \
     HDassert( cache_ptr->trans_in_progress );                           \
@@ -4796,7 +4796,7 @@ if ( cache_ptr->mdj_enabled )                                           \
                                                                         \
     if ( entry_ptr->last_trans == cache_ptr->trans_num ) {              \
                                                                         \
-        H5C2__TRANS_DLL_REMOVE((entry_ptr), (cache_ptr->tl_head_ptr),   \
+        H5C__TRANS_DLL_REMOVE((entry_ptr), (cache_ptr->tl_head_ptr),   \
                                (cache_ptr->tl_tail_ptr),                \
                                (cache_ptr->tl_len),                     \
                                (cache_ptr->tl_size), (fail_val));       \
@@ -4804,16 +4804,16 @@ if ( cache_ptr->mdj_enabled )                                           \
         entry_ptr->last_trans = cache_ptr->trans_num;                   \
     }                                                                   \
                                                                         \
-    H5C2__TRANS_DLL_PREPEND((entry_ptr), (cache_ptr->tl_head_ptr),      \
+    H5C__TRANS_DLL_PREPEND((entry_ptr), (cache_ptr->tl_head_ptr),      \
                             (cache_ptr->tl_tail_ptr),                   \
 		            (cache_ptr->tl_len), (cache_ptr->tl_size),  \
                             (fail_val));                                \
-} /* H5C2__UPDATE_TL_FOR_ENTRY_DIRTY */
+} /* H5C__UPDATE_TL_FOR_ENTRY_DIRTY */
 
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE
+ * Macro:	H5C__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE
  *
  * Purpose:     Update the transaction list for a change in the size of 
  *              one of its constituents.  Note that it is the callers
@@ -4831,24 +4831,24 @@ if ( cache_ptr->mdj_enabled )                                           \
  *-------------------------------------------------------------------------
  */
 
-#define H5C2__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE(cache_ptr, entry_ptr, \
+#define H5C__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE(cache_ptr, entry_ptr, \
                                               old_size, new_size)   \
 if ( ( (cache_ptr)->mdj_enabled ) &&                                \
      ( (entry_ptr)->last_trans == (cache_ptr)->trans_num ) ) {      \
     HDassert( (cache_ptr)->trans_in_progress );                     \
-    H5C2__DLL_UPDATE_FOR_SIZE_CHANGE(((cache_ptr)->tl_len),         \
+    H5C__DLL_UPDATE_FOR_SIZE_CHANGE(((cache_ptr)->tl_len),         \
                                      ((cache_ptr)->tl_size),        \
                                      (old_size), (new_size));       \
-} /* H5C2__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE() */
+} /* H5C__UPDATE_TL_FOR_ENTRY_SIZE_CHANGE() */
 
 
 /*-------------------------------------------------------------------------
  *
- * Macro:	H5C2__JBRB__UPDATE_STATS_FOR* macros
+ * Macro:	H5C__JBRB__UPDATE_STATS_FOR* macros
  *
  * Purpose:     This set of macros exists to update the various journal 
  *		buffer ring buffer stats fields when 
- *		H5C2__JBRB__COLLECT_STATS is TRUE, and do nothing when
+ *		H5C__JBRB__COLLECT_STATS is TRUE, and do nothing when
  *		it is false.
  *
  * Return:      N/A
@@ -4863,12 +4863,12 @@ if ( ( (cache_ptr)->mdj_enabled ) &&                                \
  */
 
 
-#if H5C2__JBRB__COLLECT_STATS
+#if H5C__JBRB__COLLECT_STATS
 
-#define H5C2__JBRB__UPDATE_STATS_FOR_TRANS_COMPLETED(struct_ptr) \
+#define H5C__JBRB__UPDATE_STATS_FOR_TRANS_COMPLETED(struct_ptr) \
 	((struct_ptr)->transactions_completed)++;
 
-#define H5C2__JBRB__UPDATE_STATS_FOR_BUF_WRITE_QUEUED(struct_ptr, partial) \
+#define H5C__JBRB__UPDATE_STATS_FOR_BUF_WRITE_QUEUED(struct_ptr, partial) \
 	((struct_ptr)->buf_writes_queued)++;                               \
 	if ( partial ) {                                                   \
 	    ((struct_ptr)->partial_buf_writes_queued)++;                   \
@@ -4876,7 +4876,7 @@ if ( ( (cache_ptr)->mdj_enabled ) &&                                \
             ((struct_ptr)->full_buf_writes_queued)++;                      \
 	}
 
-#define H5C2__JBRB__UPDATE_STATS_FOR_BUF_WRITE_COMPLETE(struct_ptr, await) \
+#define H5C__JBRB__UPDATE_STATS_FOR_BUF_WRITE_COMPLETE(struct_ptr, await) \
 	((struct_ptr)->buf_writes_completed)++;                            \
         if ( await ) {                                                     \
             ((struct_ptr)->buf_writes_completed_by_await)++;               \
@@ -4884,13 +4884,13 @@ if ( ( (cache_ptr)->mdj_enabled ) &&                                \
             ((struct_ptr)->buf_writes_completed_by_test)++;                \
 	}
 
-#define H5C2__JBRB__UPDATE_STATS_FOR_ASYNC_SYNCS_QUEUED(struct_ptr)            \
+#define H5C__JBRB__UPDATE_STATS_FOR_ASYNC_SYNCS_QUEUED(struct_ptr)            \
 	((struct_ptr)->async_syncs_queued)++;                                  \
         if (((struct_ptr)->max_sync_q_len) < ((struct_ptr)->aio_sync_q_len)) { \
             (struct_ptr)->max_sync_q_len = (struct_ptr)->aio_sync_q_len;       \
         }
 
-#define H5C2__JBRB__UPDATE_STATS_FOR_ASYNC_SYNC_COMPLETED(struct_ptr, await) \
+#define H5C__JBRB__UPDATE_STATS_FOR_ASYNC_SYNC_COMPLETED(struct_ptr, await) \
 	((struct_ptr)->async_syncs_completed)++;                             \
 	if ( await ) {                                                       \
 	    ((struct_ptr)->async_syncs_completed_by_await)++;                \
@@ -4898,27 +4898,27 @@ if ( ( (cache_ptr)->mdj_enabled ) &&                                \
 	    ((struct_ptr)->async_syncs_completed_by_test)++;                 \
 	}
 
-#define H5C2__JBRB__UPDATE_STATS_FOR_AIO_ERROR_CALL_AWAITING_SYNC(struct_ptr) \
+#define H5C__JBRB__UPDATE_STATS_FOR_AIO_ERROR_CALL_AWAITING_SYNC(struct_ptr) \
 	((struct_ptr)->calls_to_aio_error_awaiting_sync)++;
 
-#define H5C2__JBRB__UPDATE_STATS_FOR_CALL_TO_FSYNC(struct_ptr) \
+#define H5C__JBRB__UPDATE_STATS_FOR_CALL_TO_FSYNC(struct_ptr) \
 	((struct_ptr)->calls_to_fsync)++;
 
-#else /* H5C2__JBRB__COLLECT_STATS */
+#else /* H5C__JBRB__COLLECT_STATS */
 
-#define H5C2__JBRB__UPDATE_STATS_FOR_TRANS_COMPLETED(struct_ptr)
+#define H5C__JBRB__UPDATE_STATS_FOR_TRANS_COMPLETED(struct_ptr)
 
-#define H5C2__JBRB__UPDATE_STATS_FOR_BUF_WRITE_QUEUED(struct_ptr, partial)
+#define H5C__JBRB__UPDATE_STATS_FOR_BUF_WRITE_QUEUED(struct_ptr, partial)
 
-#define H5C2__JBRB__UPDATE_STATS_FOR_BUF_WRITE_COMPLETE(struct_ptr, await)
+#define H5C__JBRB__UPDATE_STATS_FOR_BUF_WRITE_COMPLETE(struct_ptr, await)
 
-#define H5C2__JBRB__UPDATE_STATS_FOR_ASYNC_SYNCS_QUEUED(struct_ptr)
+#define H5C__JBRB__UPDATE_STATS_FOR_ASYNC_SYNCS_QUEUED(struct_ptr)
 
-#define H5C2__JBRB__UPDATE_STATS_FOR_ASYNC_SYNC_COMPLETED(struct_ptr, await)
+#define H5C__JBRB__UPDATE_STATS_FOR_ASYNC_SYNC_COMPLETED(struct_ptr, await)
 
-#define H5C2__JBRB__UPDATE_STATS_FOR_AIO_ERROR_CALL_AWAITING_SYNC(struct_ptr)
+#define H5C__JBRB__UPDATE_STATS_FOR_AIO_ERROR_CALL_AWAITING_SYNC(struct_ptr)
 
-#define H5C2__JBRB__UPDATE_STATS_FOR_CALL_TO_FSYNC(struct_ptr)
+#define H5C__JBRB__UPDATE_STATS_FOR_CALL_TO_FSYNC(struct_ptr)
 
-#endif /* H5C2__JBRB__COLLECT_STATS */
-#endif /* _H5C2pkg_H */
+#endif /* H5C__JBRB__COLLECT_STATS */
+#endif /* _H5Cpkg_H */
diff --git a/src/H5C2private.h b/src/H5Cprivate.h
index 9ba6c93..453113a 100644
--- a/src/H5C2private.h
+++ b/src/H5Cprivate.h
@@ -15,7 +15,7 @@
 
 /*-------------------------------------------------------------------------
  *
- * Created:		H5C2private.h
+ * Created:		H5Cprivate.h
  *			6/3/04
  *			John Mainzer
  *
@@ -27,18 +27,18 @@
  *-------------------------------------------------------------------------
  */
 
-#ifndef _H5C2private_H
-#define _H5C2private_H
+#ifndef _H5Cprivate_H
+#define _H5Cprivate_H
 
-#include "H5C2public.h"		/* public prototypes		        */
+#include "H5Cpublic.h"		/* public prototypes		        */
 
 /* Pivate headers needed by this header */
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Fprivate.h"		/* File access				*/
 
 
-#define H5C2_DO_SANITY_CHECKS		1
-#define H5C2_DO_EXTREME_SANITY_CHECKS	0
+#define H5C_DO_SANITY_CHECKS		1
+#define H5C_DO_EXTREME_SANITY_CHECKS	0
 
 /* This sanity checking constant was picked out of the air.  Increase
  * or decrease it if appropriate.  Its purposes is to detect corrupt
@@ -46,28 +46,28 @@
  *
  *					JRM - 5/17/04
  */
-#define H5C2_MAX_ENTRY_SIZE		((size_t)(10 * 1024 * 1024))
+#define H5C_MAX_ENTRY_SIZE		((size_t)(10 * 1024 * 1024))
 
-/* H5C2_COLLECT_CACHE_STATS controls overall collection of statistics
+/* H5C_COLLECT_CACHE_STATS controls overall collection of statistics
  * on cache activity.  In general, this #define should be set to 0.
  */
-#define H5C2_COLLECT_CACHE_STATS	1
+#define H5C_COLLECT_CACHE_STATS	1
 
-/* H5C2_COLLECT_CACHE_ENTRY_STATS controls collection of statistics
+/* H5C_COLLECT_CACHE_ENTRY_STATS controls collection of statistics
  * in individual cache entries.
  *
- * H5C2_COLLECT_CACHE_ENTRY_STATS should only be defined to true if
- * H5C2_COLLECT_CACHE_STATS is also defined to true.
+ * H5C_COLLECT_CACHE_ENTRY_STATS should only be defined to true if
+ * H5C_COLLECT_CACHE_STATS is also defined to true.
  */
-#if H5C2_COLLECT_CACHE_STATS
+#if H5C_COLLECT_CACHE_STATS
 
-#define H5C2_COLLECT_CACHE_ENTRY_STATS	1
+#define H5C_COLLECT_CACHE_ENTRY_STATS	1
 
 #else
 
-#define H5C2_COLLECT_CACHE_ENTRY_STATS	0
+#define H5C_COLLECT_CACHE_ENTRY_STATS	0
 
-#endif /* H5C2_COLLECT_CACHE_STATS */
+#endif /* H5C_COLLECT_CACHE_STATS */
 
 
 #ifdef H5_HAVE_PARALLEL
@@ -75,7 +75,7 @@
 /* we must maintain the clean and dirty LRU lists when we are compiled
  * with parallel support.
  */
-#define H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS  1
+#define H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS  1
 
 #else /* H5_HAVE_PARALLEL */
 
@@ -83,21 +83,21 @@
  * want them on for testing on occasion, but in general they should be
  * off.
  */
-#define H5C2_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS  0 /* JRM */
+#define H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS  0 /* JRM */
 
 #endif /* H5_HAVE_PARALLEL */
 
 
-/* Typedef for the main structure for the cache (defined in H5C2pkg.h) */
+/* Typedef for the main structure for the cache (defined in H5Cpkg.h) */
 
-typedef struct H5C2_t H5C2_t;
+typedef struct H5C_t H5C_t;
 
 
 /***************************************************************************
  *
- * Struct H5C2_class_t
+ * Struct H5C_class_t
  *
- * Instances of H5C2_class_t are used to specify the callback functions
+ * Instances of H5C_class_t are used to specify the callback functions
  * used by the metadata cache for each class of metadata cache entry.
  * The fields of the structure are discussed below:
  *
@@ -118,7 +118,7 @@ typedef struct H5C2_t H5C2_t;
  *
  *	The typedef for the deserialize callback is as follows:
  *
- * 	   typedef void *(*H5C2_deserialize_func_t)(haddr_t addr,
+ * 	   typedef void *(*H5C_deserialize_func_t)(haddr_t addr,
  * 	                                           size_t len,
  *                                                 const void * image_ptr,
  *                                                 void * udata_ptr,
@@ -159,7 +159,7 @@ typedef struct H5C2_t H5C2_t;
  *      representation of that data, load the contents of the image into 
  *      the space allocated for the in core representation, and return 
  *      a pointer to the in core representation.  Observe that an 
- *      instance of H5C2_cache_entry_t must be the first item in this 
+ *      instance of H5C_cache_entry_t must be the first item in this 
  *      representation.  It will have to be initialized appropriately 
  *      after the callback returns.
  *
@@ -191,7 +191,7 @@ typedef struct H5C2_t H5C2_t;
  *
  *      The typedef for the image_len callback is as follows:
  *
- *      typedef herr_t (*H5C2_image_len_func_t)(void *thing,
+ *      typedef herr_t (*H5C_image_len_func_t)(void *thing,
  *                                             size_t *image_len_ptr);
  *
  * 	The parameters of the image_len callback are as follows:
@@ -223,14 +223,14 @@ typedef struct H5C2_t H5C2_t;
  *	change size (and therefor possible location as well) on 
  *	serialization if compression is enabled.  In the old H5C code, 
  *	this happened on a flush, and occasioned a rename in the midst 
- *	of the flush.  To avoid this in H5C2, the serialize callback 
+ *	of the flush.  To avoid this in H5C, the serialize callback 
  *	will return the new base address, length, and image pointer to 
  *	the caller when necessary.  The caller must then update the 
  *	metadata cache's internal structures accordingly.
  *
  *	The typedef for the serialize callback is as follows:
  *
- *	typedef herr_t (*H5C2_serialize_func_t)(const H5F_t *f,
+ *	typedef herr_t (*H5C_serialize_func_t)(const H5F_t *f,
  *                                             hid_t dxpl_id,
  *                                             haddr_t addr,
  *                                             size_t len,
@@ -285,17 +285,17 @@ typedef struct H5C2_t H5C2_t;
  *		indicating whether the resize function resized or renamed 
  *		the entry.  If the entry was neither resized or renamed, 
  *		the serialize function must set *flags_ptr to zero.  
- *		H5C2__SERIALIZE_RESIZED_FLAG and H5C2__SERIALIZE_RENAMED_FLAG 
+ *		H5C__SERIALIZE_RESIZED_FLAG and H5C__SERIALIZE_RENAMED_FLAG 
  *		must be set to indicate a resize and a rename respectively.
  *
- *	        If the H5C2__SERIALIZE_RESIZED_FLAG is set, the new length 
+ *	        If the H5C__SERIALIZE_RESIZED_FLAG is set, the new length 
  *	        and image pointer must be stored in *new_len_ptr and 
  *	        *new_image_ptr_ptr respectively.  
  *
- *	        If the H5C2__SERIALIZE_RENAMED_FLAG flag is also set, the 
+ *	        If the H5C__SERIALIZE_RENAMED_FLAG flag is also set, the 
  *	        new image base address must be stored in *new_addr_ptr.  
- *	        Observe that the H5C2__SERIALIZE_RENAMED_FLAG must not 
- *	        appear without the H5C2__SERIALIZE_RESIZED_FLAG.  
+ *	        Observe that the H5C__SERIALIZE_RENAMED_FLAG must not 
+ *	        appear without the H5C__SERIALIZE_RESIZED_FLAG.  
  *
  *	        Except as noted above, the locations pointed to by the 
  *	        remaining parameters are undefined, and should be ignored 
@@ -332,11 +332,11 @@ typedef struct H5C2_t H5C2_t;
  *	allocate a new one, load the image into the new buffer, load the 
  *	base address of the new buffer into *new_image_ptr_ptr, load the 
  *	length of the new image into *new_len_ptr, and set the 
- *	H5C2__SERIALIZE_RESIZED_FLAG in *flags_ptr.  
+ *	H5C__SERIALIZE_RESIZED_FLAG in *flags_ptr.  
  *
  *	If in addition, the base address of the on disk image must 
  *	be changed, the serialize function must also set *new_addr_ptr 
- *	to the new base address, and set the H5C2__SERIALIZE_RENAMED_FLAG 
+ *	to the new base address, and set the H5C__SERIALIZE_RENAMED_FLAG 
  *	in *flags_ptr.
  *
  *	If it is successful, the function must return SUCCEED.  
@@ -449,19 +449,19 @@ typedef struct H5C2_t H5C2_t;
  *	routines.
  *
  ***************************************************************************/
-typedef void *(*H5C2_deserialize_func_t)(haddr_t addr,
+typedef void *(*H5C_deserialize_func_t)(haddr_t addr,
                                          size_t len,
                                          const void * image_ptr,
                                          void * udata_ptr,
 					 hbool_t * dirty_ptr);
  
-typedef herr_t (*H5C2_image_len_func_t)(const void *thing,
+typedef herr_t (*H5C_image_len_func_t)(const void *thing,
                                         size_t *image_len_ptr);
 
-#define H5C2__SERIALIZE_RESIZED_FLAG	0x1
-#define H5C2__SERIALIZE_RENAMED_FLAG	0x2
+#define H5C__SERIALIZE_RESIZED_FLAG	0x1
+#define H5C__SERIALIZE_RENAMED_FLAG	0x2
 
-typedef herr_t (*H5C2_serialize_func_t)(const H5F_t *f,
+typedef herr_t (*H5C_serialize_func_t)(const H5F_t *f,
 		                        hid_t dxpl_id,
                                         haddr_t addr,
                                         size_t len,
@@ -472,33 +472,33 @@ typedef herr_t (*H5C2_serialize_func_t)(const H5F_t *f,
 				        size_t * new_len_ptr, 
 				        void ** new_image_ptr_ptr);
 
-typedef herr_t (*H5C2_free_icr_func_t)(haddr_t addr, 
+typedef herr_t (*H5C_free_icr_func_t)(haddr_t addr, 
                                        size_t len,
                                        void * thing);
 
-typedef herr_t (*H5C2_clear_dirty_bits_func_t)(haddr_t addr,
+typedef herr_t (*H5C_clear_dirty_bits_func_t)(haddr_t addr,
                                                size_t len,
                                                void * thing);
 
-typedef struct H5C2_class_t {
+typedef struct H5C_class_t {
     int					id;
     const char *			name;
     H5FD_mem_t				mem_type;
-    H5C2_deserialize_func_t 		deserialize;
-    H5C2_image_len_func_t		image_len;
-    H5C2_serialize_func_t		serialize;
-    H5C2_free_icr_func_t		free_icr;
-    H5C2_clear_dirty_bits_func_t	clear_dirty_bits;
-} H5C2_class_t;
+    H5C_deserialize_func_t 		deserialize;
+    H5C_image_len_func_t		image_len;
+    H5C_serialize_func_t		serialize;
+    H5C_free_icr_func_t		free_icr;
+    H5C_clear_dirty_bits_func_t	clear_dirty_bits;
+} H5C_class_t;
 
 
 /* Type defintions of call back functions used by the cache as a whole */
 
-typedef herr_t (*H5C2_write_permitted_func_t)(const H5F_t *f,
+typedef herr_t (*H5C_write_permitted_func_t)(const H5F_t *f,
                                              hid_t dxpl_id,
                                              hbool_t * write_permitted_ptr);
 
-typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr,
+typedef herr_t (*H5C_log_flush_func_t)(H5C_t * cache_ptr,
                                        haddr_t addr,
                                        hbool_t was_dirty,
                                        unsigned flags,
@@ -508,28 +508,28 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr,
  * out of a hat -- you should be able to change them as necessary.
  *
  * However, if you need a very big cache, you should also increase the
- * size of the hash table (H5C2__HASH_TABLE_LEN in H5C2pkg.h).  The current
+ * size of the hash table (H5C__HASH_TABLE_LEN in H5Cpkg.h).  The current
  * upper bound on cache size is rather large for the current hash table
  * size.
  */
 
-#define H5C2__MAX_MAX_CACHE_SIZE		((size_t)(128 * 1024 * 1024))
-#define H5C2__MIN_MAX_CACHE_SIZE		((size_t)(1024))
+#define H5C__MAX_MAX_CACHE_SIZE		((size_t)(128 * 1024 * 1024))
+#define H5C__MIN_MAX_CACHE_SIZE		((size_t)(1024))
 
 
 /* Default max cache size and min clean size are give here to make
  * them generally accessable.
  */
 
-#define H5C2__DEFAULT_MAX_CACHE_SIZE     ((size_t)(4 * 1024 * 1024))
-#define H5C2__DEFAULT_MIN_CLEAN_SIZE     ((size_t)(2 * 1024 * 1024))
+#define H5C__DEFAULT_MAX_CACHE_SIZE     ((size_t)(4 * 1024 * 1024))
+#define H5C__DEFAULT_MIN_CLEAN_SIZE     ((size_t)(2 * 1024 * 1024))
 
 
 /****************************************************************************
  *
- * structure H5C2_cache_entry_t
+ * structure H5C_cache_entry_t
  *
- * Instances of the H5C2_cache_entry_t structure are used to store cache
+ * Instances of the H5C_cache_entry_t structure are used to store cache
  * entries in a hash table and sometimes in a skip list.
  * See H5SL.c for the particulars of the skip list.
  *
@@ -544,21 +544,21 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr,
  *						JRM - 4/26/04
  *
  * magic:	Unsigned 32 bit integer that must always be set to 
- *              H5C2__H5C2_CACHE_ENTRY_T_MAGIC when the entry is valid.
- *              The field must be set to H5C2__H5C2_CACHE_ENTRY_T_BAD_MAGIC
+ *              H5C__H5C_CACHE_ENTRY_T_MAGIC when the entry is valid.
+ *              The field must be set to H5C__H5C_CACHE_ENTRY_T_BAD_MAGIC
  *              just before the entry is freed.
  *
  *              This is necessary, as the LRU list can be changed out 
- *              from under H5C2_make_space_in_cache() by the serialize
+ *              from under H5C_make_space_in_cache() by the serialize
  *              callback which may change the size of an existing entry,
  *              and/or load a new entry while serializing the target entry.
  *
  *              This in turn can cause a recursive call to 
- *              H5C2_make_space_in_cache() which may either flush or evict
+ *              H5C_make_space_in_cache() which may either flush or evict
  *              the next entry that the first invocation of that function
  *              was about to examine.
  *
- *              The magic field allows H5C2_make_space_in_cache() to
+ *              The magic field allows H5C_make_space_in_cache() to
  *              detect this case, and re-start its scan from the bottom 
  *              of the LRU when this situation occurs.
  *
@@ -590,9 +590,9 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr,
  * image_up_to_date:  Boolean flag that is set to TRUE when *image_ptr
  * 		is up to date, and set to false when the entry is dirtied.
  *
- * type:	Pointer to the instance of H5C2_class_t containing pointers
+ * type:	Pointer to the instance of H5C_class_t containing pointers
  *		to the methods for cache entries of the current type.  This
- *		field should be NULL when the instance of H5C2_cache_entry_t
+ *		field should be NULL when the instance of H5C_cache_entry_t
  *		is not in use.
  *
  *		The name is not particularly descriptive, but is retained
@@ -626,10 +626,10 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr,
  *
  * 		This field is set to FALSE in the protect call, and may
  * 		be set to TRUE by the
- * 		H5C2_mark_pinned_or_protected_entry_dirty()
+ * 		H5C_mark_pinned_or_protected_entry_dirty()
  * 		call at an time prior to the unprotect call.
  *
- * 		The H5C2_mark_pinned_or_protected_entry_dirty() call exists
+ * 		The H5C_mark_pinned_or_protected_entry_dirty() call exists
  * 		as a convenience function for the fractal heap code which
  * 		may not know if an entry is protected or pinned, but knows
  * 		that is either protected or pinned.  The dirtied field was
@@ -700,11 +700,11 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr,
  *			when they are flushed.
  *
  * flush_marker:  Boolean flag indicating that the entry is to be flushed
- *		the next time H5C2_flush_cache() is called with the
- *		H5C2__FLUSH_MARKED_ENTRIES_FLAG.  The flag is reset when
+ *		the next time H5C_flush_cache() is called with the
+ *		H5C__FLUSH_MARKED_ENTRIES_FLAG.  The flag is reset when
  *		the entry is flushed for whatever reason.
  *
- * clear_on_unprotect:  Boolean flag used only in PHDF5.  When H5C2 is used
+ * clear_on_unprotect:  Boolean flag used only in PHDF5.  When H5C is used
  *		to implement the metadata cache In the parallel case, only
  *		the cache with mpi rank 0 is allowed to actually write to
  *		file -- all other caches must retain dirty entries until they
@@ -714,7 +714,7 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr,
  *		received when the entry is protected.  If it is set when an
  *		entry is unprotected, and the dirtied flag is not set in
  *		the unprotect, the entry's is_dirty flag is reset by flushing
- *		it with the H5C2__FLUSH_CLEAR_ONLY_FLAG.
+ *		it with the H5C__FLUSH_CLEAR_ONLY_FLAG.
  *
  * flush_in_progress:  Boolean flag that is set to true iff the entry
  * 		is in the process of being flushed.  This allows the cache
@@ -764,7 +764,7 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr,
  * clean and dirty LRU lists to the usual LRU list.  When reading in
  * parallel mode, we evict from the clean LRU list only.  This implies
  * that we must try to ensure that the clean LRU list is reasonably well
- * stocked.  See the comments on H5C2_t in H5C2pkg.h for more details.
+ * stocked.  See the comments on H5C_t in H5Cpkg.h for more details.
  *
  * Note that even if we start with a completely clean cache, a sequence
  * of protects without unprotects can empty the clean LRU list.  In this
@@ -835,8 +835,8 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr,
  *
  * Cache entry stats collection fields:
  *
- * These fields should only be compiled in when both H5C2_COLLECT_CACHE_STATS
- * and H5C2_COLLECT_CACHE_ENTRY_STATS are true.  When present, they allow
+ * These fields should only be compiled in when both H5C_COLLECT_CACHE_STATS
+ * and H5C_COLLECT_CACHE_ENTRY_STATS are true.  When present, they allow
  * collection of statistics on individual cache entries.
  *
  * accesses:	int32_t containing the number of times this cache entry has
@@ -854,21 +854,21 @@ typedef herr_t (*H5C2_log_flush_func_t)(H5C2_t * cache_ptr,
  ****************************************************************************/
 
 #ifndef NDEBUG
-#define H5C2__H5C2_CACHE_ENTRY_T_MAGIC		0x005CAC0A
-#define H5C2__H5C2_CACHE_ENTRY_T_BAD_MAGIC	0xDeadBeef
+#define H5C__H5C_CACHE_ENTRY_T_MAGIC		0x005CAC0A
+#define H5C__H5C_CACHE_ENTRY_T_BAD_MAGIC	0xDeadBeef
 #endif /* NDEBUG */
 
-typedef struct H5C2_cache_entry_t
+typedef struct H5C_cache_entry_t
 {
 #ifndef NDEBUG
     uint32_t			magic;
 #endif /* NDEBUG */
-    H5C2_t *                    cache_ptr;
+    H5C_t *                    cache_ptr;
     haddr_t			addr;
     size_t			size;
     void *			image_ptr;
     hbool_t			image_up_to_date;
-    const H5C2_class_t *	type;
+    const H5C_class_t *	type;
     hbool_t			is_dirty;
     hbool_t			dirtied;
     hbool_t			is_protected;
@@ -885,24 +885,24 @@ typedef struct H5C2_cache_entry_t
 
     /* fields supporting the hash table: */
 
-    struct H5C2_cache_entry_t *	ht_next;
-    struct H5C2_cache_entry_t *	ht_prev;
+    struct H5C_cache_entry_t *	ht_next;
+    struct H5C_cache_entry_t *	ht_prev;
 
     /* fields supporting replacement policies: */
 
-    struct H5C2_cache_entry_t *	next;
-    struct H5C2_cache_entry_t *	prev;
-    struct H5C2_cache_entry_t *	aux_next;
-    struct H5C2_cache_entry_t *	aux_prev;
+    struct H5C_cache_entry_t *	next;
+    struct H5C_cache_entry_t *	prev;
+    struct H5C_cache_entry_t *	aux_next;
+    struct H5C_cache_entry_t *	aux_prev;
 
 
     /* fields supporting journaling */
 
     uint64_t			last_trans;
-    struct H5C2_cache_entry_t * trans_next;
-    struct H5C2_cache_entry_t * trans_prev;
+    struct H5C_cache_entry_t * trans_next;
+    struct H5C_cache_entry_t * trans_prev;
 
-#if H5C2_COLLECT_CACHE_ENTRY_STATS
+#if H5C_COLLECT_CACHE_ENTRY_STATS
 
     /* cache entry stats fields */
 
@@ -911,23 +911,23 @@ typedef struct H5C2_cache_entry_t
     int32_t			flushes;
     int32_t			pins;
 
-#endif /* H5C2_COLLECT_CACHE_ENTRY_STATS */
+#endif /* H5C_COLLECT_CACHE_ENTRY_STATS */
 
-} H5C2_cache_entry_t;
+} H5C_cache_entry_t;
 
 
 /****************************************************************************
  *
- * structure H5C2_auto_size_ctl_t
+ * structure H5C_auto_size_ctl_t
  *
- * Instances of H5C2_auto_size_ctl_t are used to get and set the control
+ * Instances of H5C_auto_size_ctl_t are used to get and set the control
  * fields for automatic cache re-sizing.
  *
  * The fields of the structure are discussed individually below:
  *
  * version: Integer field containing the version number of this version
- *	of the H5C2_auto_size_ctl_t structure.  Any instance of
- *	H5C2_auto_size_ctl_t passed to the cache must have a known
+ *	of the H5C_auto_size_ctl_t structure.  Any instance of
+ *	H5C_auto_size_ctl_t passed to the cache must have a known
  *	version number, or an error will be flagged.
  *
  * report_fcn:  Pointer to the function that is to be called to report
@@ -935,7 +935,7 @@ typedef struct H5C2_cache_entry_t
  *	field is NULL, no call is made.
  *
  *	If the field is not NULL, it must contain the address of a function
- *	of type H5C2_auto_resize_report_fcn.
+ *	of type H5C_auto_resize_report_fcn.
  *
  * set_initial_size: Boolean flag indicating whether the size of the
  *	initial size of the cache is to be set to the value given in
@@ -966,22 +966,22 @@ typedef struct H5C2_cache_entry_t
  *
  *	At the end of an epoch, we discard prior hit rate data and start
  * 	collecting afresh.  The epoch_length must lie in the closed
- *	interval [H5C2__MIN_AR_EPOCH_LENGTH, H5C2__MAX_AR_EPOCH_LENGTH].
+ *	interval [H5C__MIN_AR_EPOCH_LENGTH, H5C__MAX_AR_EPOCH_LENGTH].
  *
  *
  * Cache size increase control fields:
  *
- * incr_mode: Instance of the H5C2_cache_incr_mode enumerated type whose
+ * incr_mode: Instance of the H5C_cache_incr_mode enumerated type whose
  *	value indicates how we determine whether the cache size should be
  *	increased.  At present there are two possible values:
  *
- *	H5C2_incr__off:	Don't attempt to increase the size of the cache
+ *	H5C_incr__off:	Don't attempt to increase the size of the cache
  *		automatically.
  *
  *		When this increment mode is selected, the remaining fields
  *		in the cache size increase section ar ignored.
  *
- *	H5C2_incr__threshold: Attempt to increase the size of the cache
+ *	H5C_incr__threshold: Attempt to increase the size of the cache
  *		whenever the average hit rate over the last epoch drops
  *		below the value supplied in the lower_hr_threshold
  *		field.
@@ -991,7 +991,7 @@ typedef struct H5C2_cache_entry_t
  *		all available space.
  *
  * lower_hr_threshold: Lower hit rate threshold.  If the increment mode
- *	(incr_mode) is H5C2_incr__threshold and the hit rate drops below the
+ *	(incr_mode) is H5C_incr__threshold and the hit rate drops below the
  *	value supplied in this field in an epoch, increment the cache size by
  *	size_increment.  Note that cache size may not be incremented above
  *	max_size, and that the increment may be further restricted by the
@@ -1016,7 +1016,7 @@ typedef struct H5C2_cache_entry_t
  *	above, this field contains the maximum number of bytes by which the
  *	cache size can be increased in a single re-size.
  *
- * flash_incr_mode:  Instance of the H5C2_cache_flash_incr_mode enumerated
+ * flash_incr_mode:  Instance of the H5C_cache_flash_incr_mode enumerated
  *      type whose value indicates whether and by what algorithm we should
  *      make flash increases in the size of the cache to accomodate insertion
  *      of large entries and large increases in the size of a single entry.
@@ -1029,10 +1029,10 @@ typedef struct H5C2_cache_entry_t
  *
  *      At present, there are two possible values for the flash_incr_mode:
  *
- *      H5C2_flash_incr__off:  Don't perform flash increases in the size of
+ *      H5C_flash_incr__off:  Don't perform flash increases in the size of
  *              the cache.
  *
- *      H5C2_flash_incr__add_space:  Let x be either the size of a newly
+ *      H5C_flash_incr__add_space:  Let x be either the size of a newly
  *              newly inserted entry, or the number of bytes by which the
  *              size of an existing entry has been increased.
  *
@@ -1058,34 +1058,34 @@ typedef struct H5C2_cache_entry_t
  *      expect to revisit the issue.
  *
  * flash_multiple: Double containing the multiple described above in the
- *      H5C2_flash_incr__add_space section of the discussion of the
+ *      H5C_flash_incr__add_space section of the discussion of the
  *      flash_incr_mode section.  This field is ignored unless flash_incr_mode
- *      is H5C2_flash_incr__add_space.
+ *      is H5C_flash_incr__add_space.
  *
  * flash_threshold: Double containing the factor by which current max cache 
  * 	size is multiplied to obtain the size threshold for the add_space 
  * 	flash increment algorithm.  The field is ignored unless 
- * 	flash_incr_mode is H5C2_flash_incr__add_space.
+ * 	flash_incr_mode is H5C_flash_incr__add_space.
  * 
  *
  * Cache size decrease control fields:
  *
- * decr_mode: Instance of the H5C2_cache_decr_mode enumerated type whose
+ * decr_mode: Instance of the H5C_cache_decr_mode enumerated type whose
  *	value indicates how we determine whether the cache size should be
  *	decreased.  At present there are four possibilities.
  *
- *	H5C2_decr__off:	Don't attempt to decrease the size of the cache
+ *	H5C_decr__off:	Don't attempt to decrease the size of the cache
  *		automatically.
  *
  *		When this increment mode is selected, the remaining fields
  *		in the cache size decrease section are ignored.
  *
- *	H5C2_decr__threshold: Attempt to decrease the size of the cache
+ *	H5C_decr__threshold: Attempt to decrease the size of the cache
  *		whenever the average hit rate over the last epoch rises
  *		above the value	supplied in the upper_hr_threshold
  *		field.
  *
- *	H5C2_decr__age_out:  At the end of each epoch, search the cache for
+ *	H5C_decr__age_out:  At the end of each epoch, search the cache for
  *		entries that have not been accessed for at least the number
  *		of epochs specified in the epochs_before_eviction field, and
  *		evict these entries.  Conceptually, the maximum cache size
@@ -1093,7 +1093,7 @@ typedef struct H5C2_cache_entry_t
  *		this reduction may be modified by the min_size, the
  *		max_decrement, and/or the empty_reserve.
  *
- *	H5C2_decr__age_out_with_threshold:  Same as age_out, but we only
+ *	H5C_decr__age_out_with_threshold:  Same as age_out, but we only
  *		attempt to reduce the cache size when the hit rate observed
  *		over the last epoch exceeds the value provided in the
  *		upper_hr_threshold field.
@@ -1101,10 +1101,10 @@ typedef struct H5C2_cache_entry_t
  * upper_hr_threshold: Upper hit rate threshold.  The use of this field
  *	varies according to the current decr_mode:
  *
- *	H5C2_decr__off or H5C2_decr__age_out:  The value of this field is
+ *	H5C_decr__off or H5C_decr__age_out:  The value of this field is
  *		ignored.
  *
- *	H5C2_decr__threshold:  If the hit rate exceeds this threshold in any
+ *	H5C_decr__threshold:  If the hit rate exceeds this threshold in any
  *		epoch, attempt to decrement the cache size by size_decrement.
  *
  *		Note that cache size may not be decremented below min_size.
@@ -1112,13 +1112,13 @@ typedef struct H5C2_cache_entry_t
  *		Note also that if the upper_threshold is 1.0, the cache size
  *		will never be reduced.
  *
- *	H5C2_decr__age_out_with_threshold:  If the hit rate exceeds this
+ *	H5C_decr__age_out_with_threshold:  If the hit rate exceeds this
  *		threshold in any epoch, attempt to reduce the cache size
  *		by evicting entries that have not been accessed for more
  *		than the specified number of epochs.
  *
  * decrement: This field is only used when the decr_mode is
- *	H5C2_decr__threshold.
+ *	H5C_decr__threshold.
  *
  *	The field is a double containing the multiplier used to derive the
  *	new cache size from the old if a cache size decrement is triggered.
@@ -1134,20 +1134,20 @@ typedef struct H5C2_cache_entry_t
  *	restricted by the min_size of the cache, and (in age out modes) by
  *	the empty_reserve field.
  *
- * epochs_before_eviction:  Integer field used in H5C2_decr__age_out and
- *	H5C2_decr__age_out_with_threshold decrement modes.
+ * epochs_before_eviction:  Integer field used in H5C_decr__age_out and
+ *	H5C_decr__age_out_with_threshold decrement modes.
  *
  *	This field contains the number of epochs an entry must remain
  *	unaccessed before it is evicted in an attempt to reduce the
  *	cache size.  If applicable, this field must lie in the range
- *	[1, H5C2__MAX_EPOCH_MARKERS].
+ *	[1, H5C__MAX_EPOCH_MARKERS].
  *
  * apply_empty_reserve:  Boolean field controlling whether the empty_reserve
  *	field is to be used in computing the new cache size when the
- *	decr_mode is H5C2_decr__age_out or H5C2_decr__age_out_with_threshold.
+ *	decr_mode is H5C_decr__age_out or H5C_decr__age_out_with_threshold.
  *
  * empty_reserve:  To avoid a constant racheting down of cache size by small
- *	amounts in the H5C2_decr__age_out and H5C2_decr__age_out_with_threshold
+ *	amounts in the H5C_decr__age_out and H5C_decr__age_out_with_threshold
  *	modes, this field allows one to require that any cache size
  *	reductions leave the specified fraction of unused space in the cache.
  *
@@ -1156,48 +1156,48 @@ typedef struct H5C2_cache_entry_t
  *
  ****************************************************************************/
 
-#define H5C2_RESIZE_CFG__VALIDATE_GENERAL        0x1
-#define H5C2_RESIZE_CFG__VALIDATE_INCREMENT      0x2
-#define H5C2_RESIZE_CFG__VALIDATE_DECREMENT      0x4
-#define H5C2_RESIZE_CFG__VALIDATE_INTERACTIONS   0x8
-#define H5C2_RESIZE_CFG__VALIDATE_ALL      \
+#define H5C_RESIZE_CFG__VALIDATE_GENERAL        0x1
+#define H5C_RESIZE_CFG__VALIDATE_INCREMENT      0x2
+#define H5C_RESIZE_CFG__VALIDATE_DECREMENT      0x4
+#define H5C_RESIZE_CFG__VALIDATE_INTERACTIONS   0x8
+#define H5C_RESIZE_CFG__VALIDATE_ALL      \
 (                                         \
-    H5C2_RESIZE_CFG__VALIDATE_GENERAL |    \
-    H5C2_RESIZE_CFG__VALIDATE_INCREMENT |  \
-    H5C2_RESIZE_CFG__VALIDATE_DECREMENT |  \
-    H5C2_RESIZE_CFG__VALIDATE_INTERACTIONS \
+    H5C_RESIZE_CFG__VALIDATE_GENERAL |    \
+    H5C_RESIZE_CFG__VALIDATE_INCREMENT |  \
+    H5C_RESIZE_CFG__VALIDATE_DECREMENT |  \
+    H5C_RESIZE_CFG__VALIDATE_INTERACTIONS \
 )
 
-#define H5C2__CURR_AUTO_SIZE_CTL_VER		1
-#define H5C2__CURR_AUTO_RESIZE_RPT_FCN_VER	1
-
-#define H5C2__MAX_EPOCH_MARKERS  		10
-
-#define H5C2__DEF_AR_UPPER_THRESHHOLD		0.9999
-#define H5C2__DEF_AR_LOWER_THRESHHOLD		0.9
-#define H5C2__DEF_AR_MAX_SIZE			((size_t)(16 * 1024 * 1024))
-#define H5C2__DEF_AR_INIT_SIZE			((size_t)( 1 * 1024 * 1024))
-#define H5C2__DEF_AR_MIN_SIZE			((size_t)( 1 * 1024 * 1024))
-#define H5C2__DEF_AR_MIN_CLEAN_FRAC		0.5
-#define H5C2__DEF_AR_INCREMENT			2.0
-#define H5C2__DEF_AR_MAX_INCREMENT		((size_t)( 2 * 1024 * 1024))
-#define H5C2__DEF_AR_FLASH_MULTIPLE             1.0
-#define H5C2__DEV_AR_FLASH_THRESHOLD            0.25
-#define H5C2__DEF_AR_DECREMENT			0.9
-#define H5C2__DEF_AR_MAX_DECREMENT		((size_t)( 1 * 1024 * 1024))
-#define H5C2__DEF_AR_EPCHS_B4_EVICT		3
-#define H5C2__DEF_AR_EMPTY_RESERVE		0.05
-#define H5C2__MIN_AR_EPOCH_LENGTH		100
-#define H5C2__DEF_AR_EPOCH_LENGTH		50000
-#define H5C2__MAX_AR_EPOCH_LENGTH		1000000
-
-#define H5C2__MIN_JBRB_BUF_SIZE			((size_t)(1))
-#define H5C2__MAX_JBRB_BUF_SIZE			((size_t)(2 * 1024 * 1024))
-
-#define H5C2__MIN_JBRB_NUM_BUFS			1
-#define H5C2__MAX_JBRB_NUM_BUFS			256
-
-enum H5C2_resize_status
+#define H5C__CURR_AUTO_SIZE_CTL_VER		1
+#define H5C__CURR_AUTO_RESIZE_RPT_FCN_VER	1
+
+#define H5C__MAX_EPOCH_MARKERS  		10
+
+#define H5C__DEF_AR_UPPER_THRESHHOLD		0.9999
+#define H5C__DEF_AR_LOWER_THRESHHOLD		0.9
+#define H5C__DEF_AR_MAX_SIZE			((size_t)(16 * 1024 * 1024))
+#define H5C__DEF_AR_INIT_SIZE			((size_t)( 1 * 1024 * 1024))
+#define H5C__DEF_AR_MIN_SIZE			((size_t)( 1 * 1024 * 1024))
+#define H5C__DEF_AR_MIN_CLEAN_FRAC		0.5
+#define H5C__DEF_AR_INCREMENT			2.0
+#define H5C__DEF_AR_MAX_INCREMENT		((size_t)( 2 * 1024 * 1024))
+#define H5C__DEF_AR_FLASH_MULTIPLE             1.0
+#define H5C__DEV_AR_FLASH_THRESHOLD            0.25
+#define H5C__DEF_AR_DECREMENT			0.9
+#define H5C__DEF_AR_MAX_DECREMENT		((size_t)( 1 * 1024 * 1024))
+#define H5C__DEF_AR_EPCHS_B4_EVICT		3
+#define H5C__DEF_AR_EMPTY_RESERVE		0.05
+#define H5C__MIN_AR_EPOCH_LENGTH		100
+#define H5C__DEF_AR_EPOCH_LENGTH		50000
+#define H5C__MAX_AR_EPOCH_LENGTH		1000000
+
+#define H5C__MIN_JBRB_BUF_SIZE			((size_t)(1))
+#define H5C__MAX_JBRB_BUF_SIZE			((size_t)(2 * 1024 * 1024))
+
+#define H5C__MIN_JBRB_NUM_BUFS			1
+#define H5C__MAX_JBRB_NUM_BUFS			256
+
+enum H5C_resize_status
 {
     in_spec2,
     increase2,
@@ -1208,22 +1208,22 @@ enum H5C2_resize_status
     increase_disabled2,
     decrease_disabled2,
     not_full2
-}; /* enum H5C2_resize_conditions */
+}; /* enum H5C_resize_conditions */
 
-typedef void (*H5C2_auto_resize_rpt_fcn)(H5C2_t * cache_ptr,
+typedef void (*H5C_auto_resize_rpt_fcn)(H5C_t * cache_ptr,
                                         int32_t version,
                                         double hit_rate,
-                                        enum H5C2_resize_status status,
+                                        enum H5C_resize_status status,
                                         size_t old_max_cache_size,
                                         size_t new_max_cache_size,
                                         size_t old_min_clean_size,
                                         size_t new_min_clean_size);
 
-typedef struct H5C2_auto_size_ctl_t
+typedef struct H5C_auto_size_ctl_t
 {
     /* general configuration fields: */
     int32_t				version;
-    H5C2_auto_resize_rpt_fcn		rpt_fcn;
+    H5C_auto_resize_rpt_fcn		rpt_fcn;
 
     hbool_t				set_initial_size;
     size_t				initial_size;
@@ -1237,7 +1237,7 @@ typedef struct H5C2_auto_size_ctl_t
 
 
     /* size increase control fields: */
-    enum H5C2_cache_incr_mode		incr_mode;
+    enum H5C_cache_incr_mode		incr_mode;
 
     double				lower_hr_threshold;
 
@@ -1246,13 +1246,13 @@ typedef struct H5C2_auto_size_ctl_t
     hbool_t				apply_max_increment;
     size_t				max_increment;
 
-    enum H5C2_cache_flash_incr_mode     flash_incr_mode;
+    enum H5C_cache_flash_incr_mode     flash_incr_mode;
     double                              flash_multiple;
     double                              flash_threshold;
 
 
     /* size decrease control fields: */
-    enum H5C2_cache_decr_mode		decr_mode;
+    enum H5C_cache_decr_mode		decr_mode;
 
     double				upper_hr_threshold;
 
@@ -1266,21 +1266,21 @@ typedef struct H5C2_auto_size_ctl_t
     hbool_t				apply_empty_reserve;
     double				empty_reserve;
 
-} H5C2_auto_size_ctl_t;
+} H5C_auto_size_ctl_t;
 
 
 /****************************************************************************
  *
- * structure H5C2_mdj_config_t
+ * structure H5C_mdj_config_t
  *
- * H5C2_mdj_config_t is a structure intended for use in comminicating 
+ * H5C_mdj_config_t is a structure intended for use in comminicating 
  * metadata journaling configuration data to and from the metadata 
  * cache. 
  *
- * In its initial incarnation, it is identical to the H5AC2_jnl_config_t
+ * In its initial incarnation, it is identical to the H5AC_jnl_config_t
  * structure less ther version, and journal_recovered fields.  However, 
  * in the future we may support other types of journaling -- which will 
- * likely require modification or replacement of the H5AC2_jnl_config_t 
+ * likely require modification or replacement of the H5AC_jnl_config_t 
  * structure.
  *
  * The fields of the structure are discussed individually below.  Note
@@ -1299,8 +1299,8 @@ typedef struct H5C2_auto_size_ctl_t
  *      is TRUE.
  *
  *      At present, the length of the journal file path is restricted to
- *      no more than H5C2__MAX_JOURNAL_FILE_NAME_LEN (which must equal
- *      H5AC2__MAX_JOURNAL_FILE_NAME_LEN). 
+ *      no more than H5C__MAX_JOURNAL_FILE_NAME_LEN (which must equal
+ *      H5AC__MAX_JOURNAL_FILE_NAME_LEN). 
  *
  * jbrb_buf_size: size_t containing the size of each individual buffer
  *      in the journal buffer ring buffer.  This size should be chosen
@@ -1323,24 +1323,24 @@ typedef struct H5C2_auto_size_ctl_t
  *
  ****************************************************************************/
 
-#define H5C2__MAX_JOURNAL_FILE_NAME_LEN        1024
+#define H5C__MAX_JOURNAL_FILE_NAME_LEN        1024
 
-typedef struct H5C2_mdj_config_t
+typedef struct H5C_mdj_config_t
 {
     hbool_t     enable_journaling;
-    char        journal_file_path[H5C2__MAX_JOURNAL_FILE_NAME_LEN + 1];
+    char        journal_file_path[H5C__MAX_JOURNAL_FILE_NAME_LEN + 1];
     size_t      jbrb_buf_size;
     int         jbrb_num_bufs;
     hbool_t     jbrb_use_aio;
     hbool_t     jbrb_human_readable;
 
-} H5C2_mdj_config_t;
+} H5C_mdj_config_t;
 
 /* The following typedef is used for callbacks on metadata journaling
  * configuration changes.
  */
 
-typedef herr_t (*H5C2_mdj_status_change_func_t)(const H5C2_mdj_config_t * config_ptr,
+typedef herr_t (*H5C_mdj_status_change_func_t)(const H5C_mdj_config_t * config_ptr,
                                               hid_t dxpl_id,
 		                              void * data_ptr);
 
@@ -1356,103 +1356,103 @@ typedef herr_t (*H5C2_mdj_status_change_func_t)(const H5C2_mdj_config_t * config
  *
  * These flags apply to all function calls:
  *
- * 	H5C2__NO_FLAGS_SET (generic "no flags set" for all fcn calls)
+ * 	H5C__NO_FLAGS_SET (generic "no flags set" for all fcn calls)
  *
  *
- * These flags apply to H5C2_insert_entry():
+ * These flags apply to H5C_insert_entry():
  *
- * 	H5C2__SET_FLUSH_MARKER_FLAG
- * 	H5C2__PIN_ENTRY_FLAG
+ * 	H5C__SET_FLUSH_MARKER_FLAG
+ * 	H5C__PIN_ENTRY_FLAG
  *
- * These flags apply to H5C2_protect()
+ * These flags apply to H5C_protect()
  *
- * 	H5C2__READ_ONLY_FLAG
+ * 	H5C__READ_ONLY_FLAG
  *
- * These flags apply to H5C2_unprotect():
+ * These flags apply to H5C_unprotect():
  *
- * 	H5C2__SET_FLUSH_MARKER_FLAG
- * 	H5C2__DELETED_FLAG
- * 	H5C2__DIRTIED_FLAG
- * 	H5C2__SIZE_CHANGED_FLAG
- * 	H5C2__PIN_ENTRY_FLAG
- * 	H5C2__UNPIN_ENTRY_FLAG
+ * 	H5C__SET_FLUSH_MARKER_FLAG
+ * 	H5C__DELETED_FLAG
+ * 	H5C__DIRTIED_FLAG
+ * 	H5C__SIZE_CHANGED_FLAG
+ * 	H5C__PIN_ENTRY_FLAG
+ * 	H5C__UNPIN_ENTRY_FLAG
  *
  *
- * These flags apply to H5C2_flush_cache():
+ * These flags apply to H5C_flush_cache():
  *
- * 	H5C2__FLUSH_INVALIDATE_FLAG
- * 	H5C2__FLUSH_CLEAR_ONLY_FLAG
- * 	H5C2__FLUSH_MARKED_ENTRIES_FLAG
- *	H5C2__FLUSH_IGNORE_PROTECTED_FLAG (can't use this flag in combination
- *					  with H5C2__FLUSH_INVALIDATE_FLAG)
+ * 	H5C__FLUSH_INVALIDATE_FLAG
+ * 	H5C__FLUSH_CLEAR_ONLY_FLAG
+ * 	H5C__FLUSH_MARKED_ENTRIES_FLAG
+ *	H5C__FLUSH_IGNORE_PROTECTED_FLAG (can't use this flag in combination
+ *					  with H5C__FLUSH_INVALIDATE_FLAG)
  *
- * These flags apply to H5C2_flush_single_entry():
+ * These flags apply to H5C_flush_single_entry():
  *
- * 	H5C2__FLUSH_INVALIDATE_FLAG
- * 	H5C2__FLUSH_CLEAR_ONLY_FLAG
- * 	H5C2__FLUSH_MARKED_ENTRIES_FLAG
+ * 	H5C__FLUSH_INVALIDATE_FLAG
+ * 	H5C__FLUSH_CLEAR_ONLY_FLAG
+ * 	H5C__FLUSH_MARKED_ENTRIES_FLAG
  */
 
-#define H5C2__NO_FLAGS_SET			0x0000
-#define H5C2__SET_FLUSH_MARKER_FLAG		0x0001
-#define H5C2__DELETED_FLAG			0x0002
-#define H5C2__DIRTIED_FLAG			0x0004
-#define H5C2__SIZE_CHANGED_FLAG			0x0008
-#define H5C2__PIN_ENTRY_FLAG			0x0010
-#define H5C2__UNPIN_ENTRY_FLAG			0x0020
-#define H5C2__FLUSH_INVALIDATE_FLAG		0x0040
-#define H5C2__FLUSH_CLEAR_ONLY_FLAG		0x0080
-#define H5C2__FLUSH_MARKED_ENTRIES_FLAG		0x0100
-#define H5C2__FLUSH_IGNORE_PROTECTED_FLAG	0x0200
-#define H5C2__READ_ONLY_FLAG			0x0400
-
-H5_DLL H5C2_t * H5C2_create(size_t                      max_cache_size,
+#define H5C__NO_FLAGS_SET			0x0000
+#define H5C__SET_FLUSH_MARKER_FLAG		0x0001
+#define H5C__DELETED_FLAG			0x0002
+#define H5C__DIRTIED_FLAG			0x0004
+#define H5C__SIZE_CHANGED_FLAG			0x0008
+#define H5C__PIN_ENTRY_FLAG			0x0010
+#define H5C__UNPIN_ENTRY_FLAG			0x0020
+#define H5C__FLUSH_INVALIDATE_FLAG		0x0040
+#define H5C__FLUSH_CLEAR_ONLY_FLAG		0x0080
+#define H5C__FLUSH_MARKED_ENTRIES_FLAG		0x0100
+#define H5C__FLUSH_IGNORE_PROTECTED_FLAG	0x0200
+#define H5C__READ_ONLY_FLAG			0x0400
+
+H5_DLL H5C_t * H5C_create(size_t                      max_cache_size,
                             size_t                      min_clean_size,
                             int                         max_type_id,
 			    const char *                (* type_name_table_ptr),
-                            H5C2_write_permitted_func_t check_write_permitted,
+                            H5C_write_permitted_func_t check_write_permitted,
                             hbool_t                     write_permitted,
-                            H5C2_log_flush_func_t       log_flush,
+                            H5C_log_flush_func_t       log_flush,
                             void *                      aux_ptr);
 
-H5_DLL void H5C2_def_auto_resize_rpt_fcn(H5C2_t * cache_ptr,
+H5_DLL void H5C_def_auto_resize_rpt_fcn(H5C_t * cache_ptr,
                                          int32_t version,
                                          double hit_rate,
-                                         enum H5C2_resize_status status,
+                                         enum H5C_resize_status status,
                                          size_t old_max_cache_size,
                                          size_t new_max_cache_size,
                                          size_t old_min_clean_size,
                                          size_t new_min_clean_size);
 
-H5_DLL herr_t H5C2_dest(H5F_t * f,
+H5_DLL herr_t H5C_dest(H5F_t * f,
 		        hid_t  dxpl_id);
 
-H5_DLL herr_t H5C2_dest_empty(H5C2_t * cache_ptr);
+H5_DLL herr_t H5C_dest_empty(H5C_t * cache_ptr);
 
-H5_DLL herr_t H5C2_expunge_entry(H5F_t *              f,
+H5_DLL herr_t H5C_expunge_entry(H5F_t *              f,
 		                 hid_t                dxpl_id,
-                                 const H5C2_class_t * type,
+                                 const H5C_class_t * type,
                                  haddr_t              addr);
 
-H5_DLL herr_t H5C2_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags);
+H5_DLL herr_t H5C_flush_cache(H5F_t *f, hid_t dxpl_id, unsigned flags);
 
 
-H5_DLL herr_t H5C2_flush_to_min_clean(H5F_t * f,
+H5_DLL herr_t H5C_flush_to_min_clean(H5F_t * f,
 		                      hid_t    dxpl_id);
 
-H5_DLL herr_t H5C2_get_cache_auto_resize_config(const H5C2_t * cache_ptr,
-                                               H5C2_auto_size_ctl_t *config_ptr);
+H5_DLL herr_t H5C_get_cache_auto_resize_config(const H5C_t * cache_ptr,
+                                               H5C_auto_size_ctl_t *config_ptr);
 
-H5_DLL herr_t H5C2_get_cache_size(H5C2_t * cache_ptr,
+H5_DLL herr_t H5C_get_cache_size(H5C_t * cache_ptr,
                                   size_t * max_size_ptr,
                                   size_t * min_clean_size_ptr,
                                   size_t * cur_size_ptr,
                                   int32_t * cur_num_entries_ptr);
 
-H5_DLL herr_t H5C2_get_cache_hit_rate(H5C2_t * cache_ptr,
+H5_DLL herr_t H5C_get_cache_hit_rate(H5C_t * cache_ptr,
                                      double * hit_rate_ptr);
 
-H5_DLL herr_t H5C2_get_entry_status(const H5F_t *   f,
+H5_DLL herr_t H5C_get_entry_status(const H5F_t *   f,
                                     haddr_t   addr,
                                     size_t *  size_ptr,
                                     hbool_t * in_cache_ptr,
@@ -1460,85 +1460,85 @@ H5_DLL herr_t H5C2_get_entry_status(const H5F_t *   f,
                                     hbool_t * is_protected_ptr,
                                     hbool_t * is_pinned_ptr);
 
-H5_DLL herr_t H5C2_get_evictions_enabled(const H5C2_t * cache_ptr,
+H5_DLL herr_t H5C_get_evictions_enabled(const H5C_t * cache_ptr,
                                          hbool_t * evictions_enabled_ptr);
 
-H5_DLL herr_t H5C2_get_trace_file_ptr(const H5C2_t *cache_ptr,
+H5_DLL herr_t H5C_get_trace_file_ptr(const H5C_t *cache_ptr,
     FILE **trace_file_ptr_ptr);
-H5_DLL herr_t H5C2_get_trace_file_ptr_from_entry(const H5C2_cache_entry_t *entry_ptr,
+H5_DLL herr_t H5C_get_trace_file_ptr_from_entry(const H5C_cache_entry_t *entry_ptr,
     FILE ** trace_file_ptr_ptr);
 
-H5_DLL herr_t H5C2_insert_entry(H5F_t *              f,
+H5_DLL herr_t H5C_insert_entry(H5F_t *              f,
                                 hid_t                dxpl_id,
-                                const H5C2_class_t * type,
+                                const H5C_class_t * type,
                                 haddr_t              addr,
 				size_t               len,
                                 void *               thing,
                                 unsigned int         flags);
 
-H5_DLL herr_t H5C2_mark_entries_as_clean(H5F_t *  f,
+H5_DLL herr_t H5C_mark_entries_as_clean(H5F_t *  f,
                                          hid_t     dxpl_id,
                                          int32_t   ce_array_len,
                                          haddr_t * ce_array_ptr);
 
-H5_DLL herr_t H5C2_mark_pinned_entry_dirty(void *  thing,
+H5_DLL herr_t H5C_mark_pinned_entry_dirty(void *  thing,
 					  hbool_t size_changed,
 					  size_t  new_size);
 
-H5_DLL herr_t H5C2_mark_pinned_or_protected_entry_dirty(void *  thing);
+H5_DLL herr_t H5C_mark_pinned_or_protected_entry_dirty(void *  thing);
 
-H5_DLL herr_t H5C2_rename_entry(H5C2_t *             cache_ptr,
-                               const H5C2_class_t * type,
+H5_DLL herr_t H5C_rename_entry(H5C_t *             cache_ptr,
+                               const H5C_class_t * type,
                                haddr_t             old_addr,
                                haddr_t             new_addr);
 
-H5_DLL herr_t H5C2_pin_protected_entry(void *  thing);
+H5_DLL herr_t H5C_pin_protected_entry(void *  thing);
 
-H5_DLL void * H5C2_protect(H5F_t *              f,
+H5_DLL void * H5C_protect(H5F_t *              f,
 		           hid_t                dxpl_id,
-			   const H5C2_class_t * type,
+			   const H5C_class_t * type,
                            haddr_t              addr,
 			   size_t		len,
                            void *               udata,
                            unsigned             flags);
 
-H5_DLL herr_t H5C2_reset_cache_hit_rate_stats(H5C2_t * cache_ptr);
+H5_DLL herr_t H5C_reset_cache_hit_rate_stats(H5C_t * cache_ptr);
 
-H5_DLL herr_t H5C2_resize_pinned_entry(void *  thing,
+H5_DLL herr_t H5C_resize_pinned_entry(void *  thing,
                                       size_t  new_size);
 
-H5_DLL herr_t H5C2_set_cache_auto_resize_config(H5C2_t * cache_ptr,
-                                             H5C2_auto_size_ctl_t *config_ptr);
+H5_DLL herr_t H5C_set_cache_auto_resize_config(H5C_t * cache_ptr,
+                                             H5C_auto_size_ctl_t *config_ptr);
 
-H5_DLL herr_t H5C2_set_evictions_enabled(H5C2_t * cache_ptr,
+H5_DLL herr_t H5C_set_evictions_enabled(H5C_t * cache_ptr,
                                          hbool_t evictions_enabled);
 
-H5_DLL herr_t H5C2_set_prefix(H5C2_t * cache_ptr, char * prefix);
+H5_DLL herr_t H5C_set_prefix(H5C_t * cache_ptr, char * prefix);
 
-H5_DLL herr_t H5C2_set_skip_flags(H5C2_t * cache_ptr,
+H5_DLL herr_t H5C_set_skip_flags(H5C_t * cache_ptr,
                                  hbool_t skip_file_checks,
                                  hbool_t skip_dxpl_id_checks);
 
-H5_DLL herr_t H5C2_set_trace_file_ptr(H5C2_t * cache_ptr,
+H5_DLL herr_t H5C_set_trace_file_ptr(H5C_t * cache_ptr,
 		                     FILE * trace_file_ptr);
 
-H5_DLL herr_t H5C2_stats(H5C2_t * cache_ptr,
+H5_DLL herr_t H5C_stats(H5C_t * cache_ptr,
                         const char * cache_name,
                         hbool_t display_detailed_stats);
 
-H5_DLL void H5C2_stats__reset(H5C2_t * cache_ptr);
+H5_DLL void H5C_stats__reset(H5C_t * cache_ptr);
 
-H5_DLL herr_t H5C2_unpin_entry(void * thing);
+H5_DLL herr_t H5C_unpin_entry(void * thing);
 
-H5_DLL herr_t H5C2_unprotect(H5F_t *             f,
+H5_DLL herr_t H5C_unprotect(H5F_t *             f,
 		            hid_t                dxpl_id,
-                            const H5C2_class_t * type,
+                            const H5C_class_t * type,
                             haddr_t              addr,
                             void *               thing,
                             unsigned int         flags,
                             size_t               new_size);
 
-H5_DLL herr_t H5C2_validate_resize_config(H5C2_auto_size_ctl_t * config_ptr,
+H5_DLL herr_t H5C_validate_resize_config(H5C_auto_size_ctl_t * config_ptr,
                                          unsigned int tests);
 
 
@@ -1546,40 +1546,40 @@ H5_DLL herr_t H5C2_validate_resize_config(H5C2_auto_size_ctl_t * config_ptr,
 /***************** journaling function definitions proper: ****************/
 /**************************************************************************/
 
-H5_DLL herr_t H5C2_begin_journaling(H5F_t * f,
+H5_DLL herr_t H5C_begin_journaling(H5F_t * f,
                                     hid_t dxpl_id,
-				    H5C2_t * cache_ptr,
-				    H5C2_mdj_config_t * config_ptr);
+				    H5C_t * cache_ptr,
+				    H5C_mdj_config_t * config_ptr);
 
-H5_DLL herr_t H5C2_begin_transaction(H5C2_t * cache_ptr,
+H5_DLL herr_t H5C_begin_transaction(H5C_t * cache_ptr,
 		                     uint64_t * trans_num_ptr,
                                      const char * api_call_name);
 
-H5_DLL herr_t H5C2_end_journaling(H5F_t * f,
+H5_DLL herr_t H5C_end_journaling(H5F_t * f,
                                   hid_t dxpl_id,
-				  H5C2_t * cache_ptr);
+				  H5C_t * cache_ptr);
 
-H5_DLL herr_t H5C2_end_transaction(H5F_t * f,
+H5_DLL herr_t H5C_end_transaction(H5F_t * f,
 		                   hid_t dxpl_id,
-                                   H5C2_t * cache_ptr,
+                                   H5C_t * cache_ptr,
                                    uint64_t trans_num,
                                    const char * api_call_name);
 
-H5_DLL herr_t H5C2_get_journal_config(H5C2_t * cache_ptr,
-		                      H5C2_mdj_config_t * config_ptr);
+H5_DLL herr_t H5C_get_journal_config(H5C_t * cache_ptr,
+		                      H5C_mdj_config_t * config_ptr);
 
-H5_DLL herr_t H5C2_journal_post_flush(H5F_t * f,
+H5_DLL herr_t H5C_journal_post_flush(H5F_t * f,
                                       hid_t dxpl_id,
-				      H5C2_t * cache_ptr,
+				      H5C_t * cache_ptr,
                                       hbool_t cache_is_clean);
 
-H5_DLL herr_t H5C2_journal_pre_flush(H5C2_t * cache_ptr);
+H5_DLL herr_t H5C_journal_pre_flush(H5C_t * cache_ptr);
 
-H5_DLL herr_t H5C2_journal_transaction(H5F_t * f,
+H5_DLL herr_t H5C_journal_transaction(H5F_t * f,
 		                       hid_t dxpl_id,
-                                       H5C2_t * cache_ptr);
+                                       H5C_t * cache_ptr);
 
-H5_DLL herr_t H5C2_update_for_new_last_trans_on_disk(H5C2_t * cache_ptr,
+H5_DLL herr_t H5C_update_for_new_last_trans_on_disk(H5C_t * cache_ptr,
                                              uint64_t new_last_trans_on_disk);
 
 
@@ -1587,47 +1587,47 @@ H5_DLL herr_t H5C2_update_for_new_last_trans_on_disk(H5C2_t * cache_ptr,
 /****************** journal buffer function definitions: *********************/
 /*****************************************************************************/
 
-typedef struct H5C2_jbrb_t H5C2_jbrb_t;
+typedef struct H5C_jbrb_t H5C_jbrb_t;
 
-/* Note that H5C2_jb_aio_await_completion_of_all_async_fsyncs() and 
- * H5C2_jb_aio__await_completion_of_all_pending_writes() are declared
+/* Note that H5C_jb_aio_await_completion_of_all_async_fsyncs() and 
+ * H5C_jb_aio__await_completion_of_all_pending_writes() are declared
  * in this header file purely for testing purposes -- they should not be 
- * called outside test/cache2_journal.c
+ * called outside test/cache_journal.c
  */
-H5_DLL herr_t H5C2_jb_aio__await_completion_of_all_async_fsyncs(
-						H5C2_jbrb_t * struct_ptr);
+H5_DLL herr_t H5C_jb_aio__await_completion_of_all_async_fsyncs(
+						H5C_jbrb_t * struct_ptr);
 
-H5_DLL herr_t H5C2_jb_aio__await_completion_of_all_pending_writes(
-						H5C2_jbrb_t * struct_ptr);
+H5_DLL herr_t H5C_jb_aio__await_completion_of_all_pending_writes(
+						H5C_jbrb_t * struct_ptr);
 
 
-H5_DLL herr_t H5C2_jb__bin2hex(const uint8_t * buf,
+H5_DLL herr_t H5C_jb__bin2hex(const uint8_t * buf,
                                char * hexdata,
                                size_t * hexlength,
                                size_t buf_size);
 
-H5_DLL herr_t H5C2_jb__comment(H5C2_jbrb_t * struct_ptr,
+H5_DLL herr_t H5C_jb__comment(H5C_jbrb_t * struct_ptr,
                                const char * comment_ptr);
 
-H5_DLL herr_t H5C2_jb__end_transaction(H5C2_jbrb_t * struct_ptr,
+H5_DLL herr_t H5C_jb__end_transaction(H5C_jbrb_t * struct_ptr,
                                        uint64_t trans_num);
 
-H5_DLL herr_t H5C2_jb__eoa(H5C2_jbrb_t * struct_ptr,
+H5_DLL herr_t H5C_jb__eoa(H5C_jbrb_t * struct_ptr,
 		           haddr_t eoa);
 
-H5_DLL herr_t H5C2_jb__get_last_transaction_on_disk(H5C2_jbrb_t * struct_ptr,
+H5_DLL herr_t H5C_jb__get_last_transaction_on_disk(H5C_jbrb_t * struct_ptr,
                                                     uint64_t * trans_num_ptr);
 
-H5_DLL herr_t H5C2_jb__flush(H5C2_jbrb_t * struct_ptr);
+H5_DLL herr_t H5C_jb__flush(H5C_jbrb_t * struct_ptr);
 
 
-H5_DLL herr_t H5C2_jb__journal_entry(H5C2_jbrb_t * struct_ptr,
+H5_DLL herr_t H5C_jb__journal_entry(H5C_jbrb_t * struct_ptr,
                                      uint64_t trans_num,
                                      haddr_t base_addr,
                                      size_t length,
                                      const uint8_t * body);
 
-H5_DLL herr_t H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
+H5_DLL herr_t H5C_jb__init(H5C_jbrb_t * struct_ptr,
                             const int32_t journal_magic,
                             const char * HDF5_file_name,
                             const char * journal_file_name,
@@ -1638,16 +1638,16 @@ H5_DLL herr_t H5C2_jb__init(H5C2_jbrb_t * struct_ptr,
                             size_t sizeof_addr,
                             size_t sizeof_size);
 
-H5_DLL herr_t H5C2_jb__start_transaction(H5C2_jbrb_t * struct_ptr,
+H5_DLL herr_t H5C_jb__start_transaction(H5C_jbrb_t * struct_ptr,
                                          uint64_t trans_num);
 
-H5_DLL herr_t H5C2_jb__takedown(H5C2_jbrb_t * struct_ptr);
+H5_DLL herr_t H5C_jb__takedown(H5C_jbrb_t * struct_ptr);
 
-H5_DLL herr_t H5C2_jb__trunc(H5C2_jbrb_t * struct_ptr);
+H5_DLL herr_t H5C_jb__trunc(H5C_jbrb_t * struct_ptr);
 
-H5_DLL herr_t H5C2_jb__write_header_entry(H5C2_jbrb_t * struct_ptr);
+H5_DLL herr_t H5C_jb__write_header_entry(H5C_jbrb_t * struct_ptr);
 
-H5_DLL herr_t H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr, 
+H5_DLL herr_t H5C_jb__write_to_buffer(H5C_jbrb_t * struct_ptr, 
 		                       size_t size,
                                        const char * data,
                                        hbool_t is_end_trans,
@@ -1657,32 +1657,32 @@ H5_DLL herr_t H5C2_jb__write_to_buffer(H5C2_jbrb_t * struct_ptr,
 /***** superblock journaling message management function definitions: ********/
 /*****************************************************************************/
 
-H5_DLL herr_t H5C2_check_for_journaling(H5F_t * f,
+H5_DLL herr_t H5C_check_for_journaling(H5F_t * f,
                                         hid_t dxpl_id,
-		                        H5C2_t * cache_ptr,
+		                        H5C_t * cache_ptr,
                                         hbool_t journal_recovered);
 
-H5_DLL herr_t H5C2_mark_journaling_in_progress(H5F_t * f,
+H5_DLL herr_t H5C_mark_journaling_in_progress(H5F_t * f,
                                             hid_t dxpl_id,
 					    const int32_t journal_magic,
                                             const char * journal_file_name_ptr);
 
-H5_DLL herr_t H5C2_unmark_journaling_in_progress(H5F_t * f,
+H5_DLL herr_t H5C_unmark_journaling_in_progress(H5F_t * f,
                                                  hid_t dxpl_id,
-						 H5C2_t * cache_ptr);
+						 H5C_t * cache_ptr);
 
 
 /**************************************************************************/
 /****** metadata journaling status change callback management code ********/
 /**************************************************************************/
 
-H5_DLL herr_t H5C2_deregister_mdjsc_callback(H5C2_t * cache_ptr,
+H5_DLL herr_t H5C_deregister_mdjsc_callback(H5C_t * cache_ptr,
                                              int32_t idx);
 
-H5_DLL herr_t H5C2_register_mdjsc_callback(H5C2_t * cache_ptr,
-                                         H5C2_mdj_status_change_func_t fcn_ptr,
+H5_DLL herr_t H5C_register_mdjsc_callback(H5C_t * cache_ptr,
+                                         H5C_mdj_status_change_func_t fcn_ptr,
                                          void * data_ptr,
                                          int32_t * idx_ptr);
 
-#endif /* !_H5C2private_H */
+#endif /* !_H5Cprivate_H */
 
diff --git a/src/H5C2public.h b/src/H5Cpublic.h
index d293ccb..9ade25c 100644
--- a/src/H5C2public.h
+++ b/src/H5Cpublic.h
@@ -15,7 +15,7 @@
 
 /*-------------------------------------------------------------------------
  *
- * Created:	H5C2public.h
+ * Created:	H5Cpublic.h
  *              June 4, 2005
  *              John Mainzer
  *
@@ -25,8 +25,8 @@
  *
  *-------------------------------------------------------------------------
  */
-#ifndef _H5C2public_H
-#define _H5C2public_H
+#ifndef _H5Cpublic_H
+#define _H5Cpublic_H
 
 /* Public headers needed by this file */
 #include "H5public.h"
@@ -35,25 +35,25 @@
 extern "C" {
 #endif
 
-enum H5C2_cache_incr_mode
+enum H5C_cache_incr_mode
 {
-    H5C2_incr__off,
-    H5C2_incr__threshold
+    H5C_incr__off,
+    H5C_incr__threshold
 };
 
-enum H5C2_cache_flash_incr_mode
+enum H5C_cache_flash_incr_mode
 {
-     H5C2_flash_incr__off,
-     H5C2_flash_incr__add_space
+     H5C_flash_incr__off,
+     H5C_flash_incr__add_space
 };
 
 
-enum H5C2_cache_decr_mode
+enum H5C_cache_decr_mode
 {
-    H5C2_decr__off,
-    H5C2_decr__threshold,
-    H5C2_decr__age_out,
-    H5C2_decr__age_out_with_threshold
+    H5C_decr__off,
+    H5C_decr__threshold,
+    H5C_decr__age_out,
+    H5C_decr__age_out_with_threshold
 };
 
 #ifdef __cplusplus
diff --git a/src/H5D.c b/src/H5D.c
index 7ecf7cd..d78a1bb 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -27,7 +27,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Dpkg.h"		/* Datasets 				*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FLprivate.h"	/* Free lists                           */
@@ -133,7 +133,7 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
     const H5S_t    *space;              /* Dataspace for dataset */
     hid_t           ret_value;          /* Return value */
 
-    FUNC_ENTER_API_META(H5Dcreate2, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Dcreate2, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE7("i", "i*siiiii", loc_id, name, type_id, space_id, lcpl_id, dcpl_id,
              dapl_id);
 
@@ -168,7 +168,7 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
 
     /* Create the new dataset & get its ID */
     if(NULL == (dset = H5D_create_named(&loc, name, type_id, space, lcpl_id,
-            dcpl_id, dapl_id, H5AC2_dxpl_id)))
+            dcpl_id, dapl_id, H5AC_dxpl_id)))
 	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset")
     if((ret_value = H5I_register(H5I_DATASET, dset)) < 0)
 	HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register dataset")
@@ -226,7 +226,7 @@ H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id,
     const H5S_t    *space;              /* Dataspace for dataset */
     hid_t           ret_value;          /* Return value */
 
-    FUNC_ENTER_API_META(H5Dcreate_anon, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Dcreate_anon, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE5("i", "iiiii", loc_id, type_id, space_id, dcpl_id, dapl_id);
 
     /* Check arguments */
@@ -250,7 +250,7 @@ H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
 
     /* build and open the new dataset */
-    if(NULL == (dset = H5D_create(loc.oloc->file, type_id, space, dcpl_id, H5AC2_dxpl_id)))
+    if(NULL == (dset = H5D_create(loc.oloc->file, type_id, space, dcpl_id, H5AC_dxpl_id)))
 	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset")
 
     /* Register the new dataset to get an ID for it */
@@ -293,7 +293,7 @@ H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id)
     H5O_loc_t    oloc;            	/* Dataset object location */
     H5O_type_t   obj_type;              /* Type of object at location */
     hbool_t      loc_found = FALSE;     /* Location at 'name' found */
-    hid_t        dxpl_id = H5AC2_dxpl_id;    /* dxpl to use to open datset */
+    hid_t        dxpl_id = H5AC_dxpl_id;    /* dxpl to use to open datset */
     hid_t        ret_value;
 
     FUNC_ENTER_API(H5Dopen2, FAIL)
@@ -372,7 +372,7 @@ H5Dclose(hid_t dset_id)
     H5D_t	*dset;	                /* Dataset object to release */
     herr_t       ret_value = SUCCEED;   /* Return value */
 
-    FUNC_ENTER_API_META(H5Dclose, dset_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Dclose, dset_id, H5AC_dxpl_id, FAIL)
     H5TRACE1("e", "i", dset_id);
 
     /* Check args */
@@ -469,7 +469,7 @@ H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset")
 
     /* Read data space address and return */
-    if(FAIL==(ret_value=H5D_get_space_status(dset, allocation, H5AC2_ind_dxpl_id)))
+    if(FAIL==(ret_value=H5D_get_space_status(dset, allocation, H5AC_ind_dxpl_id)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get space status")
 
 done:
@@ -578,7 +578,7 @@ H5Dget_create_plist(hid_t dset_id)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
     /* Retrieve any object creation properties */
-    if(H5O_get_create_plist(&dset->oloc, H5AC2_ind_dxpl_id, new_plist) < 0)
+    if(H5O_get_create_plist(&dset->oloc, H5AC_ind_dxpl_id, new_plist) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get object creation info")
 
     /* Get the fill value property */
@@ -594,7 +594,7 @@ H5Dget_create_plist(hid_t dset_id)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to copy dataset datatype for fill value")
 
         /* Set up type conversion function */
-        if(NULL == (tpath = H5T_path_find(dset->shared->type, copied_fill.type, NULL, NULL, H5AC2_ind_dxpl_id, FALSE)))
+        if(NULL == (tpath = H5T_path_find(dset->shared->type, copied_fill.type, NULL, NULL, H5AC_ind_dxpl_id, FALSE)))
             HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest data types")
 
         /* Convert disk form of fill value into memory form */
@@ -622,7 +622,7 @@ H5Dget_create_plist(hid_t dset_id)
             } /* end if */
 
             /* Convert fill value */
-            if(H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, copied_fill.buf, bkg_buf, H5AC2_ind_dxpl_id) < 0) {
+            if(H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, copied_fill.buf, bkg_buf, H5AC_ind_dxpl_id) < 0) {
                 H5I_dec_ref(src_id);
                 H5I_dec_ref(dst_id);
                 if(bkg_buf)
@@ -686,7 +686,7 @@ H5Dget_storage_size(hid_t dset_id)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a dataset")
 
     /* Set return value */
-    ret_value = H5D_get_storage_size(dset,H5AC2_ind_dxpl_id);
+    ret_value = H5D_get_storage_size(dset,H5AC_ind_dxpl_id);
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -994,7 +994,7 @@ H5Dset_extent(hid_t dset_id, const hsize_t size[])
     H5D_t *dset;                /* Dataset for this operation */
     herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_API_META(H5Dset_extent, dset_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Dset_extent, dset_id, H5AC_dxpl_id, FAIL)
     H5TRACE2("e", "i*h", dset_id, size);
 
     /* Check args */
@@ -1004,7 +1004,7 @@ H5Dset_extent(hid_t dset_id, const hsize_t size[])
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no size specified")
 
     /* Private function */
-    if(H5D_set_extent(dset, size, H5AC2_dxpl_id) < 0)
+    if(H5D_set_extent(dset, size, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set extend dataset")
 
 done:
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 0eef948..bb75fff 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -25,7 +25,7 @@
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
 #ifdef H5_HAVE_PARALLEL
-#include "H5AC2private.h"	/* Metadata cache		  	*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #endif /* H5_HAVE_PARALLEL */
 #include "H5Dpkg.h"		/* Dataset functions			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
@@ -2908,7 +2908,7 @@ H5D_chunk_allocate(H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite)
         using_mpi = TRUE;
 
         /* Use the internal "independent" DXPL */
-        data_dxpl_id = H5AC2_ind_dxpl_id;
+        data_dxpl_id = H5AC_ind_dxpl_id;
     } /* end if */
     else {
 #endif  /* H5_HAVE_PARALLEL */
@@ -4381,7 +4381,7 @@ done:
  *
  * Purpose:	Print raw data cache statistics to the debug stream.  If
  *		HEADERS is non-zero then print table column headers,
- *		otherwise assume that the H5AC2 layer has already printed them.
+ *		otherwise assume that the H5AC layer has already printed them.
  *
  * Return:	Non-negative on success/Negative on failure
  *
@@ -4414,8 +4414,8 @@ H5D_chunk_stats(const H5D_t *dset, hbool_t headers)
 #ifdef H5AC1_DEBUG
     if (H5DEBUG(AC1)) headers = TRUE;
 #endif
-#ifdef H5AC2_DEBUG
-    if (H5DEBUG(AC2)) headers = TRUE;
+#ifdef H5AC_DEBUG
+    if (H5DEBUG(AC)) headers = TRUE;
 #endif
 
     if (headers) {
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c
index 7d3a7fa..779071f 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -34,7 +34,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Dpkg.h"		/* Dataset functions			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Fprivate.h"		/* Files				*/
@@ -196,7 +196,7 @@ H5D_contig_fill(H5D_t *dset, hid_t dxpl_id)
         using_mpi = TRUE;
 
         /* Use the internal "independent" DXPL */
-        my_dxpl_id = H5AC2_ind_dxpl_id;
+        my_dxpl_id = H5AC_ind_dxpl_id;
     } /* end if */
     else {
 #endif  /* H5_HAVE_PARALLEL */
diff --git a/src/H5Ddbg.c b/src/H5Ddbg.c
index 13b8d2a..7abfc81 100644
--- a/src/H5Ddbg.c
+++ b/src/H5Ddbg.c
@@ -27,7 +27,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Dpkg.h"		/* Datasets 				*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Iprivate.h"		/* IDs			  		*/
@@ -114,7 +114,7 @@ H5Ddebug(hid_t dset_id)
 
     /* Print B-tree information */
     if(H5D_CHUNKED == dset->shared->layout.type)
-	(void)H5D_chunk_dump_index(dset, H5AC2_dxpl_id, stdout);
+	(void)H5D_chunk_dump_index(dset, H5AC_dxpl_id, stdout);
     else if(H5D_CONTIGUOUS == dset->shared->layout.type)
 	HDfprintf(stdout, "    %-10s %a\n", "Address:", dset->shared->layout.u.contig.addr);
 
diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c
index 496c0f1..8f53ec2 100644
--- a/src/H5Ddeprec.c
+++ b/src/H5Ddeprec.c
@@ -41,7 +41,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Dpkg.h"		/* Datasets 				*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Iprivate.h"		/* IDs			  		*/
@@ -147,7 +147,7 @@ H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
     const H5S_t    *space;              /* Dataspace for dataset */
     hid_t           ret_value;          /* Return value */
 
-    FUNC_ENTER_API_META(H5Dcreate1, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Dcreate1, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, dcpl_id);
 
     /* Check arguments */
@@ -167,7 +167,7 @@ H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
 
     /* Build and open the new dataset */
     if(NULL == (dset = H5D_create_named(&loc, name, type_id, space,
-            H5P_LINK_CREATE_DEFAULT, dcpl_id, H5P_DATASET_ACCESS_DEFAULT, H5AC2_dxpl_id)))
+            H5P_LINK_CREATE_DEFAULT, dcpl_id, H5P_DATASET_ACCESS_DEFAULT, H5AC_dxpl_id)))
 	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset")
 
     /* Register the new dataset to get an ID for it */
@@ -210,7 +210,7 @@ H5Dopen1(hid_t loc_id, const char *name)
     H5O_loc_t    oloc;            	/* Dataset object location */
     H5O_type_t   obj_type;              /* Type of object at location */
     hbool_t      loc_found = FALSE;     /* Location at 'name' found */
-    hid_t        dxpl_id = H5AC2_dxpl_id;    /* dxpl to use to open datset */
+    hid_t        dxpl_id = H5AC_dxpl_id;    /* dxpl to use to open datset */
     hid_t        ret_value;
 
     FUNC_ENTER_API(H5Dopen1, FAIL)
@@ -284,7 +284,7 @@ H5Dextend(hid_t dset_id, const hsize_t size[])
     H5D_t	*dset;
     herr_t       ret_value = SUCCEED;  /* Return value */
 
-    FUNC_ENTER_API_META(H5Dextend, dset_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Dextend, dset_id, H5AC_dxpl_id, FAIL)
     H5TRACE2("e", "i*h", dset_id, size);
 
     /* Check args */
@@ -294,7 +294,7 @@ H5Dextend(hid_t dset_id, const hsize_t size[])
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no size specified")
 
     /* Increase size */
-    if(H5D_extend(dset, size, H5AC2_dxpl_id) < 0)
+    if(H5D_extend(dset, size, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to extend dataset")
 
 done:
diff --git a/src/H5Dfill.c b/src/H5Dfill.c
index 8635da3..d0b4c81 100644
--- a/src/H5Dfill.c
+++ b/src/H5Dfill.c
@@ -34,7 +34,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"        /* Metadata cache                       */
 #include "H5Dpkg.h"		/* Dataset functions			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FLprivate.h"	/* Free Lists                           */
@@ -132,7 +132,7 @@ H5Dfill(const void *fill, hid_t fill_type_id, void *buf, hid_t buf_type_id, hid_
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "not a datatype")
 
     /* Fill the selection in the memory buffer */
-    if(H5D_fill(fill, fill_type, buf, buf_type, space, H5AC2_dxpl_id) < 0)
+    if(H5D_fill(fill, fill_type, buf, buf_type, space, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTENCODE, FAIL, "filling selection failed")
 
 done:
diff --git a/src/H5Dint.c b/src/H5Dint.c
index 024f66b..803694d 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -515,7 +515,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D_journal_status_cb(const H5C2_mdj_config_t *mdj_config, hid_t dxpl_id,
+H5D_journal_status_cb(const H5C_mdj_config_t *mdj_config, hid_t dxpl_id,
     void *udata)
 {
     H5D_t *dset = (H5D_t *)udata;       /* User callback data */
@@ -887,7 +887,7 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset)
     HDassert(file == dset->oloc.file);
 
     /* Get a pointer to the object header itself */
-    if(NULL == (oh = H5O_protect(oloc, dxpl_id, H5AC2_WRITE)))
+    if(NULL == (oh = H5O_protect(oloc, dxpl_id, H5AC_WRITE)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTPROTECT, FAIL, "unable to protect dataset object header")
 
     /* Pin the object header */
@@ -895,7 +895,7 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTPIN, FAIL, "unable to pin dataset object header")
 
     /* Unprotect the object header */
-    if(H5O_unprotect(oloc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5O_unprotect(oloc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTUNPROTECT, FAIL, "unable to unprotect dataset object header")
 
     /* Write new fill value message */
@@ -958,7 +958,7 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create EFL file name heap")
 
         /* Pin the heap down in memory */
-        if(NULL == (heap = H5HL_protect(file, dxpl_id, efl->heap_addr, H5AC2_WRITE)))
+        if(NULL == (heap = H5HL_protect(file, dxpl_id, efl->heap_addr, H5AC_WRITE)))
             HGOTO_ERROR(H5E_DATASET, H5E_CANTPROTECT, FAIL, "unable to protect EFL file name heap")
 
         /* Insert "empty" name first */
@@ -1205,7 +1205,7 @@ H5D_create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id,
     new_dset->shared->fo_count = 1;
 
     /* Register callback for this dataset with cache, when journaling status changes */
-    if(H5AC2_register_mdjsc_callback(new_dset->oloc.file, H5D_journal_status_cb, new_dset, &new_dset->mdjsc_idx, NULL) < 0)
+    if(H5AC_register_mdjsc_callback(new_dset->oloc.file, H5D_journal_status_cb, new_dset, &new_dset->mdjsc_idx, NULL) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "can't register journal status callback")
 
     /* Success */
@@ -1298,7 +1298,7 @@ H5D_open(const H5G_loc_t *loc, hid_t dxpl_id)
             HGOTO_ERROR(H5E_DATASET, H5E_NOTFOUND, NULL, "not found")
 
         /* Register callback for this dataset with cache, when journaling status changes */
-        if(H5AC2_register_mdjsc_callback(dataset->oloc.file, H5D_journal_status_cb, dataset, &dataset->mdjsc_idx, NULL) < 0)
+        if(H5AC_register_mdjsc_callback(dataset->oloc.file, H5D_journal_status_cb, dataset, &dataset->mdjsc_idx, NULL) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "can't register journal status callback")
 
         /* Add the dataset to the list of opened objects in the file */
@@ -1622,13 +1622,13 @@ H5D_close(H5D_t *dataset)
 
     /* Deregister journaling status change cache callback for this dataset */
     if(dataset->mdjsc_idx >= 0)
-        if(H5AC2_deregister_mdjsc_callback(dataset->oloc.file, dataset->mdjsc_idx) < 0)
+        if(H5AC_deregister_mdjsc_callback(dataset->oloc.file, dataset->mdjsc_idx) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't deregister journal status callback")
 
     dataset->shared->fo_count--;
     if(dataset->shared->fo_count == 0) {
         /* Flush the dataset's information */
-        if(H5D_flush_real(dataset, H5AC2_dxpl_id, H5F_FLUSH_NONE) < 0)
+        if(H5D_flush_real(dataset, H5AC_dxpl_id, H5F_FLUSH_NONE) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to flush cached dataset info")
 
         /* Free the data sieve buffer, if it's been allocated */
@@ -1664,7 +1664,7 @@ H5D_close(H5D_t *dataset)
                 } /* end if */
 
                 /* Flush and destroy chunks in the cache */
-                if(H5D_chunk_dest(dataset->oloc.file, H5AC2_dxpl_id, dataset) < 0)
+                if(H5D_chunk_dest(dataset->oloc.file, H5AC_dxpl_id, dataset) < 0)
                     HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "unable to destroy chunk cache")
                 break;
 
@@ -1690,7 +1690,7 @@ H5D_close(H5D_t *dataset)
         /* Remove the dataset from the list of opened objects in the file */
         if(H5FO_top_decr(dataset->oloc.file, dataset->oloc.addr) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
-        if(H5FO_delete(dataset->oloc.file, H5AC2_dxpl_id, dataset->oloc.addr) < 0)
+        if(H5FO_delete(dataset->oloc.file, H5AC_dxpl_id, dataset->oloc.addr) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "can't remove dataset from list of open objects")
 
         /* Close the dataset object */
@@ -2504,7 +2504,7 @@ H5D_flush_real(H5D_t *dataset, hid_t dxpl_id, unsigned flags)
         unsigned update_flags = H5O_UPDATE_TIME;        /* Modification time flag */
 
         /* Get a pointer to the dataset's object header */
-        if((oh = H5O_protect(&dataset->oloc, dxpl_id, H5AC2_WRITE)) == NULL)
+        if((oh = H5O_protect(&dataset->oloc, dxpl_id, H5AC_WRITE)) == NULL)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTPROTECT, FAIL, "unable to protect dataset object header")
 
         /* Pin the object header */
@@ -2512,7 +2512,7 @@ H5D_flush_real(H5D_t *dataset, hid_t dxpl_id, unsigned flags)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTPIN, FAIL, "unable to pin dataset object header")
 
         /* Unprotect the object header */
-        if(H5O_unprotect(&dataset->oloc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+        if(H5O_unprotect(&dataset->oloc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTUNPROTECT, FAIL, "unable to unprotect dataset object header")
 
         /* Update the layout on disk, if it's been changed */
diff --git a/src/H5Dio.c b/src/H5Dio.c
index 41f1021..992a4e6 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -24,7 +24,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"        /* Metadata cache                       */
 #include "H5Dpkg.h"		/* Dataset functions			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FLprivate.h"	/* Free Lists                           */
diff --git a/src/H5F.c b/src/H5F.c
index 51464fb..8194c25 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -23,7 +23,7 @@
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Aprivate.h"		/* Attributes				*/
 #include "H5AC1private.h"	/* Metadata cache			*/
-#include "H5AC2private.h"	/* Metadata cache2			*/
+#include "H5ACprivate.h"        /* Metadata cache                       */
 #include "H5Dprivate.h"		/* Datasets				*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Fpkg.h"             /* File access				*/
@@ -778,7 +778,7 @@ H5Fis_hdf5(const char *name)
 	HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to open file")
 
     /* The file is an hdf5 file if the hdf5 file signature can be found */
-    ret_value = (HADDR_UNDEF!=H5F_locate_signature(file, H5AC2_ind_dxpl_id));
+    ret_value = (HADDR_UNDEF!=H5F_locate_signature(file, H5AC_ind_dxpl_id));
 
 done:
     /* Close the file */
@@ -822,7 +822,7 @@ done:
  *
  *		J Mainzer, Jun 30, 2005
  *		Added lf parameter so the shared->lf field can be
- *		initialized prior to the call to H5AC2_create() if a
+ *		initialized prior to the call to H5AC_create() if a
  *		new instance of H5F_file_t is created.  lf should be
  *		NULL if shared isn't, and vise versa.
  *
@@ -938,14 +938,14 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf)
 	 * the access property list should be updated to reflect that.
 	 */
 	if(SUCCEED != H5AC1_create(f, &(f->shared->mdc_initCacheCfg)))
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create metadata cache")
+	    HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create metadata cache1")
 
 	/* Create a metadata cache with modified API along side the regular
 	 * version.  For now, this is just for testing.  Once we get it
 	 * fully in use, we will delete the old version.
 	 */
-	if(H5AC2_create(f, (H5AC2_cache_config_t *)&(f->shared->mdc_initCacheCfg)) < 0)
-	    HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create meta data cache2")
+	if(H5AC_create(f, (H5AC_cache_config_t *)&(f->shared->mdc_initCacheCfg)) < 0)
+	    HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create metadata cache")
 
         /* Create the file's "open object" information */
         if(H5FO_create(f) < 0)
@@ -1017,13 +1017,13 @@ H5F_dest(H5F_t *f, hid_t dxpl_id)
             /* Dump debugging info */
             H5AC1_stats(f);
 #endif /* H5AC1_DUMP_STATS_ON_CLOSE */
-#if H5AC2_DUMP_STATS_ON_CLOSE
+#if H5AC_DUMP_STATS_ON_CLOSE
             /* Dump debugging info */
-            H5AC2_stats(f);
-#endif /* H5AC2_DUMP_STATS_ON_CLOSE */
+            H5AC_stats(f);
+#endif /* H5AC_DUMP_STATS_ON_CLOSE */
 
 	    /* shut down metadata journaling if it is enabled. */
-	    if(H5C2_end_journaling(f, dxpl_id, f->shared->cache2) < 0)
+	    if(H5C_end_journaling(f, dxpl_id, f->shared->cache) < 0)
                 /* Push error, but keep going*/
                 HDONE_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to shutdown metadata journaling")
 
@@ -1059,7 +1059,7 @@ H5F_dest(H5F_t *f, hid_t dxpl_id)
             /* Push error, but keep going*/
             HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "problems closing file")
         /* also destroy the new cache */
-        if(H5AC2_dest(f, dxpl_id) < 0)
+        if(H5AC_dest(f, dxpl_id) < 0)
             /* Push error, but keep going*/
             HDONE_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "problems closing file")
         if(H5FO_dest(f) < 0)
@@ -1393,16 +1393,16 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id, hid_t d
 	HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to build extpath")
 
     {
-        H5AC2_jnl_config_t * config_ptr = NULL;
+        H5AC_jnl_config_t * config_ptr = NULL;
 
 	config_ptr = &(file->shared->initJnlCfg);
 
-        if(H5AC2_check_for_journaling(file, dxpl_id, file->shared->cache2,
+        if(H5AC_check_for_journaling(file, dxpl_id, file->shared->cache,
                 config_ptr->journal_recovered) < 0 )
-            HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "H5AC2_check_for_journaling() reports failure.")
+            HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "H5AC_check_for_journaling() reports failure.")
 
-	if(H5AC2_set_jnl_config(file, dxpl_id, config_ptr, TRUE) < 0 )
-            HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "H5AC2_set_jnl_config() failed.")
+	if(H5AC_set_jnl_config(file, dxpl_id, config_ptr, TRUE) < 0 )
+            HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "H5AC_set_jnl_config() failed.")
     }
 
     /* Success */
@@ -1515,7 +1515,7 @@ H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id)
     /*
      * Create a new file or truncate an existing file.
      */
-    if(NULL == (new_file = H5F_open(filename, flags, fcpl_id, fapl_id, H5AC2_dxpl_id)))
+    if(NULL == (new_file = H5F_open(filename, flags, fcpl_id, fapl_id, H5AC_dxpl_id)))
 	HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "unable to create file")
 
     /* Get an atom for the file */
@@ -1602,7 +1602,7 @@ H5Fopen(const char *filename, unsigned flags, hid_t fapl_id)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not file access property list")
 
     /* Open the file */
-    if(NULL == (new_file = H5F_open(filename, flags, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC2_dxpl_id)))
+    if(NULL == (new_file = H5F_open(filename, flags, H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)))
 	HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "unable to open file")
 
     /* Get an atom for the file */
@@ -1700,7 +1700,7 @@ H5Fflush(hid_t object_id, H5F_scope_t scope)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "object is not associated with a file")
 
     /* Flush the file */
-    if(H5F_flush(f, H5AC2_dxpl_id, scope, H5F_FLUSH_NONE) < 0)
+    if(H5F_flush(f, H5AC_dxpl_id, scope, H5F_FLUSH_NONE) < 0)
 	HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "flush failed")
 
 done:
@@ -1729,7 +1729,7 @@ H5F_flush(H5F_t *f, hid_t dxpl_id, H5F_scope_t scope, unsigned flags)
     unsigned		nerrors = 0;    /* Errors from nested flushes */
     unsigned		i;              /* Index variable */
     unsigned int	H5AC1_flags;     /* translated flags for H5AC1_flush() */
-    unsigned int	H5AC2_flags;    /* translated flags for H5AC2_flush() */
+    unsigned int	H5AC_flags;    /* translated flags for H5AC_flush() */
     herr_t              ret_value;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5F_flush)
@@ -1768,12 +1768,12 @@ H5F_flush(H5F_t *f, hid_t dxpl_id, H5F_scope_t scope, unsigned flags)
     if((flags & H5F_FLUSH_INVALIDATE) != 0 )
         H5AC1_flags |= H5AC1__FLUSH_INVALIDATE_FLAG;
     if(H5AC1_flush(f, dxpl_id, H5AC1_flags) < 0)
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush metadata cache")
-    H5AC2_flags = 0;
+        HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush metadata cache1")
+    H5AC_flags = 0;
     if((flags & H5F_FLUSH_INVALIDATE) != 0 )
-        H5AC2_flags |= H5AC2__FLUSH_INVALIDATE_FLAG;
-    if(H5AC2_flush(f, dxpl_id, H5AC2_flags) < 0)
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush metadata cache2")
+        H5AC_flags |= H5AC__FLUSH_INVALIDATE_FLAG;
+    if(H5AC_flush(f, dxpl_id, H5AC_flags) < 0)
+        HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush metadata cache")
 
     /*
      * If we are invalidating everything (which only happens just before
@@ -2007,7 +2007,7 @@ H5F_try_close(H5F_t *f)
      */
     if(f->intent&H5F_ACC_RDWR) {
         /* Flush and destroy all caches */
-        if(H5F_flush(f, H5AC2_dxpl_id, H5F_SCOPE_LOCAL, H5F_FLUSH_NONE) < 0)
+        if(H5F_flush(f, H5AC_dxpl_id, H5F_SCOPE_LOCAL, H5F_FLUSH_NONE) < 0)
             HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush cache")
     } /* end if */
 
@@ -2016,7 +2016,7 @@ H5F_try_close(H5F_t *f)
      * shared H5F_file_t struct. If the reference count for the H5F_file_t
      * struct reaches zero then destroy it also.
      */
-    if(H5F_dest(f, H5AC2_dxpl_id) < 0)
+    if(H5F_dest(f, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "problems closing file")
 
 done:
@@ -2125,7 +2125,7 @@ H5Freopen(hid_t file_id)
 
 done:
     if(ret_value < 0 && new_file)
-	if(H5F_dest(new_file, H5AC2_dxpl_id) < 0)
+	if(H5F_dest(new_file, H5AC_dxpl_id) < 0)
 	    HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close file")
 
     FUNC_LEAVE_API(ret_value)
@@ -3393,22 +3393,22 @@ done:
  *
  * Changes:	John Mainzer
  * 		8/4/08
- * 		Reworked function to use the new H5AC2_jnl_config_t
- * 		structure and H5AC2_get_jnl_config().
+ * 		Reworked function to use the new H5AC_jnl_config_t
+ * 		structure and H5AC_get_jnl_config().
  *
  *-------------------------------------------------------------------------
  */
 htri_t
 H5F_is_journaling_enabled(const H5F_t *f)
 {
-    H5AC2_jnl_config_t config;    	/* Current journaling configuration */
+    H5AC_jnl_config_t config;    	/* Current journaling configuration */
     htri_t     ret_value;               /* Return value */
 
     FUNC_ENTER_NOAPI(H5F_is_journaling_enabled, FAIL)
 
     /* Retrieve the current cache information */
-    config.version = H5AC2__CURR_JNL_CONFIG_VER;
-    if(H5AC2_get_jnl_config(f->shared->cache2, &config) < 0)
+    config.version = H5AC__CURR_JNL_CONFIG_VER;
+    if(H5AC_get_jnl_config(f->shared->cache, &config) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't retrieve journaling configuration")
 
     /* Set return value */
@@ -3438,7 +3438,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Fget_jnl_config(hid_t file_id, H5AC2_jnl_config_t *config_ptr)
+H5Fget_jnl_config(hid_t file_id, H5AC_jnl_config_t *config_ptr)
 {
     H5F_t      *file;                   /* File object for file ID */
     herr_t     ret_value = SUCCEED;     /* Return value */
@@ -3449,12 +3449,12 @@ H5Fget_jnl_config(hid_t file_id, H5AC2_jnl_config_t *config_ptr)
     /* Check args */
     if(NULL == (file = H5I_object_verify(file_id, H5I_FILE)) )
          HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
-    if((NULL == config_ptr) || (!H5AC2_validate_jnl_config_ver(config_ptr->version)))
+    if((NULL == config_ptr) || (!H5AC_validate_jnl_config_ver(config_ptr->version)))
          HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Bad config_ptr")
 
     /* Go get the journaling configuration */
-    if(H5AC2_get_jnl_config(file->shared->cache2, config_ptr) < 0)
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC2_get_jnl_config() failed.")
+    if(H5AC_get_jnl_config(file->shared->cache, config_ptr) < 0)
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_get_jnl_config() failed.")
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -3465,7 +3465,7 @@ done:
  * Function:    H5Fset_jnl_config
  *
  * Purpose:     Sets the current journaling configuration, using the
- * 		contents of the instance of H5AC2_jnl_config_t pointed
+ * 		contents of the instance of H5AC_jnl_config_t pointed
  * 		to by config_ptr.
  *
  * Return:      Success:        SUCCEED
@@ -3477,7 +3477,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Fset_jnl_config(hid_t file_id, const H5AC2_jnl_config_t *config_ptr)
+H5Fset_jnl_config(hid_t file_id, const H5AC_jnl_config_t *config_ptr)
 {
     H5F_t      *file;                   /* File object for file ID */
     herr_t     ret_value = SUCCEED;     /* Return value */
@@ -3490,8 +3490,8 @@ H5Fset_jnl_config(hid_t file_id, const H5AC2_jnl_config_t *config_ptr)
          HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
 
     /* Set the resize configuration  */
-    if(H5AC2_set_jnl_config(file, H5P_DATASET_XFER_DEFAULT, config_ptr, FALSE) < 0)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "H5AC2_set_jnl_config() failed.")
+    if(H5AC_set_jnl_config(file, H5P_DATASET_XFER_DEFAULT, config_ptr, FALSE) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "H5AC_set_jnl_config() failed.")
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -3528,12 +3528,12 @@ H5Fget_mdc_config(hid_t file_id, H5AC1_cache_config_t *config_ptr)
     /* Check args */
     if(NULL == (file = H5I_object_verify(file_id, H5I_FILE)))
          HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
-    if((NULL == config_ptr) || !H5AC2_validate_cache_config_ver(config_ptr->version))
+    if((NULL == config_ptr) || !H5AC_validate_cache_config_ver(config_ptr->version))
          HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Bad config_ptr")
 
     /* Go get the resize configuration */
-    if(H5AC2_get_cache_auto_resize_config(file->shared->cache2, (H5AC2_cache_config_t *)config_ptr) < 0)
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC2_get_cache_auto_resize_config() failed.")
+    if(H5AC_get_cache_auto_resize_config(file->shared->cache, (H5AC_cache_config_t *)config_ptr) < 0)
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_get_cache_auto_resize_config() failed.")
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -3569,12 +3569,12 @@ H5Fset_mdc_config(hid_t file_id, H5AC1_cache_config_t *config_ptr)
          HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
 
     /* set the resize configuration  */
-    if(H5AC1_set_cache_auto_resize_config(file->shared->cache, config_ptr) < 0)
+    if(H5AC1_set_cache_auto_resize_config(file->shared->cache1, config_ptr) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "H5AC1_set_cache_auto_resize_config() failed.")
 
     /* pass the resize configuration to the modified cache as well. */
-    if(H5AC2_set_cache_auto_resize_config(file->shared->cache2, (H5AC2_cache_config_t *)config_ptr) < 0)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "H5AC2_set_cache_auto_resize_config() failed.")
+    if(H5AC_set_cache_auto_resize_config(file->shared->cache, (H5AC_cache_config_t *)config_ptr) < 0)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "H5AC_set_cache_auto_resize_config() failed.")
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -3613,8 +3613,8 @@ H5Fget_mdc_hit_rate(hid_t file_id, double *hit_rate_ptr)
          HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL hit rate pointer")
 
     /* Go get the current hit rate */
-    if(H5AC2_get_cache_hit_rate(file->shared->cache2, hit_rate_ptr) < 0)
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC2_get_cache_hit_rate() failed.")
+    if(H5AC_get_cache_hit_rate(file->shared->cache, hit_rate_ptr) < 0)
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_get_cache_hit_rate() failed.")
 
 done:
     FUNC_LEAVE_API(ret_value)
@@ -3655,9 +3655,9 @@ H5Fget_mdc_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr,
          HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
 
     /* Go get the size data */
-    if(H5AC2_get_cache_size(file->shared->cache2, max_size_ptr,
+    if(H5AC_get_cache_size(file->shared->cache, max_size_ptr,
             min_clean_size_ptr, cur_size_ptr, &cur_num_entries) < 0)
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC2_get_cache_size() failed.")
+        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_get_cache_size() failed.")
 
     if(cur_num_entries_ptr != NULL)
 	*cur_num_entries_ptr = (int)cur_num_entries;
@@ -3701,7 +3701,7 @@ H5Freset_mdc_hit_rate_stats(hid_t file_id)
          HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a file ID")
 
     /* Reset the hit rate statistic */
-    if(H5AC2_reset_cache_hit_rate_stats(file->shared->cache2) < 0)
+    if(H5AC_reset_cache_hit_rate_stats(file->shared->cache) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "can't reset cache hit rate")
 
 done:
@@ -3821,12 +3821,12 @@ H5Fget_info(hid_t obj_id, H5F_info_t *finfo)
 
     /* Check for superblock extension info */
     if(H5F_addr_defined(f->shared->extension_addr))
-        if(H5F_super_ext_size(f, H5AC2_ind_dxpl_id, &finfo->super_ext_size) < 0)
+        if(H5F_super_ext_size(f, H5AC_ind_dxpl_id, &finfo->super_ext_size) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "Unable to retrieve superblock extension size")
 
     /* Check for SOHM info */
     if(H5F_addr_defined(f->shared->sohm_addr))
-        if(H5SM_ih_size(f, H5AC2_ind_dxpl_id, finfo) < 0)
+        if(H5SM_ih_size(f, H5AC_ind_dxpl_id, finfo) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "Unable to retrieve SOHM btree & heap storage info")
 
 done:
diff --git a/src/H5FDmpiposix.c b/src/H5FDmpiposix.c
index 3951eca..5aa1a12 100644
--- a/src/H5FDmpiposix.c
+++ b/src/H5FDmpiposix.c
@@ -1260,8 +1260,8 @@ H5FD_mpiposix_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
          * we are flushing out a bunch of metadata.  Then, we block before the
          * first write and don't block for further writes in the sequence.
          */
-        if(H5P_exist_plist(plist,H5AC2_BLOCK_BEFORE_META_WRITE_NAME)>0)
-            if(H5P_get(plist,H5AC2_BLOCK_BEFORE_META_WRITE_NAME,&block_before_meta_write)<0)
+        if(H5P_exist_plist(plist,H5AC_BLOCK_BEFORE_META_WRITE_NAME)>0)
+            if(H5P_get(plist,H5AC_BLOCK_BEFORE_META_WRITE_NAME,&block_before_meta_write)<0)
                 HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get H5AC property")
 
 #if 0 /* JRM */
diff --git a/src/H5FS.c b/src/H5FS.c
index 172adae..89817d0 100644
--- a/src/H5FS.c
+++ b/src/H5FS.c
@@ -33,7 +33,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"        /* Metadata cache                       */
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FSpkg.h"		/* File free space			*/
 #include "H5MFprivate.h"	/* File memory management		*/
@@ -136,7 +136,7 @@ HDfprintf(stderr, "%s: Creating free space manager, nclasses = %Zu\n", FUNC, ncl
     fspace->max_sect_size = fs_create->max_sect_size;
 
     /* Cache the new free space header (pinned) */
-    if(H5AC2_set(f, dxpl_id, H5AC2_FSPACE_HDR, fspace->addr, H5FS_HEADER_SIZE(f), fspace, H5AC2__PIN_ENTRY_FLAG) < 0)
+    if(H5AC_set(f, dxpl_id, H5AC_FSPACE_HDR, fspace->addr, H5FS_HEADER_SIZE(f), fspace, H5AC__PIN_ENTRY_FLAG) < 0)
 	HGOTO_ERROR(H5E_FSPACE, H5E_CANTINIT, NULL, "can't add free space header to cache")
 
     /* Set the return value */
@@ -192,7 +192,7 @@ HDfprintf(stderr, "%s: Opening free space manager, nclasses = %Zu\n", FUNC, ncla
     cache_udata.f = f;
 
     /* Protect the free space header */
-    if(NULL == (fspace = H5AC2_protect(f, dxpl_id, H5AC2_FSPACE_HDR, fs_addr, H5FS_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (fspace = H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, H5FS_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTPROTECT, NULL, "unable to load free space header")
 #ifdef QAK
 HDfprintf(stderr, "%s: fspace->sect_addr = %a\n", FUNC, fspace->sect_addr);
@@ -202,19 +202,19 @@ HDfprintf(stderr, "%s: fspace->sinfo = %p\n", FUNC, fspace->sinfo);
 #endif /* QAK */
 
     /* Check the free space header's status in the metadata cache */
-    if(H5AC2_get_entry_status(f, fs_addr, &fspace_status) < 0)
+    if(H5AC_get_entry_status(f, fs_addr, &fspace_status) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTGET, NULL, "unable to check metadata cache status for free space header")
 
     /* If the free space header isn't already pinned, pin it now */
     /* (could still be pinned from it's section info still hanging around in the cache) */
-    if(!(fspace_status & H5AC2_ES__IS_PINNED)) {
+    if(!(fspace_status & H5AC_ES__IS_PINNED)) {
         /* Pin free space header in the cache */
-        if(H5AC2_pin_protected_entry(fspace) < 0)
+        if(H5AC_pin_protected_entry(fspace) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTPIN, NULL, "unable to pin free space header")
     } /* end if */
 
     /* Unlock free space header, now pinned */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_FSPACE_HDR, fs_addr, (size_t)0, fspace, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, (size_t)0, fspace, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPROTECT, NULL, "unable to release free space header")
 
     /* Set return value */
@@ -265,7 +265,7 @@ HDfprintf(stderr, "%s: Deleting free space manager\n", FUNC);
     cache_udata.f = f;
 
     /* Protect the free space header */
-    if(NULL == (fspace = H5AC2_protect(f, dxpl_id, H5AC2_FSPACE_HDR, fs_addr, H5FS_HEADER_SIZE(f), &cache_udata, H5AC2_WRITE)))
+    if(NULL == (fspace = H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, H5FS_HEADER_SIZE(f), &cache_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTPROTECT, FAIL, "unable to protect free space header")
 
     /* Delete serialized section storage, if there are any */
@@ -280,20 +280,20 @@ HDfprintf(stderr, "%s: fspace->sect_addr = %a\n", FUNC, fspace->sect_addr);
         HDassert(fspace->sect_size > 0);
 
         /* Check the free space section info's status in the metadata cache */
-        if(H5AC2_get_entry_status(f, fspace->sect_addr, &sinfo_status) < 0)
+        if(H5AC_get_entry_status(f, fspace->sect_addr, &sinfo_status) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to check metadata cache status for free space section info")
 
         /* If the free space section info is in the cache, expunge it now */
-        if(sinfo_status & H5AC2_ES__IN_CACHE) {
+        if(sinfo_status & H5AC_ES__IN_CACHE) {
             /* Sanity checks on direct block */
-            HDassert(!(sinfo_status & H5AC2_ES__IS_PINNED));
-            HDassert(!(sinfo_status & H5AC2_ES__IS_PROTECTED));
+            HDassert(!(sinfo_status & H5AC_ES__IS_PINNED));
+            HDassert(!(sinfo_status & H5AC_ES__IS_PROTECTED));
 
 #ifdef QAK
 HDfprintf(stderr, "%s: Expunging free space section info from cache\n", FUNC);
 #endif /* QAK */
             /* Evict the free space section info from the metadata cache */
-            if(H5AC2_expunge_entry(f, dxpl_id, H5AC2_FSPACE_SINFO, fspace->sect_addr) < 0)
+            if(H5AC_expunge_entry(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "unable to remove free space section info from cache")
 #ifdef QAK
 HDfprintf(stderr, "%s: Done expunging free space section info from cache\n", FUNC);
@@ -310,7 +310,7 @@ HDfprintf(stderr, "%s: Done expunging free space section info from cache\n", FUN
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to release free space header")
 
     /* Release the free space header */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_FSPACE_HDR, fs_addr, (size_t)0, fspace, H5AC2__DELETED_FLAG) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, (size_t)0, fspace, H5AC__DELETED_FLAG) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPROTECT, FAIL, "unable to release free space header")
     fspace = NULL;
 
@@ -353,7 +353,7 @@ HDfprintf(stderr, "%s: Entering, fspace = %p, fspace->sinfo = %p\n", FUNC, fspac
         HDassert(H5F_addr_defined(fspace->sect_addr));
 
         /* Unpin the free space section info in the cache */
-        if(H5AC2_unpin_entry(fspace->sinfo) < 0)
+        if(H5AC_unpin_entry(fspace->sinfo) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPIN, FAIL, "unable to unpin free space section info")
 
         /* If there aren't any sections being managed, free the space for the sections */
@@ -376,11 +376,11 @@ HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", FUNC, fspace->tot_sect_c
             fspace->alloc_sect_size = fspace->sect_size = 0;
 
             /* Mark free space header as dirty */
-            if(H5AC2_mark_pinned_or_protected_entry_dirty(fspace) < 0)
+            if(H5AC_mark_pinned_or_protected_entry_dirty(fspace) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
 
             /* Evict the section info from the metadata cache */
-            if(H5AC2_expunge_entry(f, dxpl_id, H5AC2_FSPACE_SINFO, old_addr) < 0)
+            if(H5AC_expunge_entry(f, dxpl_id, H5AC_FSPACE_SINFO, old_addr) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "unable to remove free space section info from cache")
         } /* end if */
     } /* end if */
@@ -388,17 +388,17 @@ HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", FUNC, fspace->tot_sect_c
         unsigned sect_status = 0;       /* Free space section's status in the metadata cache */
 
         /* Check if we've allocated any section info in the file & if it's still in the cache */
-        if(H5F_addr_defined(fspace->sect_addr) && H5AC2_get_entry_status(f, fspace->sect_addr, &sect_status) < 0)
+        if(H5F_addr_defined(fspace->sect_addr) && H5AC_get_entry_status(f, fspace->sect_addr, &sect_status) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTGET, FAIL, "unable to check metadata cache status for free space header")
 
         /* If this free list header's section info exists and is still in the
          *      cache, don't unpin the header - let the section info do it,
          *      when the section info is evicted from the cache. -QAK
          */
-        if(!(sect_status & H5AC2_ES__IN_CACHE)) {
+        if(!(sect_status & H5AC_ES__IN_CACHE)) {
             /* Unpin the free space header in the cache */
             /* (the section info destructor would unpin it if the section info existed) */
-            if(H5AC2_unpin_entry(fspace) < 0)
+            if(H5AC_unpin_entry(fspace) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPIN, FAIL, "unable to unpin free space header")
         } /* end if */
     } /* end else */
@@ -670,7 +670,7 @@ H5FS_cache_sinfo_dest(H5FS_sinfo_t *sinfo)
     /* (make certain this is last action with section info, to allow for header
      *  disappearing immediately)
      */
-    if(H5AC2_unpin_entry(sinfo->fspace) < 0)
+    if(H5AC_unpin_entry(sinfo->fspace) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPIN, FAIL, "unable to unpin free space header")
 
     /* Release free space section info */
diff --git a/src/H5FScache.c b/src/H5FScache.c
index 4c85824..234e639 100644
--- a/src/H5FScache.c
+++ b/src/H5FScache.c
@@ -34,7 +34,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"        /* Metadata cache                       */
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FSpkg.h"		/* File free space			*/
 #include "H5Vprivate.h"		/* Vectors and arrays 			*/
@@ -94,9 +94,9 @@ static herr_t H5FS_cache_sinfo_free_icr(haddr_t addr, size_t len, void *thing);
 /* Package Variables */
 /*********************/
 
-/* H5FS header inherits cache-like properties from H5AC2 */
-const H5AC2_class_t H5AC2_FSPACE_HDR[1] = {{
-    H5AC2_FSPACE_HDR_ID,
+/* H5FS header inherits cache-like properties from H5AC */
+const H5AC_class_t H5AC_FSPACE_HDR[1] = {{
+    H5AC_FSPACE_HDR_ID,
     "Free space header",
     H5FD_MEM_FSPACE_HDR,
     H5FS_cache_hdr_deserialize,
@@ -106,9 +106,9 @@ const H5AC2_class_t H5AC2_FSPACE_HDR[1] = {{
     NULL, /* H5FS_cache_hdr_clear_dirty_bits, */
 }};
 
-/* H5FS serialized sections inherit cache-like properties from H5AC2 */
-const H5AC2_class_t H5AC2_FSPACE_SINFO[1] = {{
-    H5AC2_FSPACE_SINFO_ID,
+/* H5FS serialized sections inherit cache-like properties from H5AC */
+const H5AC_class_t H5AC_FSPACE_SINFO[1] = {{
+    H5AC_FSPACE_SINFO_ID,
     "Free space section info",
     H5FD_MEM_FSPACE_SINFO,
     H5FS_cache_sinfo_deserialize,
diff --git a/src/H5FSdbg.c b/src/H5FSdbg.c
index cb7dfe3..b9b6c14 100644
--- a/src/H5FSdbg.c
+++ b/src/H5FSdbg.c
@@ -116,7 +116,7 @@ H5FS_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int
     /*
      * Load the free space header.
      */
-    if(NULL == (fspace = H5AC2_protect(f, dxpl_id, H5AC2_FSPACE_HDR, addr, H5FS_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (fspace = H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, addr, H5FS_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, FAIL, "unable to load free space header")
 
     /* Print opening message */
@@ -166,7 +166,7 @@ H5FS_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int
 	      fspace->alloc_sect_size);
 
 done:
-    if(fspace && H5AC2_unprotect(f, dxpl_id, H5AC2_FSPACE_HDR, addr, (size_t)0, fspace, H5AC2__NO_FLAGS_SET) < 0)
+    if(fspace && H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, addr, (size_t)0, fspace, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_PROTECT, FAIL, "unable to release free space header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -258,14 +258,14 @@ H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, FILE *stream, int
     /*
      * Load the free space header.
      */
-    if(NULL == (fspace = H5AC2_protect(f, dxpl_id, H5AC2_FSPACE_HDR, fs_addr, H5FS_HEADER_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (fspace = H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, H5FS_HEADER_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, FAIL, "unable to load free space header")
 
     /* Retrieve the client id */
     client = fspace->client;
 
     /* Release the free space header */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_FSPACE_HDR, fs_addr, (size_t)0, fspace, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, (size_t)0, fspace, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_PROTECT, FAIL, "unable to release free space header")
     fspace = NULL;
 
@@ -287,7 +287,7 @@ H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, FILE *stream, int
     } /* end switch */
 
 done:
-    if(fspace && H5AC2_unprotect(f, dxpl_id, H5AC2_FSPACE_HDR, fs_addr, (size_t)0, fspace, H5AC2__NO_FLAGS_SET) < 0)
+    if(fspace && H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, (size_t)0, fspace, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_PROTECT, FAIL, "unable to release free space header")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5FSpkg.h b/src/H5FSpkg.h
index 2ed1996..ece1964 100644
--- a/src/H5FSpkg.h
+++ b/src/H5FSpkg.h
@@ -35,7 +35,7 @@
 #include "H5FSprivate.h"	/* File free space                      */
 
 /* Other private headers needed by this file */
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5SLprivate.h"	/* Skip lists				*/
 
 /**************************/
@@ -133,7 +133,7 @@ typedef struct H5FS_node_t {
 /* Information about sections managed */
 typedef struct H5FS_sinfo_t {
     /* Information for H5AC cache functions, _must_ be first field in structure */
-    H5AC2_info_t cache_info;
+    H5AC_info_t cache_info;
 
 /* Stored information */
     H5FS_bin_t *bins;           /* Array of lists of lists of free sections   */
@@ -156,7 +156,7 @@ typedef struct H5FS_sinfo_t {
 /* Main free space info */
 struct H5FS_t {
     /* Information for H5AC cache functions, _must_ be first field in structure */
-    H5AC2_info_t cache_info;
+    H5AC_info_t cache_info;
 
 /* Stored information */
     /* Statistics about sections managed */
@@ -192,10 +192,10 @@ struct H5FS_t {
 /*****************************/
 
 /* H5FS header inherits cache-like properties from H5AC */
-H5_DLLVAR const H5AC2_class_t H5AC2_FSPACE_HDR[1];
+H5_DLLVAR const H5AC_class_t H5AC_FSPACE_HDR[1];
 
 /* H5FS section info inherits cache-like properties from H5AC */
-H5_DLLVAR const H5AC2_class_t H5AC2_FSPACE_SINFO[1];
+H5_DLLVAR const H5AC_class_t H5AC_FSPACE_SINFO[1];
 
 /* Declare a free list to manage the H5FS_node_t struct */
 H5FL_EXTERN(H5FS_node_t);
diff --git a/src/H5FSsection.c b/src/H5FSsection.c
index aa6d71e..9930223 100644
--- a/src/H5FSsection.c
+++ b/src/H5FSsection.c
@@ -222,11 +222,11 @@ HDfprintf(stderr, "%s: New section info, addr = %a, size = %Hu\n", FUNC, fspace-
 #endif /* QAK */
 
         /* Cache the new free space section info (pinned) */
-        if(H5AC2_set(f, dxpl_id, H5AC2_FSPACE_SINFO, fspace->sect_addr, (size_t)fspace->alloc_sect_size, sinfo, H5AC2__PIN_ENTRY_FLAG) < 0)
+        if(H5AC_set(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, (size_t)fspace->alloc_sect_size, sinfo, H5AC__PIN_ENTRY_FLAG) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTINIT, NULL, "can't add free space sections to cache")
 
         /* Mark free space header as dirty */
-        if(H5AC2_mark_pinned_or_protected_entry_dirty(fspace) < 0)
+        if(H5AC_mark_pinned_or_protected_entry_dirty(fspace) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, NULL, "unable to mark free space header as dirty")
     } /* end if */
     else {
@@ -239,15 +239,15 @@ HDfprintf(stderr, "%s: Reading in existing sections, fspace->sect_addr = %a\n",
         cache_udata.dxpl_id = dxpl_id;
 
         /* Protect the free space sections */
-        if(NULL == (sinfo = H5AC2_protect(f, dxpl_id, H5AC2_FSPACE_SINFO, fspace->sect_addr, (size_t)fspace->alloc_sect_size, &cache_udata, H5AC2_WRITE)))
+        if(NULL == (sinfo = H5AC_protect(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, (size_t)fspace->alloc_sect_size, &cache_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTPROTECT, NULL, "unable to load free space sections")
 
         /* Pin them in the cache */
-        if(H5AC2_pin_protected_entry(sinfo) < 0)
+        if(H5AC_pin_protected_entry(sinfo) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTPIN, NULL, "unable to pin free space sections")
 
         /* Unlock free space sections, now pinned */
-        if(H5AC2_unprotect(f, dxpl_id, H5AC2_FSPACE_SINFO, fspace->sect_addr, (size_t)0, sinfo, H5AC2__NO_FLAGS_SET) < 0)
+        if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, (size_t)0, sinfo, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPROTECT, NULL, "unable to release free space sections")
     } /* end else */
 #ifdef QAK
@@ -324,7 +324,7 @@ HDfprintf(stderr, "%s: cls->serial_size = %Zu\n", FUNC, cls->serial_size);
     } /* end else */
 
     /* Mark free space header as dirty */
-    if(H5AC2_mark_pinned_or_protected_entry_dirty(fspace) < 0)
+    if(H5AC_mark_pinned_or_protected_entry_dirty(fspace) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
 
 done:
@@ -387,7 +387,7 @@ HDfprintf(stderr, "%s: cls->serial_size = %Zu\n", FUNC, cls->serial_size);
     } /* end else */
 
     /* Mark free space header as dirty */
-    if(H5AC2_mark_pinned_or_protected_entry_dirty(fspace) < 0)
+    if(H5AC_mark_pinned_or_protected_entry_dirty(fspace) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
 
 done:
@@ -592,7 +592,7 @@ HDfprintf(stderr, "%s: fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
     fspace->tot_space -= sect->size;
 
     /* Mark free space sections as changed */
-    if(H5AC2_mark_pinned_or_protected_entry_dirty(fspace->sinfo) < 0)
+    if(H5AC_mark_pinned_or_protected_entry_dirty(fspace->sinfo) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space sections as dirty")
 
 done:
@@ -1103,7 +1103,7 @@ HDfprintf(stderr, "%s: fspace->hdr->tot_space = %Hu\n", FUNC, fspace->tot_space)
     /* Mark free space sections as changed */
     /* (if adding sections while deserializing sections, don't set the flag) */
     if(!(flags & H5FS_ADD_DESERIALIZING)) {
-        if(H5AC2_mark_pinned_or_protected_entry_dirty(fspace->sinfo) < 0)
+        if(H5AC_mark_pinned_or_protected_entry_dirty(fspace->sinfo) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space sections as dirty")
     } /* end if */
 
@@ -1372,23 +1372,23 @@ HDfprintf(stderr, "%s: old_addr = %a, fspace->sect_addr = %a\n", FUNC, old_addr,
 
         /* Resize pinned section info in the cache, if its changed size */
         if(old_alloc_sect_size != fspace->alloc_sect_size) {
-            if(H5AC2_resize_pinned_entry(fspace->sinfo, (size_t)fspace->alloc_sect_size) < 0)
+            if(H5AC_resize_pinned_entry(fspace->sinfo, (size_t)fspace->alloc_sect_size) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTRESIZE, FAIL, "unable to resize free space section info")
         } /* end if */
 
         /* Move object in cache, if it actually was relocated */
         if(H5F_addr_ne(fspace->sect_addr, old_addr)) {
-            if(H5AC2_rename(f, H5AC2_FSPACE_SINFO, old_addr, fspace->sect_addr) < 0)
+            if(H5AC_rename(f, H5AC_FSPACE_SINFO, old_addr, fspace->sect_addr) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTRENAME, FAIL, "unable to move free space section info")
         } /* end if */
         else {
             /* Mark free space section as dirty */
-            if(H5AC2_mark_pinned_or_protected_entry_dirty(fspace->sinfo) < 0)
+            if(H5AC_mark_pinned_or_protected_entry_dirty(fspace->sinfo) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space section info as dirty")
         } /* end else */
 
         /* Mark free space header as dirty */
-        if(H5AC2_mark_pinned_or_protected_entry_dirty(fspace) < 0)
+        if(H5AC_mark_pinned_or_protected_entry_dirty(fspace) < 0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
     } /* end if */
     else {
@@ -1437,23 +1437,23 @@ HDfprintf(stderr, "%s: Allocating space for smaller serialized sections, new_siz
 
             /* Resize pinned section info in the cache, if its changed size */
             if(old_alloc_sect_size != fspace->alloc_sect_size) {
-                if(H5AC2_resize_pinned_entry(fspace->sinfo, (size_t)fspace->alloc_sect_size) < 0)
+                if(H5AC_resize_pinned_entry(fspace->sinfo, (size_t)fspace->alloc_sect_size) < 0)
                     HGOTO_ERROR(H5E_FSPACE, H5E_CANTRESIZE, FAIL, "unable to resize free space section info")
             } /* end if */
 
             /* Move object in cache, if it actually was relocated */
             if(H5F_addr_ne(fspace->sect_addr, old_addr)) {
-                if(H5AC2_rename(f, H5AC2_FSPACE_SINFO, old_addr, fspace->sect_addr) < 0)
+                if(H5AC_rename(f, H5AC_FSPACE_SINFO, old_addr, fspace->sect_addr) < 0)
                     HGOTO_ERROR(H5E_FSPACE, H5E_CANTRENAME, FAIL, "unable to move free space section info")
             } /* end if */
             else {
                 /* Mark free space section as dirty */
-                if(H5AC2_mark_pinned_or_protected_entry_dirty(fspace->sinfo) < 0)
+                if(H5AC_mark_pinned_or_protected_entry_dirty(fspace->sinfo) < 0)
                     HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space section info as dirty")
             } /* end else */
 
             /* Mark free space header as dirty */
-            if(H5AC2_mark_pinned_or_protected_entry_dirty(fspace) < 0)
+            if(H5AC_mark_pinned_or_protected_entry_dirty(fspace) < 0)
                 HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
         } /* end if */
     } /* end else */
@@ -1792,7 +1792,7 @@ HDfprintf(stderr, "%s: removing object from merge list, sect->type = %u\n", FUNC
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTCOMPUTE, FAIL, "can't adjust free space section size on disk")
 
     /* Mark free space sections as dirty */
-    if(H5AC2_mark_pinned_or_protected_entry_dirty(fspace->sinfo) < 0)
+    if(H5AC_mark_pinned_or_protected_entry_dirty(fspace->sinfo) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space sections as dirty")
 
 done:
diff --git a/src/H5Fmount.c b/src/H5Fmount.c
index d666556..5f59a57 100644
--- a/src/H5Fmount.c
+++ b/src/H5Fmount.c
@@ -21,7 +21,7 @@
 
 /* Packages needed by this file... */
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"        /* Metadata cache                       */
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Fpkg.h"             /* File access				*/
 #include "H5Gprivate.h"		/* Groups				*/
@@ -471,7 +471,7 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id)
      * Also we must work out how we are going to deal with journaling
      * in such cases.
      */
-    FUNC_ENTER_API_META(H5Fmount, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Fmount, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE4("e", "i*sii", loc_id, name, child_id, plist_id);
 
     /* Check arguments */
@@ -488,7 +488,7 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not property list")
 
     /* Do the mount */
-    if(H5F_mount(&loc, name, child, plist_id, H5AC2_dxpl_id) < 0)
+    if(H5F_mount(&loc, name, child, plist_id, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "unable to mount file")
 
 done:
@@ -526,7 +526,7 @@ H5Funmount(hid_t loc_id, const char *name)
      * Also, must decide how we are going to deal with journaling
      * in such cases.
      */
-    FUNC_ENTER_API_META(H5Funmount, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Funmount, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE2("e", "i*s", loc_id, name);
 
     /* Check args */
@@ -536,7 +536,7 @@ H5Funmount(hid_t loc_id, const char *name)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Unmount */
-    if (H5F_unmount(&loc, name, H5AC2_dxpl_id) < 0)
+    if (H5F_unmount(&loc, name, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "unable to unmount file")
 
 done:
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index 6f38a65..dc1efd8 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -37,7 +37,7 @@
 /* Other private headers needed by this file */
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5AC1private.h"	/* Metadata cache			*/
-#include "H5AC2private.h"	/* Metadata cache                       */
+#include "H5ACprivate.h"        /* Metadata cache                       */
 #include "H5FLprivate.h"	/* Free Lists                           */
 #include "H5FOprivate.h"        /* File objects                         */
 #include "H5Gprivate.h"		/* Groups 			  	*/
@@ -109,14 +109,14 @@ typedef struct H5F_file_t {
     haddr_t	driver_addr;	/* File driver information block address*/
     haddr_t	maxaddr;	/* Maximum address for file             */
 
-    H5AC1_t      *cache;		/* The object cache			*/
-    H5AC2_t     *cache2;	/* test cache		 		*/
+    H5AC1_t     *cache1;	/* The object cache			*/
+    H5AC_t      *cache;		/* The object cache	 		*/
     H5AC1_cache_config_t
 		mdc_initCacheCfg; /* initial configuration for the      */
                                 /* metadata cache.  This structure is   */
                                 /* fixed at creation time and should    */
                                 /* not change thereafter.               */
-    H5AC2_jnl_config_t
+    H5AC_jnl_config_t
 	    	initJnlCfg;	/* Initial journaling configuration for */
 				/* the file.  At least in its initial   */
     				/* incarnation, this structure contains */
@@ -141,7 +141,7 @@ typedef struct H5F_file_t {
     hbool_t mdc_jnl_enabled;    /* TRUE iff journaling is in progress	*/
     int32_t mdc_jnl_magic;      /* journal file magic -- if defined     */
     size_t  mdc_jnl_file_name_len; /* journal file name length          */
-    char    mdc_jnl_file_name[H5C2__MAX_JOURNAL_FILE_NAME_LEN + 1];
+    char    mdc_jnl_file_name[H5C__MAX_JOURNAL_FILE_NAME_LEN + 1];
                                 /* journal file name -- if defined      */
 } H5F_file_t;
 
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index afcb200..2826036 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -22,7 +22,7 @@
 /* Public header files needed by this file */
 #include "H5public.h"
 #include "H5AC1public.h"
-#include "H5AC2public.h"
+#include "H5ACpublic.h"
 #include "H5C1public.h"
 #include "H5Ipublic.h"
 
@@ -138,9 +138,9 @@ H5_DLL herr_t H5Funmount(hid_t loc, const char *name);
 H5_DLL hssize_t H5Fget_freespace(hid_t file_id);
 H5_DLL herr_t H5Fget_filesize(hid_t file_id, hsize_t *size);
 H5_DLL herr_t H5Fget_jnl_config(hid_t file_id,
-                                H5AC2_jnl_config_t *config_ptr);
+                                H5AC_jnl_config_t *config_ptr);
 H5_DLL herr_t H5Fset_jnl_config(hid_t file_id,
-                                const H5AC2_jnl_config_t *config_ptr);
+                                const H5AC_jnl_config_t *config_ptr);
 H5_DLL herr_t H5Fget_mdc_config(hid_t file_id,
 				H5AC1_cache_config_t * config_ptr);
 H5_DLL herr_t H5Fset_mdc_config(hid_t file_id,
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 37a34a3..134aedd 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -716,7 +716,7 @@ H5F_super_read(H5F_t *f, hid_t dxpl_id, H5G_loc_t *root_loc)
                 /* Sanity check value */
                 if(shared->mdc_jnl_file_name_len <= 0)
                     HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "journaling enabled, but journal file path empty?!?")
-                if(shared->mdc_jnl_file_name_len > H5C2__MAX_JOURNAL_FILE_NAME_LEN)
+                if(shared->mdc_jnl_file_name_len > H5C__MAX_JOURNAL_FILE_NAME_LEN)
                     HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "journal file path too long")
 
                 HDstrncpy(shared->mdc_jnl_file_name,
@@ -1211,7 +1211,7 @@ H5F_super_write_mdj_msg(H5F_t *f, hid_t dxpl_id)
         /* Sanity check journal file name */
         if(f->shared->mdc_jnl_file_name_len == 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "journaling enabled, but journal file path empty?!?")
-        if(f->shared->mdc_jnl_file_name_len > H5C2__MAX_JOURNAL_FILE_NAME_LEN)
+        if(f->shared->mdc_jnl_file_name_len > H5C__MAX_JOURNAL_FILE_NAME_LEN)
             HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, FAIL, "journal file path too long?!?")
 
         /* Copy journal file name into message to store */
diff --git a/src/H5Ftest.c b/src/H5Ftest.c
index 3344d78..67ea5f7 100644
--- a/src/H5Ftest.c
+++ b/src/H5Ftest.c
@@ -106,7 +106,7 @@ H5F_get_sohm_mesg_count_test(hid_t file_id, unsigned type_id,
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
 
     /* Retrieve count for message type */
-    if(H5SM_get_mesg_count_test(file, H5AC2_ind_dxpl_id, type_id, mesg_count) < 0)
+    if(H5SM_get_mesg_count_test(file, H5AC_ind_dxpl_id, type_id, mesg_count) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't retrieve shared message count")
 
 done:
diff --git a/src/H5G.c b/src/H5G.c
index 00fd378..9fb8092 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -83,7 +83,7 @@
 
 /* Packages needed by this file... */
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Fpkg.h"		/* File access				*/
 #include "H5Gpkg.h"		/* Groups		  		*/
@@ -177,7 +177,7 @@ H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id,
     H5G_t	   *grp = NULL;         /* New group created */
     hid_t	    ret_value;          /* Return value */
 
-    FUNC_ENTER_API_META(H5Gcreate2, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Gcreate2, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE5("i", "i*siii", loc_id, name, lcpl_id, gcpl_id, gapl_id);
 
     /* Check arguments */
@@ -208,7 +208,7 @@ H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list")
 
     /* Create the new group & get its ID */
-    if(NULL == (grp = H5G_create_named(&loc, name, lcpl_id, gcpl_id, gapl_id, H5AC2_dxpl_id)))
+    if(NULL == (grp = H5G_create_named(&loc, name, lcpl_id, gcpl_id, gapl_id, H5AC_dxpl_id)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group")
     if((ret_value = H5I_register(H5I_GROUP, grp)) < 0)
 	HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
@@ -317,7 +317,7 @@ H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id)
     H5G_t	   *grp = NULL;
     hid_t	    ret_value;
 
-    FUNC_ENTER_API_META(H5Gcreate_anon, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Gcreate_anon, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE3("i", "iii", loc_id, gcpl_id, gapl_id);
 
     /* Check arguments */
@@ -339,7 +339,7 @@ H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list")
 
     /* Create the new group & get its ID */
-    if(NULL == (grp = H5G_create(loc.oloc->file, gcpl_id, H5AC2_dxpl_id)))
+    if(NULL == (grp = H5G_create(loc.oloc->file, gcpl_id, H5AC_dxpl_id)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group")
     if((ret_value = H5I_register(H5I_GROUP, grp)) < 0)
 	HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
@@ -394,7 +394,7 @@ H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list")
 
     /* Open the group */
-    if((grp = H5G_open_name(&loc, name, gapl_id, H5AC2_dxpl_id)) == NULL)
+    if((grp = H5G_open_name(&loc, name, gapl_id, H5AC_dxpl_id)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
 
     /* Register an ID for the group */
@@ -454,17 +454,17 @@ H5Gget_create_plist(hid_t group_id)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
     /* Retrieve any object creation properties */
-    if(H5O_get_create_plist(&grp->oloc, H5AC2_ind_dxpl_id, new_plist) < 0)
+    if(H5O_get_create_plist(&grp->oloc, H5AC_ind_dxpl_id, new_plist) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get object creation info")
 
     /* Check for the group having a group info message */
-    if((ginfo_exists = H5O_msg_exists(&(grp->oloc), H5O_GINFO_ID, H5AC2_ind_dxpl_id)) < 0)
+    if((ginfo_exists = H5O_msg_exists(&(grp->oloc), H5O_GINFO_ID, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
     if(ginfo_exists) {
         H5O_ginfo_t ginfo;		/* Group info message            */
 
         /* Read the group info */
-        if(NULL == H5O_msg_read(&(grp->oloc), H5O_GINFO_ID, &ginfo, H5AC2_ind_dxpl_id))
+        if(NULL == H5O_msg_read(&(grp->oloc), H5O_GINFO_ID, &ginfo, H5AC_ind_dxpl_id))
             HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get group info")
 
         /* Set the group info for the property list */
@@ -473,13 +473,13 @@ H5Gget_create_plist(hid_t group_id)
     } /* end if */
 
     /* Check for the group having a link info message */
-    if((linfo_exists = H5O_msg_exists(&(grp->oloc), H5O_LINFO_ID, H5AC2_ind_dxpl_id)) < 0)
+    if((linfo_exists = H5O_msg_exists(&(grp->oloc), H5O_LINFO_ID, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
     if(linfo_exists) {
         H5O_linfo_t linfo;		/* Link info message            */
 
         /* Read the link info */
-        if(NULL == H5G_obj_get_linfo(&(grp->oloc), &linfo, H5AC2_ind_dxpl_id))
+        if(NULL == H5G_obj_get_linfo(&(grp->oloc), &linfo, H5AC_ind_dxpl_id))
             HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info")
 
         /* Set the link info for the property list */
@@ -535,7 +535,7 @@ H5Gget_info(hid_t grp_id, H5G_info_t *grp_info)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
     /* Retrieve the group's information */
-    if(H5G_obj_info(loc.oloc, grp_info/*out*/, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_obj_info(loc.oloc, grp_info/*out*/, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve group info")
 
 done:
@@ -589,12 +589,12 @@ H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *grp_info,
     H5G_loc_reset(&grp_loc);
 
     /* Find the group object */
-    if(H5G_loc_find(&loc, name, &grp_loc/*out*/, lapl_id, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_loc_find(&loc, name, &grp_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found")
     loc_found = TRUE;
 
     /* Retrieve the group's information */
-    if(H5G_obj_info(grp_loc.oloc, grp_info/*out*/, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_obj_info(grp_loc.oloc, grp_info/*out*/, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve group info")
 
 done:
@@ -657,12 +657,12 @@ H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
     H5G_loc_reset(&grp_loc);
 
     /* Find the object's location, according to the order in the index */
-    if(H5G_loc_find_by_idx(&loc, group_name, idx_type, order, n, &grp_loc/*out*/, lapl_id, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_loc_find_by_idx(&loc, group_name, idx_type, order, n, &grp_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found")
     loc_found = TRUE;
 
     /* Retrieve the group's information */
-    if(H5G_obj_info(grp_loc.oloc, grp_info/*out*/, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_obj_info(grp_loc.oloc, grp_info/*out*/, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve group info")
 
 done:
@@ -693,7 +693,7 @@ H5Gclose(hid_t group_id)
     herr_t ret_value = SUCCEED;         /* Return value */
 
     /* Can this change metadata?  If not, no need for a transaction. */
-    FUNC_ENTER_API_META(H5Gclose, group_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Gclose, group_id, H5AC_dxpl_id, FAIL)
     H5TRACE1("e", "i", group_id);
 
     /* Check args */
@@ -1270,7 +1270,7 @@ H5G_close(H5G_t *grp)
         /* Remove the group from the list of opened objects in the file */
         if(H5FO_top_decr(grp->oloc.file, grp->oloc.addr) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
-        if(H5FO_delete(grp->oloc.file, H5AC2_dxpl_id, grp->oloc.addr) < 0)
+        if(H5FO_delete(grp->oloc.file, H5AC_dxpl_id, grp->oloc.addr) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't remove group from list of open objects")
         if(H5O_close(&(grp->oloc)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close")
diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c
index 24dc549..7f6f426 100644
--- a/src/H5Gdeprec.c
+++ b/src/H5Gdeprec.c
@@ -41,7 +41,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Gpkg.h"		/* Groups		  		*/
 #include "H5Iprivate.h"		/* IDs			  		*/
@@ -204,7 +204,7 @@ H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint)
     hid_t           tmp_gcpl = (-1);    /* Temporary group creation property list */
     hid_t	    ret_value;          /* Return value */
 
-    FUNC_ENTER_API_META(H5Gcreate1, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Gcreate1, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE3("i", "i*sz", loc_id, name, size_hint);
 
     /* Check arguments */
@@ -244,7 +244,7 @@ H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint)
 
     /* Create the new group & get its ID */
     if(NULL == (grp = H5G_create_named(&loc, name, H5P_LINK_CREATE_DEFAULT,
-            tmp_gcpl, H5P_GROUP_ACCESS_DEFAULT, H5AC2_dxpl_id)))
+            tmp_gcpl, H5P_GROUP_ACCESS_DEFAULT, H5AC_dxpl_id)))
         HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group")
     if((ret_value = H5I_register(H5I_GROUP, grp)) < 0)
 	HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
@@ -296,7 +296,7 @@ H5Gopen1(hid_t loc_id, const char *name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Open the group */
-    if((grp = H5G_open_name(&loc, name, H5P_DEFAULT, H5AC2_dxpl_id)) == NULL)
+    if((grp = H5G_open_name(&loc, name, H5P_DEFAULT, H5AC_dxpl_id)) == NULL)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
 
     /* Register an atom for the group */
@@ -326,7 +326,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new
 {
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_API_META(H5Glink, cur_loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Glink, cur_loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE4("e", "iLl*s*s", cur_loc_id, type, cur_name, new_name);
 
     /* Check arguments */
@@ -347,7 +347,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
         /* Create the link */
-        if(H5L_create_soft(cur_name, &cur_loc, new_name, H5P_DEFAULT, H5P_DEFAULT, H5AC2_dxpl_id) < 0)
+        if(H5L_create_soft(cur_name, &cur_loc, new_name, H5P_DEFAULT, H5P_DEFAULT, H5AC_dxpl_id) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
     } /* end else if */
     else
@@ -372,7 +372,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
 {
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_API_META(H5Glink2, cur_loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Glink2, cur_loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE5("e", "i*sLli*s", cur_loc_id, cur_name, type, new_loc_id, new_name);
 
     /* Check arguments */
@@ -398,7 +398,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
         /* Create the link */
-        if(H5L_create_soft(cur_name, &new_loc, new_name, H5P_DEFAULT, H5P_DEFAULT, H5AC2_dxpl_id) < 0)
+        if(H5L_create_soft(cur_name, &new_loc, new_name, H5P_DEFAULT, H5P_DEFAULT, H5AC_dxpl_id) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
     } /* end else if */
     else
@@ -455,7 +455,7 @@ H5G_link_hard(hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id,
 
     /* Create the link */
     if(H5L_create_hard(cur_loc_p, cur_name, new_loc_p, new_name,
-                H5P_DEFAULT, H5P_DEFAULT, H5AC2_dxpl_id) < 0)
+                H5P_DEFAULT, H5P_DEFAULT, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
 
 done:
@@ -475,7 +475,7 @@ H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name)
 {
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_API_META(H5Gmove, src_loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Gmove, src_loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE3("e", "i*s*s", src_loc_id, src_name, dst_name);
 
     /* Call common routine to move the link */
@@ -500,7 +500,7 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
 {
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_API_META(H5Gmove2, dst_loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Gmove2, dst_loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE4("e", "i*si*s", src_loc_id, src_name, dst_loc_id, dst_name);
 
     /* Call common routine to move the link */
@@ -561,7 +561,7 @@ H5G_move(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
 
     /* Move the link */
     if(H5L_move(src_loc_p, src_name, dst_loc_p, dst_name, FALSE, H5P_DEFAULT,
-            H5P_DEFAULT, H5AC2_dxpl_id) < 0)
+            H5P_DEFAULT, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link")
 
 done:
@@ -582,7 +582,7 @@ H5Gunlink(hid_t loc_id, const char *name)
     H5G_loc_t	loc;                    /* Group's location */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_API_META(H5Gunlink, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Gunlink, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE2("e", "i*s", loc_id, name);
 
     /* Check arguments */
@@ -592,7 +592,7 @@ H5Gunlink(hid_t loc_id, const char *name)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Call H5L routine... */
-    if(H5L_delete(&loc, name, H5P_DEFAULT, H5AC2_dxpl_id) < 0)
+    if(H5L_delete(&loc, name, H5P_DEFAULT, H5AC_dxpl_id) < 0)
       HGOTO_ERROR(H5E_LINK, H5E_CANTDELETE, FAIL, "couldn't delete link")
 
 done:
@@ -624,7 +624,7 @@ H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf/*out*/)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
 
     /* Call the new link routine which provides this capability */
-    if(H5L_get_val(&loc, name, buf, size, H5P_DEFAULT, H5AC2_ind_dxpl_id) < 0)
+    if(H5L_get_val(&loc, name, buf, size, H5P_DEFAULT, H5AC_ind_dxpl_id) < 0)
       HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "couldn't get link info")
 
 done:
@@ -655,7 +655,7 @@ H5Gset_comment(hid_t loc_id, const char *name, const char *comment)
     H5G_loc_t	loc;
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_API_META(H5Gset_comment, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Gset_comment, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE3("e", "i*s*s", loc_id, name, comment);
 
     if(H5G_loc(loc_id, &loc) < 0)
@@ -663,7 +663,7 @@ H5Gset_comment(hid_t loc_id, const char *name, const char *comment)
     if(!name || !*name)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
 
-    if(H5G_loc_set_comment(&loc, name, comment, H5P_DEFAULT, H5AC2_dxpl_id) < 0)
+    if(H5G_loc_set_comment(&loc, name, comment, H5P_DEFAULT, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to set comment value")
 
 done:
@@ -710,7 +710,7 @@ H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf)
     if(bufsize > 0 && !buf)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no buffer specified")
 
-    if((ret_value = (int)H5G_loc_get_comment(&loc, name, buf, bufsize, H5P_DEFAULT, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = (int)H5G_loc_get_comment(&loc, name, buf, bufsize, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to get comment value")
 
 done:
@@ -774,7 +774,7 @@ H5Giterate(hid_t loc_id, const char *name, int *idx_p, H5G_iterate_t op,
     lnk_op.op_func.op_old = op;
 
     /* Call private function. */
-    if((ret_value = H5G_iterate(loc_id, name, H5_INDEX_NAME, H5_ITER_INC, idx, &last_obj, &lnk_op, op_data, H5P_DEFAULT, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5G_iterate(loc_id, name, H5_INDEX_NAME, H5_ITER_INC, idx, &last_obj, &lnk_op, op_data, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "group iteration failed")
 
     /* Set the index we stopped at */
@@ -816,7 +816,7 @@ H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs)
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
-    if(H5O_obj_type(loc.oloc, &obj_type, H5AC2_ind_dxpl_id) < 0)
+    if(H5O_obj_type(loc.oloc, &obj_type, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get object type")
     if(obj_type != H5O_TYPE_GROUP)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
@@ -824,7 +824,7 @@ H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad pointer to # of objects")
 
     /* Retrieve information about the group */
-    if(H5G_obj_info(loc.oloc, &grp_info, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_obj_info(loc.oloc, &grp_info, H5AC_ind_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "can't determine")
 
     /* Set the number of objects [sic: links] in the group */
@@ -869,7 +869,7 @@ H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link,
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
 
     /* Get info */
-    if(H5G_get_objinfo(&loc, name, follow_link, statbuf, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_get_objinfo(&loc, name, follow_link, statbuf, H5AC_ind_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "cannot stat object")
 
 done:
@@ -1062,13 +1062,13 @@ H5Gget_objname_by_idx(hid_t loc_id, hsize_t idx, char *name, size_t size)
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location ID")
-    if(H5O_obj_type(loc.oloc, &obj_type, H5AC2_ind_dxpl_id) < 0)
+    if(H5O_obj_type(loc.oloc, &obj_type, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get object type")
     if(obj_type != H5O_TYPE_GROUP)
         HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a group")
 
     /* Call internal function */
-    if((ret_value = H5G_obj_get_name_by_idx(loc.oloc, H5_INDEX_NAME, H5_ITER_INC, idx, name, size, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5G_obj_get_name_by_idx(loc.oloc, H5_INDEX_NAME, H5_ITER_INC, idx, name, size, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, FAIL, "can't get object name")
 
 done:
@@ -1104,13 +1104,13 @@ H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx)
     /* Check args */
     if(H5G_loc(loc_id, &loc) < 0)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "not a location ID")
-    if(H5O_obj_type(loc.oloc, &obj_type, H5AC2_ind_dxpl_id) < 0)
+    if(H5O_obj_type(loc.oloc, &obj_type, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5G_UNKNOWN, "can't get object type")
     if(obj_type != H5O_TYPE_GROUP)
         HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, H5G_UNKNOWN, "not a group")
 
     /* Call internal function*/
-    if((ret_value = H5G_obj_get_type_by_idx(loc.oloc, idx, H5AC2_ind_dxpl_id)) == H5G_UNKNOWN)
+    if((ret_value = H5G_obj_get_type_by_idx(loc.oloc, idx, H5AC_ind_dxpl_id)) == H5G_UNKNOWN)
 	HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, H5G_UNKNOWN, "can't get object type")
 
 done:
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index b1426b7..af94a77 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -32,7 +32,7 @@
 
 /* Packages needed by this file... */
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"	/* Metadata cache #2			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Fpkg.h"		/* File access				*/
 #include "H5FLprivate.h"	/* Free Lists                           */
@@ -59,7 +59,7 @@ typedef struct H5G_node_key_t {
  * table or group.
  */
 typedef struct H5G_node_t {
-    H5AC2_info_t cache_info;    /* Information for H5AC cache functions, _must_ be */
+    H5AC_info_t cache_info;    /* Information for H5AC cache functions, _must_ be */
                                 /* first field in structure */
     unsigned nsyms;             /*number of symbols                  */
     H5G_entry_t *entry;         /*array of symbol table entries      */
@@ -105,9 +105,9 @@ static herr_t H5G_node_encode_key(const H5B_shared_t *shared, uint8_t *raw, cons
 static herr_t H5G_node_debug_key(FILE *stream, int indent, int fwidth,
     const void *key, const void *udata);
 
-/* H5G symbol table node inherits cache-like properties from H5AC2 */
-const H5AC2_class_t H5AC2_SNODE[1] = {{
-    H5AC2_SNODE_ID,
+/* H5G symbol table node inherits cache-like properties from H5AC */
+const H5AC_class_t H5AC_SNODE[1] = {{
+    H5AC_SNODE_ID,
     "symbol table node",
     H5FD_MEM_BTREE,
     H5G_node_deserialize,
@@ -580,7 +580,7 @@ H5G_node_create(H5F_t *f, hid_t dxpl_id, H5B_ins_t UNUSED op, void *_lt_key,
     if(NULL == ( sym->entry = H5FL_SEQ_CALLOC(H5G_entry_t, (size_t)(2 * H5F_SYM_LEAF_K(f)))))
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
     H5_CHECK_OVERFLOW(size, /* vartype */hsize_t, /* casttype */size_t);
-    if(H5AC2_set(f, dxpl_id, H5AC2_SNODE, *addr_p, (size_t)size, sym, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(f, dxpl_id, H5AC_SNODE, *addr_p, (size_t)size, sym, H5AC__NO_FLAGS_SET) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to cache symbol table leaf node")
     /*
      * The left and right symbols in an empty tree are both the
@@ -774,7 +774,7 @@ H5G_node_found(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *_lt_key
     /*
      * Load the symbol table node for exclusive access.
      */
-    if(NULL == (sn = H5AC2_protect(f, dxpl_id, H5AC2_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC2_READ)))
+    if(NULL == (sn = H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC_READ)))
 	HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, FAIL, "unable to protect symbol table node")
 
     /* Get base address of heap */
@@ -804,7 +804,7 @@ H5G_node_found(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *_lt_key
         HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "iterator callback failed")
 
 done:
-    if(sn && H5AC2_unprotect(f, dxpl_id, H5AC2_SNODE, addr, (size_t)0, sn, H5AC2__NO_FLAGS_SET) < 0)
+    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, (size_t)0, sn, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to release symbol table node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -856,7 +856,7 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
     H5G_node_key_t	*rt_key = (H5G_node_key_t *) _rt_key;
     H5G_bt_ins_t	*udata = (H5G_bt_ins_t *) _udata;
     H5G_node_t		*sn = NULL, *snrt = NULL;
-    unsigned		sn_flags = H5AC2__NO_FLAGS_SET, snrt_flags = H5AC2__NO_FLAGS_SET;
+    unsigned		sn_flags = H5AC__NO_FLAGS_SET, snrt_flags = H5AC__NO_FLAGS_SET;
     const char		*s;
     const char          *base;                  /* Base of heap */
     unsigned		lt = 0, rt;		/* Binary search cntrs	*/
@@ -880,7 +880,7 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
     /*
      * Load the symbol node.
      */
-    if(NULL == (sn = H5AC2_protect(f, dxpl_id, H5AC2_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC2_WRITE)))
+    if(NULL == (sn = H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5B_INS_ERROR, "unable to protect symbol table node")
 
     /* Get base address of heap */
@@ -923,19 +923,19 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
 	if(H5G_node_create(f, dxpl_id, H5B_INS_FIRST, NULL, NULL, NULL, new_node_p/*out*/) < 0)
 	    HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, H5B_INS_ERROR, "unable to split symbol table node")
 
-	if(NULL == (snrt = H5AC2_protect(f, dxpl_id, H5AC2_SNODE, *new_node_p, H5G_node_size_real(f), (void *)f, H5AC2_WRITE)))
+	if(NULL == (snrt = H5AC_protect(f, dxpl_id, H5AC_SNODE, *new_node_p, H5G_node_size_real(f), (void *)f, H5AC_WRITE)))
 	    HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5B_INS_ERROR, "unable to split symbol table node")
 
 	HDmemcpy(snrt->entry, sn->entry + H5F_SYM_LEAF_K(f),
 		 H5F_SYM_LEAF_K(f) * sizeof(H5G_entry_t));
 	snrt->nsyms = H5F_SYM_LEAF_K(f);
-        snrt_flags |= H5AC2__DIRTIED_FLAG;
+        snrt_flags |= H5AC__DIRTIED_FLAG;
 
 	/* The left node */
 	HDmemset(sn->entry + H5F_SYM_LEAF_K(f), 0,
 		 H5F_SYM_LEAF_K(f) * sizeof(H5G_entry_t));
 	sn->nsyms = H5F_SYM_LEAF_K(f);
-        sn_flags |= H5AC2__DIRTIED_FLAG;
+        sn_flags |= H5AC__DIRTIED_FLAG;
 
 	/* The middle key */
 	md_key->offset = sn->entry[sn->nsyms - 1].name_off;
@@ -956,7 +956,7 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
     } else {
 	/* Where to insert the new entry? */
 	ret_value = H5B_INS_NOOP;
-        sn_flags |= H5AC2__DIRTIED_FLAG;
+        sn_flags |= H5AC__DIRTIED_FLAG;
 	insert_into = sn;
 	if(idx == (int)sn->nsyms) {
 	    rt_key->offset = ent.name_off;
@@ -978,9 +978,9 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
     insert_into->nsyms += 1;
 
 done:
-    if(snrt && H5AC2_unprotect(f, dxpl_id, H5AC2_SNODE, *new_node_p, (size_t)0, snrt, snrt_flags) < 0)
+    if(snrt && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, *new_node_p, (size_t)0, snrt, snrt_flags) < 0)
 	HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5B_INS_ERROR, "unable to release symbol table node")
-    if(sn && H5AC2_unprotect(f, dxpl_id, H5AC2_SNODE, addr, (size_t)0, sn, sn_flags) < 0)
+    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, (size_t)0, sn, sn_flags) < 0)
 	HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5B_INS_ERROR, "unable to release symbol table node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1025,7 +1025,7 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
     H5G_node_key_t	*rt_key = (H5G_node_key_t *)_rt_key;
     H5G_bt_rm_t	*udata = (H5G_bt_rm_t *)_udata;
     H5G_node_t		*sn = NULL;
-    unsigned		sn_flags = H5AC2__NO_FLAGS_SET;
+    unsigned		sn_flags = H5AC__NO_FLAGS_SET;
     unsigned		lt = 0, rt, idx = 0;
     int		        cmp = 1;
     H5B_ins_t		ret_value = H5B_INS_ERROR;
@@ -1040,7 +1040,7 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
     HDassert(udata && udata->common.heap);
 
     /* Load the symbol table */
-    if(NULL == (sn = H5AC2_protect(f, dxpl_id, H5AC2_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC2_WRITE)))
+    if(NULL == (sn = H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5B_INS_ERROR, "unable to protect symbol table node")
 
     /* "Normal" removal of a single entry from the symbol table node */
@@ -1129,7 +1129,7 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
             *rt_key_changed = TRUE;
             sn->nsyms = 0;
             if(H5MF_xfree(f, H5FD_MEM_BTREE, dxpl_id, addr, (hsize_t)H5G_node_size_real(f)) < 0
-                    || H5AC2_unprotect(f, dxpl_id, H5AC2_SNODE, addr, (size_t)0, sn, H5AC2__DIRTIED_FLAG | H5AC2__DELETED_FLAG) < 0) {
+                    || H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, (size_t)0, sn, H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG) < 0) {
                 sn = NULL;
                 HGOTO_ERROR(H5E_SYM, H5E_PROTECT, H5B_INS_ERROR, "unable to free symbol table node")
             } /* end if */
@@ -1143,7 +1143,7 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
              * change.
              */
             sn->nsyms -= 1;
-            sn_flags |= H5AC2__DIRTIED_FLAG;
+            sn_flags |= H5AC__DIRTIED_FLAG;
             HDmemmove(sn->entry + idx, sn->entry + idx + 1,
                       (sn->nsyms-idx) * sizeof(H5G_entry_t));
             ret_value = H5B_INS_NOOP;
@@ -1155,7 +1155,7 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
              * should be changed to reflect the new right-most entry.
              */
             sn->nsyms -= 1;
-            sn_flags |= H5AC2__DIRTIED_FLAG;
+            sn_flags |= H5AC__DIRTIED_FLAG;
             rt_key->offset = sn->entry[sn->nsyms - 1].name_off;
             *rt_key_changed = TRUE;
             ret_value = H5B_INS_NOOP;
@@ -1166,7 +1166,7 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
              * node.
              */
             sn->nsyms -= 1;
-            sn_flags |= H5AC2__DIRTIED_FLAG;
+            sn_flags |= H5AC__DIRTIED_FLAG;
             HDmemmove(sn->entry + idx, sn->entry + idx + 1,
                       (sn->nsyms - idx) * sizeof(H5G_entry_t));
             ret_value = H5B_INS_NOOP;
@@ -1201,7 +1201,7 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
         *rt_key_changed = TRUE;
         sn->nsyms = 0;
         if(H5MF_xfree(f, H5FD_MEM_BTREE, dxpl_id, addr, (hsize_t)H5G_node_size_real(f)) < 0
-                || H5AC2_unprotect(f, dxpl_id, H5AC2_SNODE, addr, (size_t)0, sn, H5AC2__DIRTIED_FLAG | H5AC2__DELETED_FLAG) < 0) {
+                || H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, (size_t)0, sn, H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG) < 0) {
             sn = NULL;
             HGOTO_ERROR(H5E_SYM, H5E_PROTECT, H5B_INS_ERROR, "unable to free symbol table node")
         } /* end if */
@@ -1210,7 +1210,7 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
     } /* end else */
 
 done:
-    if(sn && H5AC2_unprotect(f, dxpl_id, H5AC2_SNODE, addr, (size_t)0, sn, sn_flags) < 0)
+    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, (size_t)0, sn, sn_flags) < 0)
 	HDONE_ERROR(H5E_SYM, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to release symbol table node")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1250,7 +1250,7 @@ H5G_node_iterate(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t ad
     HDassert(udata && udata->heap);
 
     /* Protect the symbol table node & local heap while we iterate over entries */
-    if(NULL == (sn = H5AC2_protect(f, dxpl_id, H5AC2_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC2_READ)))
+    if(NULL == (sn = H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC_READ)))
 	HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5_ITER_ERROR, "unable to load symbol table node")
 
     /*
@@ -1289,7 +1289,7 @@ H5G_node_iterate(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t ad
 
 done:
     /* Release resources */
-    if(sn && H5AC2_unprotect(f, dxpl_id, H5AC2_SNODE, addr, (size_t)0, sn, H5AC2__NO_FLAGS_SET) < 0)
+    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, (size_t)0, sn, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1327,13 +1327,13 @@ H5G_node_sumup(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr
     HDassert(num_objs);
 
     /* Find the object node and add the number of symbol entries. */
-    if(NULL == (sn = H5AC2_protect(f, dxpl_id, H5AC2_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC2_READ)))
+    if(NULL == (sn = H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC_READ)))
 	HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5_ITER_ERROR, "unable to load symbol table node")
 
     *num_objs += sn->nsyms;
 
 done:
-    if(sn && H5AC2_unprotect(f, dxpl_id, H5AC2_SNODE, addr, (size_t)0, sn, H5AC2__NO_FLAGS_SET) < 0)
+    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, (size_t)0, sn, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1372,7 +1372,7 @@ H5G_node_by_idx(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t add
     HDassert(udata);
 
     /* Get a pointer to the symbol table node */
-    if(NULL == (sn = H5AC2_protect(f, dxpl_id, H5AC2_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC2_READ)))
+    if(NULL == (sn = H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC_READ)))
 	HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5_ITER_ERROR, "unable to load symbol table node");
 
     /* Find the node, locate the object symbol table entry and retrieve the name */
@@ -1394,7 +1394,7 @@ H5G_node_by_idx(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t add
         udata->num_objs += sn->nsyms;
 
 done:
-    if(sn && H5AC2_unprotect(f, dxpl_id, H5AC2_SNODE, addr, (size_t)0, sn, H5AC2__NO_FLAGS_SET) < 0)
+    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, (size_t)0, sn, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1510,11 +1510,11 @@ H5G_node_copy(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr,
     HDassert(udata);
 
     /* load the symbol table into memory from the source file */
-    if(NULL == (sn = H5AC2_protect(f, dxpl_id, H5AC2_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC2_READ)))
+    if(NULL == (sn = H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC_READ)))
 	HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5_ITER_ERROR, "unable to load symbol table node")
 
     /* get the base address of the heap */
-    if(NULL == (heap = H5HL_protect(f, dxpl_id, udata->src_heap_addr, H5AC2_READ)))
+    if(NULL == (heap = H5HL_protect(f, dxpl_id, udata->src_heap_addr, H5AC_READ)))
        HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5_ITER_ERROR, "unable to protect symbol name")
 
     /* copy object in this node one by one */
@@ -1603,7 +1603,7 @@ done:
     if(heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to unprotect symbol name")
 
-    if(sn && H5AC2_unprotect(f, dxpl_id, H5AC2_SNODE, addr, (size_t)0, sn, H5AC2__NO_FLAGS_SET) < 0)
+    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, (size_t)0, sn, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1645,7 +1645,7 @@ H5G_node_build_table(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_
      * Save information about the symbol table node since we can't lock it
      * because we're about to call an application function.
      */
-    if(NULL == (sn = H5AC2_protect(f, dxpl_id, H5AC2_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC2_READ)))
+    if(NULL == (sn = H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC_READ)))
 	HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, H5_ITER_ERROR, "unable to load symbol table node")
 
     /* Check if the link table needs to be extended */
@@ -1678,7 +1678,7 @@ H5G_node_build_table(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_
 
 done:
     /* Release the locked items */
-    if(sn && H5AC2_unprotect(f, dxpl_id, H5AC2_SNODE, addr, (size_t)0, sn, H5AC2__NO_FLAGS_SET) < 0)
+    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, (size_t)0, sn, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1752,14 +1752,14 @@ H5G_node_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent,
 
     /* Pin the heap down in memory */
     if(heap_addr > 0 && H5F_addr_defined(heap_addr))
-        if(NULL == (heap = H5HL_protect(f, dxpl_id, heap_addr, H5AC2_READ)))
+        if(NULL == (heap = H5HL_protect(f, dxpl_id, heap_addr, H5AC_READ)))
             HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, FAIL, "unable to protect symbol table heap")
 
     /*
      * If we couldn't load the symbol table node, then try loading the
      * B-tree node.
      */
-    if (NULL == (sn = H5AC2_protect(f, dxpl_id, H5AC2_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC2_READ))) {
+    if (NULL == (sn = H5AC_protect(f, dxpl_id, H5AC_SNODE, addr, H5G_node_size_real(f), (void *)f, H5AC_READ))) {
         H5G_bt_common_t	udata;		/*data to pass through B-tree	*/
 
         H5E_clear_stack(NULL); /* discard that error */
@@ -1797,7 +1797,7 @@ H5G_node_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent,
     } /* end if */
 
 done:
-    if(sn && H5AC2_unprotect(f, dxpl_id, H5AC2_SNODE, addr, (size_t)0, sn, H5AC2__NO_FLAGS_SET) < 0)
+    if(sn && H5AC_unprotect(f, dxpl_id, H5AC_SNODE, addr, (size_t)0, sn, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to release symbol table node")
     if(heap && H5HL_unprotect(heap) < 0)
         HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
diff --git a/src/H5Gobj.c b/src/H5Gobj.c
index d79710e..70f1c34 100644
--- a/src/H5Gobj.c
+++ b/src/H5Gobj.c
@@ -888,7 +888,7 @@ H5G_obj_remove_update_linfo(H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "error iterating over links")
 
                 /* Get a pointer to the object header itself */
-                if((oh = H5O_protect(oloc, dxpl_id, H5AC2_WRITE)) == NULL)
+                if((oh = H5O_protect(oloc, dxpl_id, H5AC_WRITE)) == NULL)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to protect group object header")
 
                 /* Pin the object header */
@@ -896,7 +896,7 @@ H5G_obj_remove_update_linfo(H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTPIN, FAIL, "unable to pin group object header")
 
                 /* Unprotect the object header */
-                if(H5O_unprotect(oloc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+                if(H5O_unprotect(oloc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTUNPROTECT, FAIL, "unable to unprotect group object header")
 
                 /* Inspect links in table for ones that can't be converted back
diff --git a/src/H5Gstab.c b/src/H5Gstab.c
index 4521321..856e2e8 100644
--- a/src/H5Gstab.c
+++ b/src/H5Gstab.c
@@ -121,7 +121,7 @@ H5G_stab_create_components(H5F_t *f, H5O_stab_t *stab, size_t size_hint, hid_t d
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create heap")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(f, dxpl_id, stab->heap_addr, H5AC2_WRITE)))
+    if(NULL == (heap = H5HL_protect(f, dxpl_id, stab->heap_addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Insert name into the heap */
@@ -236,7 +236,7 @@ H5G_stab_insert_real(H5F_t *f, H5O_stab_t *stab, const char *name,
     HDassert(obj_lnk);
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(f, dxpl_id, stab->heap_addr, H5AC2_WRITE)))
+    if(NULL == (heap = H5HL_protect(f, dxpl_id, stab->heap_addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Initialize data to pass through B-tree */
@@ -329,7 +329,7 @@ H5G_stab_remove(H5O_loc_t *loc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
         HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "not a symbol table")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(loc->file, dxpl_id, stab.heap_addr, H5AC2_WRITE)))
+    if(NULL == (heap = H5HL_protect(loc->file, dxpl_id, stab.heap_addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Initialize data to pass through B-tree */
@@ -387,7 +387,7 @@ H5G_stab_remove_by_idx(H5O_loc_t *grp_oloc, hid_t dxpl_id, H5RS_str_t *grp_full_
         HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "not a symbol table")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC2_WRITE)))
+    if(NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Initialize data to pass through B-tree */
@@ -441,7 +441,7 @@ H5G_stab_delete(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab)
     HDassert(H5F_addr_defined(stab->heap_addr));
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(f, dxpl_id, stab->heap_addr, H5AC2_WRITE)))
+    if(NULL == (heap = H5HL_protect(f, dxpl_id, stab->heap_addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Set up user data for B-tree deletion */
@@ -502,7 +502,7 @@ H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
 	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(oloc->file, dxpl_id, stab.heap_addr, H5AC2_READ)))
+    if(NULL == (heap = H5HL_protect(oloc->file, dxpl_id, stab.heap_addr, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Check on iteration order */
@@ -718,7 +718,7 @@ H5G_stab_get_name_by_idx(H5O_loc_t *oloc, H5_iter_order_t order, hsize_t n,
 	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(oloc->file, dxpl_id, stab.heap_addr, H5AC2_READ)))
+    if(NULL == (heap = H5HL_protect(oloc->file, dxpl_id, stab.heap_addr, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Remap index for decreasing iteration order */
@@ -839,7 +839,7 @@ H5G_stab_lookup(H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk,
         HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't read message")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC2_READ)))
+    if(NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Set up user data to pass to 'find' operation callback */
@@ -940,7 +940,7 @@ H5G_stab_lookup_by_idx(H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_t n,
 	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC2_READ)))
+    if(NULL == (heap = H5HL_protect(grp_oloc->file, dxpl_id, stab.heap_addr, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to protect symbol table heap")
 
     /* Remap index for decreasing iteration order */
diff --git a/src/H5Gtest.c b/src/H5Gtest.c
index 7400355..2921bf0 100644
--- a/src/H5Gtest.c
+++ b/src/H5Gtest.c
@@ -108,11 +108,11 @@ H5G_is_empty_test(hid_t gid)
     /* "New format" checks */
 
     /* Check if the group has any link messages */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, H5AC2_dxpl_id)) < 0)
+    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, H5AC_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
     if(msg_exists > 0) {
         /* Sanity check that new group format shouldn't have old messages */
-        if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, H5AC2_dxpl_id)) < 0)
+        if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, H5AC_dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
         if(msg_exists > 0)
             HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and link messages found")
@@ -121,19 +121,19 @@ H5G_is_empty_test(hid_t gid)
     } /* end if */
 
     /* Check for a link info message */
-    if((linfo_exists = H5O_msg_exists(&(grp->oloc), H5O_LINFO_ID, H5AC2_dxpl_id)) < 0)
+    if((linfo_exists = H5O_msg_exists(&(grp->oloc), H5O_LINFO_ID, H5AC_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
     if(linfo_exists > 0) {
         H5O_linfo_t linfo;		/* Link info message */
 
         /* Sanity check that new group format shouldn't have old messages */
-        if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, H5AC2_dxpl_id)) < 0)
+        if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, H5AC_dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
         if(msg_exists > 0)
             HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and link info messages found")
 
         /* Get the link info */
-        if(NULL == H5G_obj_get_linfo(&(grp->oloc), &linfo, H5AC2_dxpl_id))
+        if(NULL == H5G_obj_get_linfo(&(grp->oloc), &linfo, H5AC_dxpl_id))
             HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info")
 
         /* Check for 'dense' link storage file addresses being defined */
@@ -152,7 +152,7 @@ H5G_is_empty_test(hid_t gid)
     /* "Old format" checks */
 
     /* Check if the group has a symbol table message */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, H5AC2_dxpl_id)) < 0)
+    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, H5AC_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
     if(msg_exists > 0) {
         H5O_stab_t stab;        /* Info about local heap & B-tree */
@@ -161,17 +161,17 @@ H5G_is_empty_test(hid_t gid)
         /* Sanity check that old group format shouldn't have new messages */
         if(linfo_exists > 0)
             HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and link info messages found")
-        if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_GINFO_ID, H5AC2_dxpl_id)) < 0)
+        if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_GINFO_ID, H5AC_dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
         if(msg_exists > 0)
             HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and group info messages found")
 
         /* Get the B-tree & local heap info */
-        if(NULL == H5O_msg_read(&(grp->oloc), H5O_STAB_ID, &stab, H5AC2_dxpl_id))
+        if(NULL == H5O_msg_read(&(grp->oloc), H5O_STAB_ID, &stab, H5AC_dxpl_id))
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read symbol table message")
 
         /* Get the count of links in the group */
-        if(H5G_stab_count(&(grp->oloc), &nlinks, H5AC2_dxpl_id) < 0)
+        if(H5G_stab_count(&(grp->oloc), &nlinks, H5AC_dxpl_id) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to count links")
 
         /* Check for link count */
@@ -217,13 +217,13 @@ H5G_has_links_test(hid_t gid, unsigned *nmsgs)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
 
     /* Check if the group has any link messages */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, H5AC2_dxpl_id)) < 0)
+    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, H5AC_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
     if(msg_exists == 0)
         HGOTO_DONE(FALSE)
 
     /* Check if the group has a symbol table message */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, H5AC2_dxpl_id)) < 0)
+    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, H5AC_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
     if(msg_exists > 0)
 	HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and link messages found")
@@ -233,7 +233,7 @@ H5G_has_links_test(hid_t gid, unsigned *nmsgs)
         int msg_count;     /* Number of messages of a type */
 
         /* Check how many link messages there are */
-        if((msg_count = H5O_msg_count(&(grp->oloc), H5O_LINK_ID, H5AC2_dxpl_id)) < 0)
+        if((msg_count = H5O_msg_count(&(grp->oloc), H5O_LINK_ID, H5AC_dxpl_id)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "unable to count link messages")
         *nmsgs = (unsigned)msg_count;
     } /* end if */
@@ -275,13 +275,13 @@ H5G_has_stab_test(hid_t gid)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
 
     /* Check if the group has a symbol table message */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, H5AC2_dxpl_id)) < 0)
+    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, H5AC_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
     if(msg_exists == 0)
         HGOTO_DONE(FALSE)
 
     /* Check if the group has any link messages */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, H5AC2_dxpl_id)) < 0)
+    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, H5AC_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
     if(msg_exists > 0)
 	HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and link messages found")
@@ -325,25 +325,25 @@ H5G_is_new_dense_test(hid_t gid)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
 
     /* Check if the group has a symbol table message */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, H5AC2_dxpl_id)) < 0)
+    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, H5AC_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
     if(msg_exists > 0)
         HGOTO_DONE(FALSE)
 
     /* Check if the group has any link messages */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, H5AC2_dxpl_id)) < 0)
+    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINK_ID, H5AC_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
     if(msg_exists > 0)
         HGOTO_DONE(FALSE)
 
     /* Check if the group has link info message */
-    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINFO_ID, H5AC2_dxpl_id)) < 0)
+    if((msg_exists = H5O_msg_exists(&(grp->oloc), H5O_LINFO_ID, H5AC_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
     if(msg_exists > 0) {
         H5O_linfo_t linfo;		/* Link info message */
 
         /* Get the link info */
-        if(NULL == H5G_obj_get_linfo(&(grp->oloc), &linfo, H5AC2_dxpl_id))
+        if(NULL == H5G_obj_get_linfo(&(grp->oloc), &linfo, H5AC_dxpl_id))
             HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info")
 
         /* Check for 'dense' link storage file addresses being defined */
@@ -393,7 +393,7 @@ H5G_new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
 
     /* Get the link info */
-    if(NULL == H5G_obj_get_linfo(&(grp->oloc), &linfo, H5AC2_dxpl_id))
+    if(NULL == H5G_obj_get_linfo(&(grp->oloc), &linfo, H5AC_dxpl_id))
         HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info")
 
     /* Check for 'dense' link storage file addresses being defined */
@@ -403,13 +403,13 @@ H5G_new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count)
         HGOTO_DONE(FAIL)
 
     /* Retrieve # of records in name index */
-    if(H5B2_get_nrec(grp->oloc.file, H5AC2_dxpl_id, H5G_BT2_NAME, linfo.name_bt2_addr, name_count) < 0)
+    if(H5B2_get_nrec(grp->oloc.file, H5AC_dxpl_id, H5G_BT2_NAME, linfo.name_bt2_addr, name_count) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index")
 
     /* Check if there is a creation order index */
     if(H5F_addr_defined(linfo.corder_bt2_addr)) {
         /* Retrieve # of records in creation order index */
-        if(H5B2_get_nrec(grp->oloc.file, H5AC2_dxpl_id, H5G_BT2_CORDER, linfo.corder_bt2_addr, corder_count) < 0)
+        if(H5B2_get_nrec(grp->oloc.file, H5AC_dxpl_id, H5G_BT2_CORDER, linfo.corder_bt2_addr, corder_count) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from creation order index")
     } /* end if */
     else
@@ -453,11 +453,11 @@ H5G_lheap_size_test(hid_t gid, size_t *lheap_size)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
 
     /* Make certain the group has a symbol table message */
-    if(NULL == H5O_msg_read(&(grp->oloc), H5O_STAB_ID, &stab, H5AC2_dxpl_id))
+    if(NULL == H5O_msg_read(&(grp->oloc), H5O_STAB_ID, &stab, H5AC_dxpl_id))
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read symbol table message")
 
     /* Check the size of the local heap for the group */
-    if(H5HL_get_size(grp->oloc.file, H5AC2_dxpl_id, stab.heap_addr, lheap_size) < 0)
+    if(H5HL_get_size(grp->oloc.file, H5AC_dxpl_id, stab.heap_addr, lheap_size) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTGETSIZE, FAIL, "can't query local heap size")
 
 done:
diff --git a/src/H5HF.c b/src/H5HF.c
index 0987a02..26f935b 100644
--- a/src/H5HF.c
+++ b/src/H5HF.c
@@ -180,7 +180,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
     cache_udata.dxpl_id = dxpl_id;
 
     /* Lock the heap header into memory */
-    if(NULL == (hdr = H5AC2_protect(f, dxpl_id, H5AC2_FHEAP_HDR, fh_addr, (size_t)H5HF_SPEC_READ_SIZE(f), &cache_udata, H5AC2_WRITE)))
+    if(NULL == (hdr = H5AC_protect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, (size_t)H5HF_SPEC_READ_SIZE(f), &cache_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to load fractal heap header")
 
     /* Point fractal heap wrapper at header and bump it's ref count */
@@ -198,7 +198,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
     ret_value = fh;
 
 done:
-    if(hdr && H5AC2_unprotect(f, dxpl_id, H5AC2_FHEAP_HDR, fh_addr, (size_t)0, hdr, H5AC2__NO_FLAGS_SET) < 0)
+    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, (size_t)0, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, NULL, "unable to release fractal heap header")
     if(!ret_value) {
         if(fh)
@@ -247,7 +247,7 @@ H5HF_open(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr)
 #ifdef QAK
 HDfprintf(stderr, "%s: fh_addr = %a\n", FUNC, fh_addr);
 #endif /* QAK */
-    if(NULL == (hdr = H5AC2_protect(f, dxpl_id, H5AC2_FHEAP_HDR, fh_addr, (size_t)H5HF_SPEC_READ_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (hdr = H5AC_protect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, (size_t)H5HF_SPEC_READ_SIZE(f), &cache_udata, H5AC_READ)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "unable to load fractal heap header")
 #ifdef QAK
 HDfprintf(stderr, "%s: hdr->rc = %u, hdr->fspace = %p\n", FUNC, hdr->rc, hdr->fspace);
@@ -277,7 +277,7 @@ HDfprintf(stderr, "%s: hdr->rc = %u, hdr->fspace = %p\n", FUNC, hdr->rc, hdr->fs
     ret_value = fh;
 
 done:
-    if(hdr && H5AC2_unprotect(f, dxpl_id, H5AC2_FHEAP_HDR, fh_addr, (size_t)0, hdr, H5AC2__NO_FLAGS_SET) < 0)
+    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, (size_t)0, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, NULL, "unable to release fractal heap header")
     if(!ret_value) {
         if(fh)
@@ -869,7 +869,7 @@ HDfprintf(stderr, "%s; After iterator reset fh->hdr->rc = %Zu\n", FUNC, fh->hdr-
         cache_udata.dxpl_id = dxpl_id;
 
         /* Lock the heap header into memory */
-        if(NULL == (hdr = H5AC2_protect(fh->f, dxpl_id, H5AC2_FHEAP_HDR, heap_addr, (size_t)H5HF_SPEC_READ_SIZE(fh->f), &cache_udata, H5AC2_WRITE)))
+        if(NULL == (hdr = H5AC_protect(fh->f, dxpl_id, H5AC_FHEAP_HDR, heap_addr, (size_t)H5HF_SPEC_READ_SIZE(fh->f), &cache_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap header")
 
         /* Set the shared heap header's file context for this operation */
@@ -924,7 +924,7 @@ H5HF_delete(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr)
 #ifdef QAK
 HDfprintf(stderr, "%s: fh_addr = %a\n", FUNC, fh_addr);
 #endif /* QAK */
-    if(NULL == (hdr = H5AC2_protect(f, dxpl_id, H5AC2_FHEAP_HDR, fh_addr, (size_t)H5HF_SPEC_READ_SIZE(f), &cache_udata, H5AC2_WRITE)))
+    if(NULL == (hdr = H5AC_protect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, (size_t)H5HF_SPEC_READ_SIZE(f), &cache_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap header")
 
     /* Check for files using shared heap header */
@@ -939,7 +939,7 @@ HDfprintf(stderr, "%s: fh_addr = %a\n", FUNC, fh_addr);
 
 done:
     /* Unprotect the header, if an error occurred */
-    if(hdr && H5AC2_unprotect(f, dxpl_id, H5AC2_FHEAP_HDR, fh_addr, (size_t)0, hdr, H5AC2__NO_FLAGS_SET) < 0)
+    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, (size_t)0, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap header")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index f9634b0..ffc1e92 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -34,7 +34,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5HFpkg.h"		/* Fractal heaps			*/
 #include "H5MFprivate.h"	/* File memory management		*/
@@ -76,7 +76,7 @@
 static herr_t H5HF_dtable_encode(H5F_t *f, uint8_t **pp, const H5HF_dtable_t *dtable);
 static herr_t H5HF_dtable_decode(H5F_t *f, const uint8_t **pp, H5HF_dtable_t *dtable);
 
-/* Metadata cache (H5AC2) callbacks */
+/* Metadata cache (H5AC) callbacks */
 static void *H5HF_cache_hdr_deserialize(haddr_t addr, size_t len,
     const void *image, void *udata, hbool_t *dirty);
 static herr_t H5HF_cache_hdr_serialize(const H5F_t *f, hid_t dxpl_id,
@@ -104,9 +104,9 @@ static herr_t H5HF_cache_dblock_free_icr(haddr_t addr, size_t len, void *thing);
 /* Package Variables */
 /*********************/
 
-/* H5HF header inherits cache-like properties from H5AC2 */
-const H5AC2_class_t H5AC2_FHEAP_HDR[1] = {{
-    H5AC2_FHEAP_HDR_ID,
+/* H5HF header inherits cache-like properties from H5AC */
+const H5AC_class_t H5AC_FHEAP_HDR[1] = {{
+    H5AC_FHEAP_HDR_ID,
     "fractal heap header",
     H5FD_MEM_FHEAP_HDR,
     H5HF_cache_hdr_deserialize,
@@ -116,9 +116,9 @@ const H5AC2_class_t H5AC2_FHEAP_HDR[1] = {{
     NULL,
 }};
 
-/* H5HF indirect block inherits cache-like properties from H5AC2 */
-const H5AC2_class_t H5AC2_FHEAP_IBLOCK[1] = {{
-    H5AC2_FHEAP_IBLOCK_ID,
+/* H5HF indirect block inherits cache-like properties from H5AC */
+const H5AC_class_t H5AC_FHEAP_IBLOCK[1] = {{
+    H5AC_FHEAP_IBLOCK_ID,
     "fractal heap indirect block",
     H5FD_MEM_FHEAP_IBLOCK,
     H5HF_cache_iblock_deserialize,
@@ -128,9 +128,9 @@ const H5AC2_class_t H5AC2_FHEAP_IBLOCK[1] = {{
     NULL,
 }};
 
-/* H5HF direct block inherits cache-like properties from H5AC2 */
-const H5AC2_class_t H5AC2_FHEAP_DBLOCK[1] = {{
-    H5AC2_FHEAP_DBLOCK_ID,
+/* H5HF direct block inherits cache-like properties from H5AC */
+const H5AC_class_t H5AC_FHEAP_DBLOCK[1] = {{
+    H5AC_FHEAP_DBLOCK_ID,
     "fractal head direct block",
     H5FD_MEM_FHEAP_DBLOCK,
     H5HF_cache_dblock_deserialize,
@@ -641,7 +641,7 @@ H5HF_cache_iblock_deserialize(haddr_t UNUSED addr, size_t UNUSED len,
     /* Allocate space for the fractal heap indirect block */
     if(NULL == (iblock = H5FL_CALLOC(H5HF_indirect_t)))
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    HDmemset(&iblock->cache_info, 0, sizeof(H5AC2_info_t));
+    HDmemset(&iblock->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Get the pointer to the shared heap header */
     hdr = udata->par_info->hdr;
@@ -988,7 +988,7 @@ H5HF_cache_dblock_deserialize(haddr_t addr, size_t len, const void *image,
     /* Allocate space for the fractal heap direct block */
     if(NULL == (dblock = H5FL_MALLOC(H5HF_direct_t)))
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    HDmemset(&dblock->cache_info, 0, sizeof(H5AC2_info_t));
+    HDmemset(&dblock->cache_info, 0, sizeof(H5AC_info_t));
 
 
     par_info = (H5HF_parent_t *)(&(udata->par_info));
@@ -1261,12 +1261,12 @@ H5HF_cache_dblock_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
                 if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)write_size)))
                     HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap direct block")
 
-                *flags |= H5AC2__SERIALIZE_RESIZED_FLAG;
+                *flags |= H5AC__SERIALIZE_RESIZED_FLAG;
 		*new_len = write_size;
 
                 /* Let the metadata cache know, if the block moved */
                 if(!H5F_addr_eq(hdr->man_dtable.table_addr, addr)) {
-		    *flags |= H5AC2__SERIALIZE_RENAMED_FLAG;
+		    *flags |= H5AC__SERIALIZE_RENAMED_FLAG;
 		    *new_addr = addr;
 		} /* end if */
 
@@ -1314,12 +1314,12 @@ H5HF_cache_dblock_serialize(const H5F_t *f, hid_t dxpl_id, haddr_t addr,
                 if(HADDR_UNDEF == (addr = H5MF_alloc(f, H5FD_MEM_FHEAP_DBLOCK, dxpl_id, (hsize_t)write_size)))
                     HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap direct block")
 
-                *flags |= H5AC2__SERIALIZE_RESIZED_FLAG;
+                *flags |= H5AC__SERIALIZE_RESIZED_FLAG;
 		*new_len = write_size;
 
                 /* Let the metadata cache know, if the block moved */
                 if(!H5F_addr_eq(par_iblock->ents[par_entry].addr, addr)) {
-		    *flags |= H5AC2__SERIALIZE_RENAMED_FLAG;
+		    *flags |= H5AC__SERIALIZE_RENAMED_FLAG;
 		    *new_addr = addr;
 		} /* end if */
 
diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c
index 0c45e4f..0893e28 100644
--- a/src/H5HFdbg.c
+++ b/src/H5HFdbg.c
@@ -209,7 +209,7 @@ H5HF_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     /*
      * Load the fractal heap header.
      */
-    if(NULL == (hdr = H5AC2_protect(f, dxpl_id, H5AC2_FHEAP_HDR, addr, (size_t)H5HF_SPEC_READ_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (hdr = H5AC_protect(f, dxpl_id, H5AC_FHEAP_HDR, addr, (size_t)H5HF_SPEC_READ_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap header")
 
     /* Print opening message */
@@ -289,7 +289,7 @@ H5HF_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     } /* end if */
 
 done:
-    if(hdr && H5AC2_unprotect(f, dxpl_id, H5AC2_FHEAP_HDR, addr, (size_t)0, hdr, H5AC2__NO_FLAGS_SET) < 0)
+    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, addr, (size_t)0, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release fractal heap header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -425,13 +425,13 @@ H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
     /*
      * Load the fractal heap header.
      */
-    if(NULL == (hdr = H5AC2_protect(f, dxpl_id, H5AC2_FHEAP_HDR, hdr_addr, (size_t)H5HF_SPEC_READ_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (hdr = H5AC_protect(f, dxpl_id, H5AC_FHEAP_HDR, hdr_addr, (size_t)H5HF_SPEC_READ_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap header")
 
     /*
      * Load the heap direct block
      */
-    if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, addr, block_size, NULL, 0, H5AC2_READ)))
+    if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, addr, block_size, NULL, 0, H5AC_READ)))
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap direct block")
 
     /* Print opening message */
@@ -507,9 +507,9 @@ H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
     H5_buffer_dump(stream, indent, dblock->blk, marker, (size_t)0, dblock->size);
 
 done:
-    if(dblock && H5AC2_unprotect(f, dxpl_id, H5AC2_FHEAP_DBLOCK, addr, (size_t)0, dblock, H5AC2__NO_FLAGS_SET) < 0)
+    if(dblock && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_DBLOCK, addr, (size_t)0, dblock, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release fractal heap direct block")
-    if(hdr && H5AC2_unprotect(f, dxpl_id, H5AC2_FHEAP_HDR, hdr_addr, (size_t)0, hdr, H5AC2__NO_FLAGS_SET) < 0)
+    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, hdr_addr, (size_t)0, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release fractal heap header")
     H5MM_xfree(marker);
 
@@ -562,13 +562,13 @@ H5HF_iblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
     /*
      * Load the fractal heap header.
      */
-    if(NULL == (hdr = H5AC2_protect(f, dxpl_id, H5AC2_FHEAP_HDR, hdr_addr, (size_t)H5HF_SPEC_READ_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (hdr = H5AC_protect(f, dxpl_id, H5AC_FHEAP_HDR, hdr_addr, (size_t)H5HF_SPEC_READ_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap header")
 
     /*
      * Load the heap indirect block
      */
-    if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, addr, nrows, NULL, 0, FALSE, H5AC2_READ, &did_protect)))
+    if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, addr, nrows, NULL, 0, FALSE, H5AC_READ, &did_protect)))
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap indirect block")
 
     /* Print opening message */
@@ -648,9 +648,9 @@ H5HF_iblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
                   "<none>");
 
 done:
-    if(iblock && H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC2__NO_FLAGS_SET, did_protect) < 0)
+    if(iblock && H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release fractal heap direct block")
-    if(hdr && H5AC2_unprotect(f, dxpl_id, H5AC2_FHEAP_HDR, hdr_addr, (size_t)0, hdr, H5AC2__NO_FLAGS_SET) < 0)
+    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, hdr_addr, (size_t)0, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release fractal heap header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -751,7 +751,7 @@ H5HF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr,
     /*
      * Load the fractal heap header.
      */
-    if(NULL == (hdr = H5AC2_protect(f, dxpl_id, H5AC2_FHEAP_HDR, fh_addr, (size_t)H5HF_SPEC_READ_SIZE(f), &cache_udata, H5AC2_READ)))
+    if(NULL == (hdr = H5AC_protect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, (size_t)H5HF_SPEC_READ_SIZE(f), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap header")
 
     /* Initialize the free space information for the heap */
@@ -778,7 +778,7 @@ H5HF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr,
     } /* end if */
 
 done:
-    if(hdr && H5AC2_unprotect(f, dxpl_id, H5AC2_FHEAP_HDR, fh_addr, (size_t)0, hdr, H5AC2__NO_FLAGS_SET) < 0)
+    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FHEAP_HDR, fh_addr, (size_t)0, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release fractal heap header")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c
index 4ceb0c2..99f4aba 100644
--- a/src/H5HFdblock.c
+++ b/src/H5HFdblock.c
@@ -115,7 +115,7 @@ H5HF_man_dblock_create(hid_t dxpl_id, H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblo
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for fractal heap direct block")
 
     /* Reset the metadata cache info for the heap header */
-    HDmemset(&dblock->cache_info, 0, sizeof(H5AC2_info_t));
+    HDmemset(&dblock->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Share common heap information */
     dblock->hdr = hdr;
@@ -175,7 +175,7 @@ HDmemset(dblock->blk, 0, dblock->size);
     } /* end else */
 
     /* Cache the new fractal heap direct block */
-    if(H5AC2_set(hdr->f, dxpl_id, H5AC2_FHEAP_DBLOCK, dblock_addr, dblock->size, dblock, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, dblock->size, dblock, H5AC__NO_FLAGS_SET) < 0)
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add fractal heap direct block to cache")
 
     /* Increase the allocated heap size */
@@ -301,7 +301,7 @@ H5HF_man_dblock_destroy(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_direct_t *dblock,
         HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap direct block")
 
     /* Remove direct block from metadata cache */
-    if(H5AC2_unprotect(hdr->f, dxpl_id, H5AC2_FHEAP_DBLOCK, dblock_addr, (size_t)0, dblock, H5AC2__DIRTIED_FLAG|H5AC2__DELETED_FLAG) < 0)
+    if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, (size_t)0, dblock, H5AC__DIRTIED_FLAG|H5AC__DELETED_FLAG) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block")
     dblock = NULL;
 
@@ -411,8 +411,8 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_dblock_protect
  *
- * Purpose:	Convenience wrapper around H5AC2_protect on a direct block
- *              (Use H5AC2_unprotect to unprotect it for now)
+ * Purpose:	Convenience wrapper around H5AC_protect on a direct block
+ *              (Use H5AC_unprotect to unprotect it for now)
  *
  * Return:	Pointer to direct block on success, NULL on failure
  *
@@ -425,7 +425,7 @@ done:
 H5HF_direct_t *
 H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr,
     size_t dblock_size, H5HF_indirect_t *par_iblock, unsigned par_entry,
-    H5AC2_protect_t rw)
+    H5AC_protect_t rw)
 {
     H5HF_direct_t *dblock;      /* Direct block from cache */
     H5HF_dblock_cache_ud_t udata;	/* parent and other infor for deserializing direct block */
@@ -479,7 +479,7 @@ H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr,
 	odi_size = dblock_size;
 
     /* Protect the direct block */
-    if(NULL == (dblock = H5AC2_protect(hdr->f, dxpl_id, H5AC2_FHEAP_DBLOCK, dblock_addr, odi_size, (void *)&udata, rw)))
+    if(NULL == (dblock = H5AC_protect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, odi_size, (void *)&udata, rw)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to protect fractal heap direct block")
 
     /* Set the return value */
@@ -506,7 +506,7 @@ done:
 herr_t
 H5HF_man_dblock_locate(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t obj_off,
     H5HF_indirect_t **ret_iblock, unsigned *ret_entry, hbool_t *ret_did_protect,
-    H5AC2_protect_t rw)
+    H5AC_protect_t rw)
 {
     haddr_t iblock_addr;            /* Indirect block's address */
     H5HF_indirect_t *iblock;        /* Pointer to indirect block */
@@ -541,7 +541,7 @@ H5HF_man_dblock_locate(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t obj_off,
         H5HF_indirect_t *new_iblock;   /* Pointer to new indirect block */
         hbool_t new_did_protect;       /* Whether we protected the indirect block or not */
         unsigned nrows;                /* Number of rows in new indirect block */
-        unsigned cache_flags = H5AC2__NO_FLAGS_SET;      /* Flags for unprotecting parent indirect block */
+        unsigned cache_flags = H5AC__NO_FLAGS_SET;      /* Flags for unprotecting parent indirect block */
 
         /* Compute # of rows in child indirect block */
         nrows = (H5V_log2_gen(hdr->man_dtable.row_block_size[row]) - hdr->man_dtable.first_row_bits) + 1;
@@ -559,7 +559,7 @@ H5HF_man_dblock_locate(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t obj_off,
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate fractal heap indirect block")
 
             /* Indicate that the parent indirect block was modified */
-            cache_flags |= H5AC2__DIRTIED_FLAG;
+            cache_flags |= H5AC__DIRTIED_FLAG;
         } /* end if */
 
         /* Lock child indirect block */
@@ -625,17 +625,17 @@ H5HF_man_dblock_delete(H5F_t *f, hid_t dxpl_id, haddr_t dblock_addr,
     HDassert(H5F_addr_defined(dblock_addr));
 
     /* Check the direct block's status in the metadata cache */
-    if(H5AC2_get_entry_status(f, dblock_addr, &dblock_status) < 0)
+    if(H5AC_get_entry_status(f, dblock_addr, &dblock_status) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to check metadata cache status for direct block")
 
     /* If the direct block is in the cache, expunge it now */
-    if(dblock_status & H5AC2_ES__IN_CACHE) {
+    if(dblock_status & H5AC_ES__IN_CACHE) {
         /* Sanity checks on direct block */
-        HDassert(!(dblock_status & H5AC2_ES__IS_PINNED));
-        HDassert(!(dblock_status & H5AC2_ES__IS_PROTECTED));
+        HDassert(!(dblock_status & H5AC_ES__IS_PINNED));
+        HDassert(!(dblock_status & H5AC_ES__IS_PROTECTED));
 
         /* Evict the direct block from the metadata cache */
-        if(H5AC2_expunge_entry(f, dxpl_id, H5AC2_FHEAP_DBLOCK, dblock_addr) < 0)
+        if(H5AC_expunge_entry(f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "unable to remove direct block from cache")
     } /* end if */
 
diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c
index 06ab19a..f2127a1 100644
--- a/src/H5HFhdr.c
+++ b/src/H5HFhdr.c
@@ -489,7 +489,7 @@ H5HF_hdr_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed for fractal heap header")
 
     /* Cache the new fractal heap header */
-    if(H5AC2_set(f, dxpl_id, H5AC2_FHEAP_HDR, hdr->heap_addr, (size_t)hdr->heap_size, hdr, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(f, dxpl_id, H5AC_FHEAP_HDR, hdr->heap_addr, (size_t)hdr->heap_size, hdr, H5AC__NO_FLAGS_SET) < 0)
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF, "can't add fractal heap header to cache")
 
     /* Set address of heap header to return */
@@ -529,7 +529,7 @@ H5HF_hdr_incr(H5HF_hdr_t *hdr)
 
     /* Mark header as un-evictable when a block is depending on it */
     if(hdr->rc == 0)
-        if(H5AC2_pin_protected_entry(hdr) < 0)
+        if(H5AC_pin_protected_entry(hdr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPIN, FAIL, "unable to pin fractal heap header")
 
     /* Increment reference count on shared header */
@@ -570,7 +570,7 @@ H5HF_hdr_decr(H5HF_hdr_t *hdr)
     /* Mark header as evictable again when no child blocks depend on it */
     if(hdr->rc == 0) {
         HDassert(hdr->file_rc == 0);
-        if(H5AC2_unpin_entry(hdr) < 0)
+        if(H5AC_unpin_entry(hdr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPIN, FAIL, "unable to unpin fractal heap header")
     } /* end if */
 
@@ -661,12 +661,12 @@ H5HF_hdr_dirty(H5HF_hdr_t *hdr)
 
     /* Resize pinned header in cache if I/O filter is present. */
     if(hdr->filter_len > 0) {
-        if(H5AC2_resize_pinned_entry(hdr, (size_t)hdr->heap_size) < 0)
+        if(H5AC_resize_pinned_entry(hdr, (size_t)hdr->heap_size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize fractal heap header")
     } /* end if */
 
     /* Mark header as dirty in cache */
-    if(H5AC2_mark_pinned_or_protected_entry_dirty(hdr) < 0)
+    if(H5AC_mark_pinned_or_protected_entry_dirty(hdr) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, FAIL, "unable to mark fractal heap header as dirty")
 
     /* Set the dirty flags for the heap header */
@@ -1053,7 +1053,7 @@ H5HF_hdr_update_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_size)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate fractal heap indirect block")
 
                     /* Lock new indirect block */
-                    if(NULL == (new_iblock = H5HF_man_iblock_protect(hdr, dxpl_id, new_iblock_addr, child_nrows, iblock, next_entry, FALSE, H5AC2_WRITE, &did_protect)))
+                    if(NULL == (new_iblock = H5HF_man_iblock_protect(hdr, dxpl_id, new_iblock_addr, child_nrows, iblock, next_entry, FALSE, H5AC_WRITE, &did_protect)))
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
 
                     /* Move iterator down one level (pins indirect block) */
@@ -1073,7 +1073,7 @@ H5HF_hdr_update_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_size)
                     } /* end if */
 
                     /* Unprotect child indirect block */
-                    if(H5HF_man_iblock_unprotect(new_iblock, dxpl_id, H5AC2__NO_FLAGS_SET, did_protect) < 0)
+                    if(H5HF_man_iblock_unprotect(new_iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
                 } /* end else */
 
@@ -1247,7 +1247,7 @@ H5HF_hdr_reverse_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr)
                 child_nrows = H5HF_dtable_size_to_rows(&hdr->man_dtable, hdr->man_dtable.row_block_size[row]);
 
                 /* Lock child indirect block */
-                if(NULL == (child_iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock->ents[curr_entry].addr, child_nrows, iblock, curr_entry, FALSE, H5AC2_WRITE, &did_protect)))
+                if(NULL == (child_iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock->ents[curr_entry].addr, child_nrows, iblock, curr_entry, FALSE, H5AC_WRITE, &did_protect)))
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
 
                 /* Set the current location of the iterator */
@@ -1263,7 +1263,7 @@ H5HF_hdr_reverse_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr)
                 curr_entry = (child_iblock->nrows * hdr->man_dtable.cparam.width) - 1;
 
                 /* Unprotect child indirect block */
-                if(H5HF_man_iblock_unprotect(child_iblock, dxpl_id, H5AC2__NO_FLAGS_SET, did_protect) < 0)
+                if(H5HF_man_iblock_unprotect(child_iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
 
                 /* Note that we walked down */
@@ -1356,12 +1356,12 @@ H5HF_hdr_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
     unsigned hdr_status = 0;         /* Heap header's status in the metadata cache */
 
     /* Check the heap header's status in the metadata cache */
-    if(H5AC2_get_entry_status(hdr->f, hdr->heap_addr, &hdr_status) < 0)
+    if(H5AC_get_entry_status(hdr->f, hdr->heap_addr, &hdr_status) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to check metadata cache status for heap header")
 
     /* Sanity checks on heap header */
-    HDassert(hdr_status & H5AC2_ES__IN_CACHE);
-    HDassert(hdr_status & H5AC2_ES__IS_PROTECTED);
+    HDassert(hdr_status & H5AC_ES__IN_CACHE);
+    HDassert(hdr_status & H5AC_ES__IS_PROTECTED);
 } /* end block */
 #endif /* NDEBUG */
 
@@ -1414,13 +1414,13 @@ H5HF_hdr_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to release fractal heap header")
 
     /* Finished deleting header */
-    if(H5AC2_unprotect(hdr->f, dxpl_id, H5AC2_FHEAP_HDR, hdr->heap_addr, (size_t)0, hdr, H5AC2__DIRTIED_FLAG|H5AC2__DELETED_FLAG) < 0)
+    if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_HDR, hdr->heap_addr, (size_t)0, hdr, H5AC__DIRTIED_FLAG|H5AC__DELETED_FLAG) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap header")
     hdr = NULL;
 
 done:
     /* Unprotect the header, if an error occurred */
-    if(hdr && H5AC2_unprotect(hdr->f, dxpl_id, H5AC2_FHEAP_HDR, hdr->heap_addr, (size_t)0, hdr, H5AC2__NO_FLAGS_SET) < 0)
+    if(hdr && H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_HDR, hdr->heap_addr, (size_t)0, hdr, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap header")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c
index defda1f..1b4345e 100644
--- a/src/H5HFiblock.c
+++ b/src/H5HFiblock.c
@@ -115,7 +115,7 @@ H5HF_iblock_pin(H5HF_indirect_t *iblock)
     HDassert(iblock);
 
     /* Mark block as un-evictable */
-    if(H5AC2_pin_protected_entry(iblock) < 0)
+    if(H5AC_pin_protected_entry(iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPIN, FAIL, "unable to pin fractal heap indirect block")
 
     /* If this indirect block has a parent, update it's child iblock pointer */
@@ -199,7 +199,7 @@ H5HF_iblock_unpin(H5HF_indirect_t *iblock)
     } /* end if */
 
     /* Mark block as evictable again */
-    if(H5AC2_unpin_entry(iblock) < 0)
+    if(H5AC_unpin_entry(iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPIN, FAIL, "unable to unpin fractal heap indirect block")
 
 done:
@@ -290,18 +290,18 @@ H5HF_iblock_decr(H5HF_indirect_t *iblock)
             /* Detach from parent indirect block */
             if(iblock->parent) {
                 /* Detach from parent indirect block */
-                if(H5HF_man_iblock_detach(iblock->parent, H5AC2_dxpl_id, iblock->par_entry) < 0)
+                if(H5HF_man_iblock_detach(iblock->parent, H5AC_dxpl_id, iblock->par_entry) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL, "can't detach from parent indirect block")
                 iblock->parent = NULL;
                 iblock->par_entry = 0;
             } /* end if */
 
             /* Release space for indirect block on disk */
-            if(H5MF_xfree(iblock->hdr->f, H5FD_MEM_FHEAP_IBLOCK, H5AC2_dxpl_id, iblock->addr, (hsize_t)iblock->size) < 0)
+            if(H5MF_xfree(iblock->hdr->f, H5FD_MEM_FHEAP_IBLOCK, H5AC_dxpl_id, iblock->addr, (hsize_t)iblock->size) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap indirect block disk space")
 
             /* Evict the indirect block from the metadata cache */
-            if(H5AC2_expunge_entry(iblock->hdr->f, H5AC2_dxpl_id, H5AC2_FHEAP_IBLOCK, iblock->addr) < 0)
+            if(H5AC_expunge_entry(iblock->hdr->f, H5AC_dxpl_id, H5AC_FHEAP_IBLOCK, iblock->addr) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "unable to remove indirect block from cache")
         } /* end if */
     } /* end if */
@@ -335,7 +335,7 @@ H5HF_iblock_dirty(H5HF_indirect_t *iblock)
     HDassert(iblock);
 
     /* Mark indirect block as dirty in cache */
-    if(H5AC2_mark_pinned_or_protected_entry_dirty(iblock) < 0)
+    if(H5AC_mark_pinned_or_protected_entry_dirty(iblock) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, FAIL, "unable to mark fractal heap indirect block as dirty")
 
 done:
@@ -394,7 +394,7 @@ H5HF_man_iblock_root_create(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_si
     /* Move current direct block (used as root) into new indirect block */
 
     /* Lock new indirect block */
-    if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, nrows, NULL, 0, FALSE, H5AC2_WRITE, &did_protect)))
+    if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, nrows, NULL, 0, FALSE, H5AC_WRITE, &did_protect)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
 
     /* Check if there's already a direct block as root) */
@@ -403,7 +403,7 @@ H5HF_man_iblock_root_create(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_si
         H5HF_direct_t *dblock;          /* Pointer to direct block to query */
 
         /* Lock first (root) direct block */
-        if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, hdr->man_dtable.table_addr, hdr->man_dtable.cparam.start_block_size, NULL, 0, H5AC2_WRITE)))
+        if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, hdr->man_dtable.table_addr, hdr->man_dtable.cparam.start_block_size, NULL, 0, H5AC_WRITE)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap direct block")
 
         /* Attach direct block to new root indirect block */
@@ -424,7 +424,7 @@ H5HF_man_iblock_root_create(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_si
         } /* end if */
 
         /* Unlock first (previously the root) direct block */
-        if(H5AC2_unprotect(hdr->f, dxpl_id, H5AC2_FHEAP_DBLOCK, hdr->man_dtable.table_addr, (size_t)0, dblock, H5AC2__NO_FLAGS_SET) < 0)
+        if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, hdr->man_dtable.table_addr, (size_t)0, dblock, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block")
         dblock = NULL;
     } /* end if */
@@ -446,7 +446,7 @@ H5HF_man_iblock_root_create(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_si
         HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty")
 
     /* Unprotect root indirect block (it's pinned by the iterator though) */
-    if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC2__DIRTIED_FLAG, did_protect) < 0)
+    if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__DIRTIED_FLAG, did_protect) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
     iblock = NULL;
 
@@ -559,13 +559,13 @@ H5HF_man_iblock_root_double(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_si
 
     /* Resize pinned indirect block in the cache, if its changed size */
     if(old_iblock_size != iblock->size) {
-        if(H5AC2_resize_pinned_entry(iblock, (size_t)iblock->size) < 0)
+        if(H5AC_resize_pinned_entry(iblock, (size_t)iblock->size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize fractal heap indirect block")
     } /* end if */
 
     /* Move object in cache, if it actually was relocated */
     if(H5F_addr_ne(iblock->addr, new_addr)) {
-        if(H5AC2_rename(hdr->f, H5AC2_FHEAP_IBLOCK, iblock->addr, new_addr) < 0)
+        if(H5AC_rename(hdr->f, H5AC_FHEAP_IBLOCK, iblock->addr, new_addr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRENAME, FAIL, "unable to move fractal heap root indirect block")
         iblock->addr = new_addr;
     } /* end if */
@@ -718,13 +718,13 @@ H5HF_man_iblock_root_halve(H5HF_indirect_t *iblock, hid_t dxpl_id)
 
     /* Resize pinned indirect block in the cache, if it has changed size */
     if(old_size != iblock->size) {
-        if(H5AC2_resize_pinned_entry(iblock, (size_t)iblock->size) < 0)
+        if(H5AC_resize_pinned_entry(iblock, (size_t)iblock->size) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize fractal heap indirect block")
     } /* end if */
 
     /* Move object in cache, if it actually was relocated */
     if(H5F_addr_ne(iblock->addr, new_addr)) {
-        if(H5AC2_rename(hdr->f, H5AC2_FHEAP_IBLOCK, iblock->addr, new_addr) < 0)
+        if(H5AC_rename(hdr->f, H5AC_FHEAP_IBLOCK, iblock->addr, new_addr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTSPLIT, FAIL, "unable to move fractal heap root indirect block")
         iblock->addr = new_addr;
     } /* end if */
@@ -812,7 +812,7 @@ H5HF_man_iblock_root_revert(H5HF_indirect_t *root_iblock, hid_t dxpl_id)
     dblock_size = hdr->man_dtable.cparam.start_block_size;
 
     /* Get pointer to last direct block */
-    if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, root_iblock, 0, H5AC2_WRITE)))
+    if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, root_iblock, 0, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap direct block")
     HDassert(dblock->parent == root_iblock);
     HDassert(dblock->par_entry == 0);
@@ -843,7 +843,7 @@ H5HF_man_iblock_root_revert(H5HF_indirect_t *root_iblock, hid_t dxpl_id)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, FAIL, "can't increase space to cover root direct block")
 
 done:
-    if(dblock && H5AC2_unprotect(hdr->f, dxpl_id, H5AC2_FHEAP_DBLOCK, dblock_addr, (size_t)0, dblock, H5AC2__NO_FLAGS_SET) < 0)
+    if(dblock && H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, (size_t)0, dblock, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -955,7 +955,7 @@ H5HF_man_iblock_create(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *par_iblo
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for fractal heap indirect block")
 
     /* Reset the metadata cache info for the heap header */
-    HDmemset(&iblock->cache_info, 0, sizeof(H5AC2_info_t));
+    HDmemset(&iblock->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Share common heap information */
     iblock->hdr = hdr;
@@ -1033,7 +1033,7 @@ H5HF_man_iblock_create(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *par_iblo
     iblock->max_child = 0;
 
     /* Cache the new indirect block */
-    if(H5AC2_set(hdr->f, dxpl_id, H5AC2_FHEAP_IBLOCK, *addr_p, (size_t)iblock->size, iblock, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(hdr->f, dxpl_id, H5AC_FHEAP_IBLOCK, *addr_p, (size_t)iblock->size, iblock, H5AC__NO_FLAGS_SET) < 0)
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add fractal heap indirect block to cache")
 
 done:
@@ -1048,7 +1048,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iblock_protect
  *
- * Purpose:	Convenience wrapper around H5AC2_protect on an indirect block
+ * Purpose:	Convenience wrapper around H5AC_protect on an indirect block
  *
  * Return:	Pointer to indirect block on success, NULL on failure
  *
@@ -1061,7 +1061,7 @@ done:
 H5HF_indirect_t *
 H5HF_man_iblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
     unsigned iblock_nrows, H5HF_indirect_t *par_iblock, unsigned par_entry,
-    hbool_t must_protect, H5AC2_protect_t rw, hbool_t *did_protect)
+    hbool_t must_protect, H5AC_protect_t rw, hbool_t *did_protect)
 {
     H5HF_parent_t par_info;             /* Parent info for loading block */
     H5HF_indirect_t *iblock = NULL;     /* Indirect block from cache */
@@ -1128,7 +1128,7 @@ H5HF_man_iblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
         cache_udata.nrows = &iblock_nrows;
 
         /* Protect the indirect block */
-        if(NULL == (iblock = H5AC2_protect(hdr->f, dxpl_id, H5AC2_FHEAP_IBLOCK, iblock_addr, H5HF_IBLOCK_SIZE(hdr, iblock_nrows), &cache_udata, rw)))
+        if(NULL == (iblock = H5AC_protect(hdr->f, dxpl_id, H5AC_FHEAP_IBLOCK, iblock_addr, H5HF_IBLOCK_SIZE(hdr, iblock_nrows), &cache_udata, rw)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to protect fractal heap indirect block")
         *did_protect = TRUE;
     } /* end if */
@@ -1146,7 +1146,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5HF_man_iblock_unprotect
  *
- * Purpose:	Convenience wrapper around H5AC2_unprotect on an indirect block
+ * Purpose:	Convenience wrapper around H5AC_unprotect on an indirect block
  *
  * Return:	SUCCEED/FAIL
  *
@@ -1173,7 +1173,7 @@ H5HF_man_iblock_unprotect(H5HF_indirect_t *iblock, hid_t dxpl_id,
     /* (as opposed to using an existing pointer to a pinned child indirect block) */
     if(did_protect) {
         /* Unprotect the indirect block */
-        if(H5AC2_unprotect(iblock->hdr->f, dxpl_id, H5AC2_FHEAP_IBLOCK, iblock->addr, (size_t)0, iblock, cache_flags) < 0)
+        if(H5AC_unprotect(iblock->hdr->f, dxpl_id, H5AC_FHEAP_IBLOCK, iblock->addr, (size_t)0, iblock, cache_flags) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
     } /* end if */
 
@@ -1418,7 +1418,7 @@ H5HF_man_iblock_delete(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
     HDassert(iblock_nrows > 0);
 
     /* Lock indirect block */
-    if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, iblock_nrows, par_iblock, par_entry, TRUE, H5AC2_WRITE, &did_protect)))
+    if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, iblock_nrows, par_iblock, par_entry, TRUE, H5AC_WRITE, &did_protect)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
     HDassert(iblock->nchildren > 0);
     HDassert(did_protect == TRUE);
@@ -1472,16 +1472,16 @@ H5HF_man_iblock_delete(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
     unsigned iblock_status = 0;         /* Indirect block's status in the metadata cache */
 
     /* Check the indirect block's status in the metadata cache */
-    if(H5AC2_get_entry_status(hdr->f, iblock_addr, &iblock_status) < 0)
+    if(H5AC_get_entry_status(hdr->f, iblock_addr, &iblock_status) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to check metadata cache status for indirect block")
 
     /* Check if indirect block is pinned */
-    HDassert(!(iblock_status & H5AC2_ES__IS_PINNED));
+    HDassert(!(iblock_status & H5AC_ES__IS_PINNED));
 }
 #endif /* NDEBUG */
 
     /* Finished deleting indirect block in metadata cache */
-    if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC2__DIRTIED_FLAG|H5AC2__DELETED_FLAG, did_protect) < 0)
+    if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__DIRTIED_FLAG|H5AC__DELETED_FLAG, did_protect) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
     iblock = NULL;
 
@@ -1521,7 +1521,7 @@ H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr, haddr_t iblock_ad
     HDassert(heap_size);
 
     /* Protect the indirect block */
-    if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, nrows, par_iblock, par_entry, FALSE, H5AC2_READ, &did_protect)))
+    if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, nrows, par_iblock, par_entry, FALSE, H5AC_READ, &did_protect)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap indirect block")
 
     /* Accumulate size of this indirect block */
@@ -1551,7 +1551,7 @@ H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr, haddr_t iblock_ad
 
 done:
     /* Release the indirect block */
-    if(iblock && H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC2__NO_FLAGS_SET, did_protect) < 0)
+    if(iblock && H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
     iblock = NULL;
 
diff --git a/src/H5HFiter.c b/src/H5HFiter.c
index d69e314..4dbb186 100644
--- a/src/H5HFiter.c
+++ b/src/H5HFiter.c
@@ -216,7 +216,7 @@ H5HF_man_iter_start_offset(H5HF_hdr_t *hdr, hid_t dxpl_id,
         } /* end else */
 
         /* Load indirect block for this context location */
-        if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, iblock_nrows, iblock_parent, iblock_par_entry, FALSE, H5AC2_WRITE, &did_protect)))
+        if(NULL == (iblock = H5HF_man_iblock_protect(hdr, dxpl_id, iblock_addr, iblock_nrows, iblock_parent, iblock_par_entry, FALSE, H5AC_WRITE, &did_protect)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
 
         /* Make indirect block the context for the current location */
@@ -227,7 +227,7 @@ H5HF_man_iter_start_offset(H5HF_hdr_t *hdr, hid_t dxpl_id,
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared indirect block")
 
         /* Release the current indirect block */
-        if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC2__NO_FLAGS_SET, did_protect) < 0)
+        if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
         iblock = NULL;
 
diff --git a/src/H5HFman.c b/src/H5HFman.c
index 09b13ec..add8efd 100644
--- a/src/H5HFman.c
+++ b/src/H5HFman.c
@@ -145,7 +145,7 @@ H5HF_man_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, const void *obj
         HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't retrieve direct block information")
 
     /* Lock direct block */
-    if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, sec_node->u.single.parent, sec_node->u.single.par_entry, H5AC2_WRITE)))
+    if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, sec_node->u.single.parent, sec_node->u.single.par_entry, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load fractal heap direct block")
 
     /* Insert object into block */
@@ -187,7 +187,7 @@ H5HF_man_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, const void *obj
 
 done:
     /* Release the direct block (marked as dirty) */
-    if(dblock && H5AC2_unprotect(hdr->f, dxpl_id, H5AC2_FHEAP_DBLOCK, dblock_addr, (size_t)0, dblock, H5AC2__DIRTIED_FLAG) < 0)
+    if(dblock && H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, (size_t)0, dblock, H5AC__DIRTIED_FLAG) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -213,7 +213,7 @@ H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
     H5HF_operator_t op, void *op_data, unsigned op_flags)
 {
     H5HF_direct_t *dblock = NULL;       /* Pointer to direct block to query */
-    H5AC2_protect_t dblock_access;      /* Access method for direct block */
+    H5AC_protect_t dblock_access;      /* Access method for direct block */
     haddr_t dblock_addr;                /* Direct block address */
     size_t dblock_size;                 /* Direct block size */
     unsigned dblock_cache_flags;        /* Flags for unprotecting direct block */
@@ -234,12 +234,12 @@ H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
 
     /* Set the access mode for the direct block */
     if(op_flags & H5HF_OP_MODIFY) {
-        dblock_access = H5AC2_WRITE;
-        dblock_cache_flags = H5AC2__DIRTIED_FLAG;
+        dblock_access = H5AC_WRITE;
+        dblock_cache_flags = H5AC__DIRTIED_FLAG;
     } /* end if */
     else {
-        dblock_access = H5AC2_READ;
-        dblock_cache_flags = H5AC2__NO_FLAGS_SET;
+        dblock_access = H5AC_READ;
+        dblock_cache_flags = H5AC__NO_FLAGS_SET;
     } /* end else */
 
     /* Skip over the flag byte */
@@ -275,7 +275,7 @@ H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
         unsigned entry;                 /* Entry of block */
 
         /* Look up indirect block containing direct block */
-        if(H5HF_man_dblock_locate(hdr, dxpl_id, obj_off, &iblock, &entry, &did_protect, H5AC2_READ) < 0)
+        if(H5HF_man_dblock_locate(hdr, dxpl_id, obj_off, &iblock, &entry, &did_protect, H5AC_READ) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPUTE, FAIL, "can't compute row & column of section")
 
         /* Set direct block info */
@@ -285,7 +285,7 @@ H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
         /* Check for offset of invalid direct block */
         if(!H5F_addr_defined(dblock_addr)) {
             /* Unlock indirect block */
-            if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC2__NO_FLAGS_SET, did_protect) < 0)
+            if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
 
             HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "fractal heap ID not in allocated direct block")
@@ -294,14 +294,14 @@ H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
         /* Lock direct block */
         if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, iblock, entry, dblock_access))) {
             /* Unlock indirect block */
-            if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC2__NO_FLAGS_SET, did_protect) < 0)
+            if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
 
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap direct block")
         } /* end if */
 
         /* Unlock indirect block */
-        if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC2__NO_FLAGS_SET, did_protect) < 0)
+        if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
         iblock = NULL;
     } /* end else */
@@ -327,7 +327,7 @@ H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
 
 done:
     /* Unlock direct block */
-    if(dblock && H5AC2_unprotect(hdr->f, dxpl_id, H5AC2_FHEAP_DBLOCK, dblock_addr, (size_t)0, dblock, dblock_cache_flags) < 0)
+    if(dblock && H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, (size_t)0, dblock, dblock_cache_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -506,7 +506,7 @@ H5HF_man_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id)
     } /* end if */
     else {
         /* Look up indirect block containing direct block */
-        if(H5HF_man_dblock_locate(hdr, dxpl_id, obj_off, &iblock, &dblock_entry, &did_protect, H5AC2_WRITE) < 0)
+        if(H5HF_man_dblock_locate(hdr, dxpl_id, obj_off, &iblock, &dblock_entry, &did_protect, H5AC_WRITE) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPUTE, FAIL, "can't compute row & column of section")
 
         /* Check for offset of invalid direct block */
@@ -541,7 +541,7 @@ H5HF_man_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id)
 
     /* Unlock indirect block */
     if(iblock) {
-        if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC2__NO_FLAGS_SET, did_protect) < 0)
+        if(H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
         iblock = NULL;
     } /* end if */
@@ -560,7 +560,7 @@ H5HF_man_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id)
 done:
     if(ret_value < 0) {
         /* Unlock indirect block */
-        if(iblock && H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC2__NO_FLAGS_SET, did_protect) < 0)
+        if(iblock && H5HF_man_iblock_unprotect(iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
             HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
     } /* end if */
 
diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h
index 74324ef..41a8ffc 100644
--- a/src/H5HFpkg.h
+++ b/src/H5HFpkg.h
@@ -32,7 +32,7 @@
 #include "H5HFprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5B2private.h"	/* v2 B-trees				*/
 #include "H5FLprivate.h"	/* Free Lists                           */
 #include "H5FSprivate.h"	/* File free space                      */
@@ -360,7 +360,7 @@ typedef struct H5HF_free_section_t {
  */
 typedef struct H5HF_hdr_t {
     /* Information for H5AC cache functions, _must_ be first field in structure */
-    H5AC2_info_t cache_info;
+    H5AC_info_t cache_info;
 
     /* General header information (stored in header) */
     unsigned    id_len;         /* Size of heap IDs (in bytes) */
@@ -405,7 +405,7 @@ typedef struct H5HF_hdr_t {
     hbool_t     dirty;          /* Shared info is modified */
     haddr_t     heap_addr;      /* Address of heap header in the file */
     size_t      heap_size;      /* Size of heap header in the file */
-    H5AC2_protect_t mode;        /* Access mode for heap */
+    H5AC_protect_t mode;        /* Access mode for heap */
     H5F_t      *f;              /* Pointer to file for heap */
     size_t      file_rc;        /* Reference count of files using heap header */
     hbool_t     pending_delete; /* Heap is pending deletion */
@@ -439,7 +439,7 @@ typedef struct H5HF_indirect_filt_ent_t {
 /* Fractal heap indirect block */
 struct H5HF_indirect_t {
     /* Information for H5AC cache functions, _must_ be first field in structure */
-    H5AC2_info_t cache_info;
+    H5AC_info_t cache_info;
 
     /* Internal heap information (not stored) */
     size_t      rc;             /* Reference count of objects using this block */
@@ -463,7 +463,7 @@ struct H5HF_indirect_t {
 /* A fractal heap direct block */
 typedef struct H5HF_direct_t {
     /* Information for H5AC cache functions, _must_ be first field in structure */
-    H5AC2_info_t cache_info;
+    H5AC_info_t cache_info;
 
     /* Internal heap information */
     H5HF_hdr_t	*hdr;	        /* Shared heap header info	              */
@@ -568,13 +568,13 @@ typedef struct H5HF_dblock_cache_ud_t {
 /*****************************/
 
 /* H5HF header inherits cache-like properties from H5AC */
-H5_DLLVAR const H5AC2_class_t H5AC2_FHEAP_HDR[1];
+H5_DLLVAR const H5AC_class_t H5AC_FHEAP_HDR[1];
 
 /* H5HF indirect block inherits cache-like properties from H5AC */
-H5_DLLVAR const H5AC2_class_t H5AC2_FHEAP_IBLOCK[1];
+H5_DLLVAR const H5AC_class_t H5AC_FHEAP_IBLOCK[1];
 
 /* H5HF direct block inherits cache-like properties from H5AC */
-H5_DLLVAR const H5AC2_class_t H5AC2_FHEAP_DBLOCK[1];
+H5_DLLVAR const H5AC_class_t H5AC_FHEAP_DBLOCK[1];
 
 /* The v2 B-tree class for tracking indirectly accessed 'huge' objects */
 H5_DLLVAR const H5B2_class_t H5HF_BT2_INDIR[1];
@@ -679,7 +679,7 @@ H5_DLL herr_t H5HF_man_iblock_create(H5HF_hdr_t *hdr, hid_t dxpl_id,
 H5_DLL H5HF_indirect_t *H5HF_man_iblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id,
     haddr_t iblock_addr, unsigned iblock_nrows,
     H5HF_indirect_t *par_iblock, unsigned par_entry, hbool_t must_protect,
-    H5AC2_protect_t rw, hbool_t *did_protect);
+    H5AC_protect_t rw, hbool_t *did_protect);
 H5_DLL herr_t H5HF_man_iblock_unprotect(H5HF_indirect_t *iblock, hid_t dxpl_id,
     unsigned cache_flags, hbool_t did_protect);
 H5_DLL herr_t H5HF_man_iblock_attach(H5HF_indirect_t *iblock, unsigned entry,
@@ -705,10 +705,10 @@ H5_DLL herr_t H5HF_man_dblock_destroy(H5HF_hdr_t *hdr, hid_t dxpl_id,
 H5_DLL H5HF_direct_t *H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id,
     haddr_t dblock_addr, size_t dblock_size,
     H5HF_indirect_t *par_iblock, unsigned par_entry,
-    H5AC2_protect_t rw);
+    H5AC_protect_t rw);
 H5_DLL herr_t H5HF_man_dblock_locate(H5HF_hdr_t *hdr, hid_t dxpl_id,
     hsize_t obj_off, H5HF_indirect_t **par_iblock,
-    unsigned *par_entry, hbool_t *par_did_protect, H5AC2_protect_t rw);
+    unsigned *par_entry, hbool_t *par_did_protect, H5AC_protect_t rw);
 H5_DLL herr_t H5HF_man_dblock_delete(H5F_t *f, hid_t dxpl_id, haddr_t dblock_addr,
     hsize_t dblock_size);
 H5_DLL herr_t H5HF_man_dblock_dest(H5HF_direct_t *dblock);
diff --git a/src/H5HFsection.c b/src/H5HFsection.c
index fd75a3b..680487c 100644
--- a/src/H5HFsection.c
+++ b/src/H5HFsection.c
@@ -561,7 +561,7 @@ H5HF_sect_single_locate_parent(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t refresh,
     HDassert(sect);
 
     /* Look up indirect block containing direct blocks for range */
-    if(H5HF_man_dblock_locate(hdr, dxpl_id, sect->sect_info.addr, &sec_iblock, &sec_entry, &did_protect, H5AC2_READ) < 0)
+    if(H5HF_man_dblock_locate(hdr, dxpl_id, sect->sect_info.addr, &sec_iblock, &sec_entry, &did_protect, H5AC_READ) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPUTE, FAIL, "can't compute row & column of section")
 
     /* Increment reference count on indirect block that free section is in */
@@ -582,7 +582,7 @@ H5HF_sect_single_locate_parent(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t refresh,
     sect->u.single.par_entry = sec_entry;
 
     /* Unlock indirect block */
-    if(H5HF_man_iblock_unprotect(sec_iblock, dxpl_id, H5AC2__NO_FLAGS_SET, did_protect) < 0)
+    if(H5HF_man_iblock_unprotect(sec_iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
     sec_iblock = NULL;
 
@@ -821,7 +821,7 @@ H5HF_sect_single_full_dblock(H5HF_hdr_t *hdr, hid_t dxpl_id,
             hdr->man_dtable.curr_root_rows > 0) {
         H5HF_direct_t *dblock;          /* Pointer to direct block for section */
 
-        if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, sect->u.single.parent, sect->u.single.par_entry, H5AC2_WRITE)))
+        if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr, dblock_size, sect->u.single.parent, sect->u.single.par_entry, H5AC_WRITE)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load fractal heap direct block")
         HDassert(H5F_addr_eq(dblock->block_off + dblock_overhead, sect->sect_info.addr));
 
@@ -1139,7 +1139,7 @@ H5HF_sect_single_shrink(H5FS_section_info_t **_sect, void UNUSED *_udata)
     /* (should be a root direct block) */
     HDassert(dblock_addr == hdr->man_dtable.table_addr);
     if(NULL == (dblock = H5HF_man_dblock_protect(hdr, dxpl_id, dblock_addr,
-            dblock_size, (*sect)->u.single.parent, (*sect)->u.single.par_entry, H5AC2_WRITE)))
+            dblock_size, (*sect)->u.single.parent, (*sect)->u.single.par_entry, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load fractal heap direct block")
     HDassert(H5F_addr_eq(dblock->block_off + dblock_size, (*sect)->sect_info.addr + (*sect)->sect_info.size));
 
@@ -1242,7 +1242,7 @@ H5HF_sect_single_valid(const H5FS_section_class_t UNUSED *cls, const H5FS_sectio
 
             /* Retrieve direct block address from section */
             /* (Casting away const OK - QAK) */
-            status = H5HF_sect_single_dblock_info(iblock->hdr, H5AC2_dxpl_id, (H5HF_free_section_t *)sect, &dblock_addr, &dblock_size);
+            status = H5HF_sect_single_dblock_info(iblock->hdr, H5AC_dxpl_id, (H5HF_free_section_t *)sect, &dblock_addr, &dblock_size);
             HDassert(status >= 0);
             HDassert(H5F_addr_eq(iblock->ents[sect->u.single.par_entry].addr, dblock_addr));
             HDassert(dblock_size > 0);
@@ -1255,18 +1255,18 @@ H5HF_sect_single_valid(const H5FS_section_class_t UNUSED *cls, const H5FS_sectio
             HDassert((sect->sect_info.size + dblock_overhead) < dblock_size);
 
             /* Check the direct block's status in the metadata cache */
-            status = H5AC2_get_entry_status(iblock->hdr->f, dblock_addr, &dblock_status);
+            status = H5AC_get_entry_status(iblock->hdr->f, dblock_addr, &dblock_status);
             HDassert(status >= 0);
 
             /* If the direct block for the section isn't already protected,
              *  protect it here in order to check single section's sanity
              *  against it.
              */
-            if(!(dblock_status & H5AC2_ES__IS_PROTECTED)) {
+            if(!(dblock_status & H5AC_ES__IS_PROTECTED)) {
                 H5HF_direct_t *dblock;      /* Direct block for section */
 
                 /* Protect the direct block for the section */
-                dblock = H5HF_man_dblock_protect(iblock->hdr, H5AC2_dxpl_id, dblock_addr, dblock_size, iblock, sect->u.single.par_entry, H5AC2_READ);
+                dblock = H5HF_man_dblock_protect(iblock->hdr, H5AC_dxpl_id, dblock_addr, dblock_size, iblock, sect->u.single.par_entry, H5AC_READ);
                 HDassert(dblock);
 
                 /* Sanity check settings for section */
@@ -1277,7 +1277,7 @@ H5HF_sect_single_valid(const H5FS_section_class_t UNUSED *cls, const H5FS_sectio
                         (sect->sect_info.addr + sect->sect_info.size)));
 
                 /* Release direct block */
-                status = H5AC2_unprotect(iblock->hdr->f, H5AC2_dxpl_id, H5AC2_FHEAP_DBLOCK, dblock_addr, (size_t)0, dblock, H5AC2__NO_FLAGS_SET);
+                status = H5AC_unprotect(iblock->hdr->f, H5AC_dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, (size_t)0, dblock, H5AC__NO_FLAGS_SET);
                 HDassert(status >= 0);
             } /* end if */
         } /* end if */
@@ -2588,7 +2588,7 @@ H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id,
 
                     /* If the child indirect block's address is defined, protect it */
                     if(H5F_addr_defined(child_iblock_addr)) {
-                        if(NULL == (child_iblock = H5HF_man_iblock_protect(hdr, dxpl_id, child_iblock_addr, child_nrows, sect->u.indirect.u.iblock, curr_entry, FALSE, H5AC2_WRITE, &did_protect)))
+                        if(NULL == (child_iblock = H5HF_man_iblock_protect(hdr, dxpl_id, child_iblock_addr, child_nrows, sect->u.indirect.u.iblock, curr_entry, FALSE, H5AC_WRITE, &did_protect)))
                             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
                     } /* end if */
                     else
@@ -2611,7 +2611,7 @@ H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id,
                 /* If we have a valid child indirect block, release it now */
                 /* (will be pinned, if rows reference it) */
                 if(child_iblock)
-                    if(H5HF_man_iblock_unprotect(child_iblock, dxpl_id, H5AC2__NO_FLAGS_SET, did_protect) < 0)
+                    if(H5HF_man_iblock_unprotect(child_iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
 
                 /* Attach child section to this section */
@@ -2816,7 +2816,7 @@ H5HF_sect_indirect_revive_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
     HDassert(sect->sect_info.state == H5FS_SECT_SERIALIZED);
 
     /* Look up indirect block containing indirect blocks for section */
-    if(H5HF_man_dblock_locate(hdr, dxpl_id, sect->sect_info.addr, &sec_iblock, NULL, &did_protect, H5AC2_READ) < 0)
+    if(H5HF_man_dblock_locate(hdr, dxpl_id, sect->sect_info.addr, &sec_iblock, NULL, &did_protect, H5AC_READ) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPUTE, FAIL, "can't compute row & column of section")
 
     /* Increment reference count on indirect block that free section is in */
@@ -2831,7 +2831,7 @@ H5HF_sect_indirect_revive_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
             sect->u.indirect.u.iblock->max_rows;
 
     /* Unlock indirect block */
-    if(H5HF_man_iblock_unprotect(sec_iblock, dxpl_id, H5AC2__NO_FLAGS_SET, did_protect) < 0)
+    if(H5HF_man_iblock_unprotect(sec_iblock, dxpl_id, H5AC__NO_FLAGS_SET, did_protect) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
     sec_iblock = NULL;
 
diff --git a/src/H5HG.c b/src/H5HG.c
index 50b71eb..4f495f1 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -230,7 +230,7 @@ HDmemset(heap->chunk, 0, size);
     }
 
     /* Add the heap to the cache */
-    if(H5AC2_set(f, dxpl_id, H5AC2_GHEAP, addr, (size_t)size, heap, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(f, dxpl_id, H5AC_GHEAP, addr, (size_t)size, heap, H5AC__NO_FLAGS_SET) < 0)
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, HADDR_UNDEF, "unable to cache global heap collection")
 
     ret_value = addr;
@@ -357,7 +357,7 @@ H5HG_alloc (H5F_t *f, H5HG_heap_t *heap, size_t size, unsigned * heap_flags_ptr)
     }
 
     /* Mark the heap as dirty */
-    *heap_flags_ptr |= H5AC2__DIRTIED_FLAG;
+    *heap_flags_ptr |= H5AC__DIRTIED_FLAG;
 
     /* Set the return value */
     ret_value=idx;
@@ -386,7 +386,7 @@ done:
  *
  *		John Mainzer, 6/8/05
  *		Modified the function to use the new dirtied parameter of
- *		of H5AC2_unprotect() instead of modifying the is_dirty
+ *		of H5AC_unprotect() instead of modifying the is_dirty
  *		field of the cache info.
  *
  *		In this case, that required adding the new heap_dirtied_ptr
@@ -460,7 +460,7 @@ HDmemset(new_chunk + heap->size, 0, need);
     assert(H5HG_ISALIGNED(heap->obj[0].size));
 
     /* Mark the heap as dirty */
-    *heap_flags_ptr |= H5AC2__DIRTIED_FLAG;
+    *heap_flags_ptr |= H5AC__DIRTIED_FLAG;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -497,7 +497,7 @@ H5HG_insert(H5F_t *f, hid_t dxpl_id, size_t size, void *obj, H5HG_t *hobj/*out*/
     size_t	idx;
     haddr_t	addr = HADDR_UNDEF;
     H5HG_heap_t	*heap = NULL;
-    unsigned 	heap_flags = H5AC2__NO_FLAGS_SET;
+    unsigned 	heap_flags = H5AC__NO_FLAGS_SET;
     hbool_t     found = FALSE;          /* Flag to indicate a heap with enough space was found */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
@@ -591,7 +591,7 @@ H5HG_insert(H5F_t *f, hid_t dxpl_id, size_t size, void *obj, H5HG_t *hobj/*out*/
         } /* end if */
     } /* end else */
     HDassert(H5F_addr_defined(addr));
-    if(NULL == (heap = (H5HG_heap_t *)H5AC2_protect(f, dxpl_id, H5AC2_GHEAP, addr, (size_t)H5HG_SPEC_READ_SIZE, f, H5AC2_WRITE)))
+    if(NULL == (heap = (H5HG_heap_t *)H5AC_protect(f, dxpl_id, H5AC_GHEAP, addr, (size_t)H5HG_SPEC_READ_SIZE, f, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load heap")
 
     /* Split the free space to make room for the new object */
@@ -606,14 +606,14 @@ H5HG_insert(H5F_t *f, hid_t dxpl_id, size_t size, void *obj, H5HG_t *hobj/*out*/
                  need - (H5HG_SIZEOF_OBJHDR(f) + size));
 #endif /* OLD_WAY */
     } /* end if */
-    heap_flags |= H5AC2__DIRTIED_FLAG;
+    heap_flags |= H5AC__DIRTIED_FLAG;
 
     /* Return value */
     hobj->addr = heap->addr;
     hobj->idx = idx;
 
 done:
-    if(heap && H5AC2_unprotect(f, dxpl_id, H5AC2_GHEAP, heap->addr, (size_t)0, heap, heap_flags) < 0)
+    if(heap && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, heap->addr, (size_t)0, heap, heap_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to unprotect heap.")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -653,7 +653,7 @@ H5HG_read(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj, void *object/*out*/,
     HDassert(hobj);
 
     /* Load the heap */
-    if(NULL == (heap = (H5HG_heap_t *)H5AC2_protect(f, dxpl_id, H5AC2_GHEAP, hobj->addr, (size_t)H5HG_SPEC_READ_SIZE, f, H5AC2_READ)))
+    if(NULL == (heap = (H5HG_heap_t *)H5AC_protect(f, dxpl_id, H5AC_GHEAP, hobj->addr, (size_t)H5HG_SPEC_READ_SIZE, f, H5AC_READ)))
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "unable to load heap")
 
     HDassert(hobj->idx < heap->nused);
@@ -667,7 +667,7 @@ H5HG_read(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj, void *object/*out*/,
 
     /*
      * Advance the heap in the CWFS list. We might have done this already
-     * with the H5AC2_protect(), but it won't hurt to do it twice.
+     * with the H5AC_protect(), but it won't hurt to do it twice.
      */
     if(heap->obj[0].begin) {
         int	i;
@@ -690,7 +690,7 @@ H5HG_read(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj, void *object/*out*/,
     ret_value = object;
 
 done:
-    if(heap && H5AC2_unprotect(f, dxpl_id, H5AC2_GHEAP, hobj->addr, (size_t)0, heap, H5AC2__NO_FLAGS_SET) < 0)
+    if(heap && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, hobj->addr, (size_t)0, heap, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, NULL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -717,7 +717,7 @@ done:
  *
  *		John Mainzer - 6/8/05
  *		Modified function to use the dirtied parameter of
- *		H5AC2_unprotect() instead of modifying the is_dirty
+ *		H5AC_unprotect() instead of modifying the is_dirty
  *		field of the cache info.
  *
  *-------------------------------------------------------------------------
@@ -726,7 +726,7 @@ int
 H5HG_link (H5F_t *f, hid_t dxpl_id, const H5HG_t *hobj, int adjust)
 {
     H5HG_heap_t *heap = NULL;
-    unsigned heap_flags = H5AC2__NO_FLAGS_SET;
+    unsigned heap_flags = H5AC__NO_FLAGS_SET;
     int ret_value;              /* Return value */
 
     FUNC_ENTER_NOAPI(H5HG_link, FAIL);
@@ -739,7 +739,7 @@ H5HG_link (H5F_t *f, hid_t dxpl_id, const H5HG_t *hobj, int adjust)
 
     if(adjust!=0) {
         /* Load the heap */
-        if (NULL == (heap = (H5HG_heap_t *)H5AC2_protect(f, dxpl_id, H5AC2_GHEAP, hobj->addr, (size_t)H5HG_SPEC_READ_SIZE, f, H5AC2_WRITE)))
+        if (NULL == (heap = (H5HG_heap_t *)H5AC_protect(f, dxpl_id, H5AC_GHEAP, hobj->addr, (size_t)H5HG_SPEC_READ_SIZE, f, H5AC_WRITE)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load heap")
 
         assert (hobj->idx<heap->nused);
@@ -749,14 +749,14 @@ H5HG_link (H5F_t *f, hid_t dxpl_id, const H5HG_t *hobj, int adjust)
         if (heap->obj[hobj->idx].nrefs+adjust>H5HG_MAXLINK)
             HGOTO_ERROR (H5E_HEAP, H5E_BADVALUE, FAIL, "new link count would be out of range")
         heap->obj[hobj->idx].nrefs += adjust;
-        heap_flags |= H5AC2__DIRTIED_FLAG;
+        heap_flags |= H5AC__DIRTIED_FLAG;
     } /* end if */
 
     /* Set return value */
     ret_value=heap->obj[hobj->idx].nrefs;
 
 done:
-    if(heap && H5AC2_unprotect(f, dxpl_id, H5AC2_GHEAP, hobj->addr, (size_t)0, heap, heap_flags) < 0)
+    if(heap && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, hobj->addr, (size_t)0, heap, heap_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value);
@@ -777,7 +777,7 @@ done:
  *
  *		John Mainzer - 6/8/05
  *		Modified function to use the dirtied parameter of
- *		H5AC2_unprotect() instead of modifying the is_dirty
+ *		H5AC_unprotect() instead of modifying the is_dirty
  *		field of the cache info.
  *
  *-------------------------------------------------------------------------
@@ -789,7 +789,7 @@ H5HG_remove (H5F_t *f, hid_t dxpl_id, H5HG_t *hobj)
     uint8_t	*p = NULL, *obj_start = NULL;
     size_t	need;
     unsigned	u;
-    unsigned    flags = H5AC2__NO_FLAGS_SET;/* Whether the heap gets deleted */
+    unsigned    flags = H5AC__NO_FLAGS_SET;/* Whether the heap gets deleted */
     herr_t      ret_value = SUCCEED;       /* Return value */
 
     FUNC_ENTER_NOAPI(H5HG_remove, FAIL);
@@ -801,7 +801,7 @@ H5HG_remove (H5F_t *f, hid_t dxpl_id, H5HG_t *hobj)
         HGOTO_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "no write intent on file")
 
     /* Load the heap */
-    if(NULL == (heap = (H5HG_heap_t *)H5AC2_protect(f, dxpl_id, H5AC2_GHEAP, hobj->addr, (size_t)H5HG_SPEC_READ_SIZE, f, H5AC2_WRITE)))
+    if(NULL == (heap = (H5HG_heap_t *)H5AC_protect(f, dxpl_id, H5AC_GHEAP, hobj->addr, (size_t)H5HG_SPEC_READ_SIZE, f, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load heap")
 
     HDassert(hobj->idx < heap->nused);
@@ -831,7 +831,7 @@ H5HG_remove (H5F_t *f, hid_t dxpl_id, H5HG_t *hobj)
         H5F_ENCODE_LENGTH (f, p, heap->obj[0].size);
     } /* end if */
     HDmemset(heap->obj + hobj->idx, 0, sizeof(H5HG_obj_t));
-    flags |= H5AC2__DIRTIED_FLAG;
+    flags |= H5AC__DIRTIED_FLAG;
 
     if((heap->obj[0].size + H5HG_SIZEOF_HDR(f)) == heap->size) {
         /*
@@ -840,14 +840,14 @@ H5HG_remove (H5F_t *f, hid_t dxpl_id, H5HG_t *hobj)
          */
         H5_CHECK_OVERFLOW(heap->size, size_t, hsize_t);
         H5MF_xfree(f, H5FD_MEM_GHEAP, dxpl_id, heap->addr, (hsize_t)heap->size);
-        flags |= H5AC2__DELETED_FLAG; /* Indicate that the object was deleted, for the unprotect call */
+        flags |= H5AC__DELETED_FLAG; /* Indicate that the object was deleted, for the unprotect call */
     } /* end if */
     else {
         int	i;              /* Local index variable */
 
         /*
          * If the heap is in the CWFS list then advance it one position.  The
-         * H5AC2_protect() might have done that too, but that's okay.  If the
+         * H5AC_protect() might have done that too, but that's okay.  If the
          * heap isn't on the CWFS list then add it to the end.
          */
         for(i = 0; i < f->shared->ncwfs; i++)
@@ -865,7 +865,7 @@ H5HG_remove (H5F_t *f, hid_t dxpl_id, H5HG_t *hobj)
     } /* end else */
 
 done:
-    if(heap && H5AC2_unprotect(f, dxpl_id, H5AC2_GHEAP, hobj->addr, (size_t)0, heap, flags) < 0)
+    if(heap && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, hobj->addr, (size_t)0, heap, flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value);
diff --git a/src/H5HGcache.c b/src/H5HGcache.c
index 9938c32..c99f97c 100755
--- a/src/H5HGcache.c
+++ b/src/H5HGcache.c
@@ -76,10 +76,10 @@ static herr_t H5HG_free_icr(haddr_t addr, size_t len, void *thing);
 /*********************/
 
 /*
- * H5HG inherits cache-like properties from H5AC2
+ * H5HG inherits cache-like properties from H5AC
  */
-const H5AC2_class_t H5AC2_GHEAP[1] = {{
-    H5AC2_GHEAP_ID,
+const H5AC_class_t H5AC_GHEAP[1] = {{
+    H5AC_GHEAP_ID,
     "global heap",
     H5FD_MEM_GHEAP,
     H5HG_deserialize,
@@ -329,7 +329,7 @@ H5HG_serialize(const H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr,
         *new_len = heap->size;
 
         /* specify in flags that image has been resized */
-        *flags = H5AC2__SERIALIZE_RESIZED_FLAG;
+        *flags = H5AC__SERIALIZE_RESIZED_FLAG;
     } /* end if */
     else {
         /* copy the heap->chunk into the image buffer */
diff --git a/src/H5HGdbg.c b/src/H5HGdbg.c
index 91e0f1e..22b6008d 100644
--- a/src/H5HGdbg.c
+++ b/src/H5HGdbg.c
@@ -22,7 +22,7 @@
 
 
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Eprivate.h"		/* Error handling		        */
 #include "H5HGpkg.h"		/* Global heaps				*/
 #include "H5Iprivate.h"		/* ID Functions		                */
@@ -48,7 +48,7 @@
  *
  *              John Mainzer, 6/17/05
  *              Modified the function to use the new dirtied parameter of
- *              of H5AC2_unprotect() instead of modifying the is_dirty
+ *              of H5AC_unprotect() instead of modifying the is_dirty
  *              field of the cache info.
  *
  *-------------------------------------------------------------------------
@@ -73,7 +73,7 @@ H5HG_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     assert(indent >= 0);
     assert(fwidth >= 0);
 
-    if (NULL == (h = (H5HG_heap_t *)H5AC2_protect(f, dxpl_id, H5AC2_GHEAP, addr, fwidth, f, H5AC2_READ)))
+    if (NULL == (h = (H5HG_heap_t *)H5AC_protect(f, dxpl_id, H5AC_GHEAP, addr, fwidth, f, H5AC_READ)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load global heap collection");
 
     fprintf(stream, "%*sGlobal Heap Collection...\n", indent, "");
@@ -135,7 +135,7 @@ H5HG_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     }
 
 done:
-    if (h && H5AC2_unprotect(f, dxpl_id, H5AC2_GHEAP, addr, (size_t)0, h, H5AC2__NO_FLAGS_SET) < 0)
+    if (h && H5AC_unprotect(f, dxpl_id, H5AC_GHEAP, addr, (size_t)0, h, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_PROTECT, FAIL, "unable to release object header");
 
     FUNC_LEAVE_NOAPI(ret_value);
diff --git a/src/H5HGpkg.h b/src/H5HGpkg.h
index 0e34d57..d83d618 100644
--- a/src/H5HGpkg.h
+++ b/src/H5HGpkg.h
@@ -32,7 +32,7 @@
 #include "H5HGprivate.h"
 
 /* Other private headers needed by this file */
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5FLprivate.h"	/* Free lists                           */
 
 #define H5F_PACKAGE
@@ -43,7 +43,7 @@
 /*****************************/
 
 /* The cache subclass */
-H5_DLLVAR const H5AC2_class_t H5AC2_GHEAP[1];
+H5_DLLVAR const H5AC_class_t H5AC_GHEAP[1];
 
 /* Declare extern the free list to manage the H5HG_t struct */
 H5FL_EXTERN(H5HG_heap_t);
@@ -132,7 +132,7 @@ typedef struct H5HG_obj_t {
 } H5HG_obj_t;
 
 struct H5HG_heap_t {
-    H5AC2_info_t cache_info; /* Information for H5AC2 cache functions, _must_ be */
+    H5AC_info_t cache_info; /* Information for H5AC cache functions, _must_ be */
                             /* first field in structure */
     haddr_t		addr;		/*collection address		*/
     size_t		size;		/*total size of collection	*/
diff --git a/src/H5HL.c b/src/H5HL.c
index bcb62eb..5090c4d 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -169,7 +169,7 @@ H5HL_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, haddr_t *addr_p/*out*/)
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed")
 
     /* Add to cache */
-    if(H5AC2_set(f, dxpl_id, H5AC2_LHEAP_PRFX, heap->prfx_addr, (size_t)total_size, prfx, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(f, dxpl_id, H5AC_LHEAP_PRFX, heap->prfx_addr, (size_t)total_size, prfx, H5AC__NO_FLAGS_SET) < 0)
 	HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "unable to cache local heap prefix")
 
     /* Set address to return */
@@ -244,7 +244,7 @@ H5HL_dblk_realloc(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t new_heap_size)
             HDassert(heap->prfx);
 
             /* Resize the heap prefix in the cache */
-            if(H5AC2_resize_pinned_entry(heap->prfx, (size_t)(heap->prfx_size + new_heap_size)) < 0)
+            if(H5AC_resize_pinned_entry(heap->prfx, (size_t)(heap->prfx_size + new_heap_size)) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize heap in cache")
         } /* end if */
         else {
@@ -253,7 +253,7 @@ H5HL_dblk_realloc(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t new_heap_size)
             HDassert(heap->dblk);
 
             /* Resize the heap data block in the cache */
-            if(H5AC2_resize_pinned_entry(heap->dblk, (size_t)new_heap_size) < 0)
+            if(H5AC_resize_pinned_entry(heap->dblk, (size_t)new_heap_size) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize heap in cache")
         } /* end else */
     } /* end if */
@@ -266,11 +266,11 @@ H5HL_dblk_realloc(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t new_heap_size)
 
             /* Resize current heap prefix */
             heap->prfx_size = H5HL_SIZEOF_HDR(f);
-            if(H5AC2_resize_pinned_entry(heap->prfx, (size_t)heap->prfx_size) < 0)
+            if(H5AC_resize_pinned_entry(heap->prfx, (size_t)heap->prfx_size) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize heap prefix in cache")
 
             /* Insert data block into cache (pinned) */
-            if(H5AC2_set(f, dxpl_id, H5AC2_LHEAP_DBLK, new_addr, (size_t)new_heap_size, dblk, H5AC2__PIN_ENTRY_FLAG) < 0)
+            if(H5AC_set(f, dxpl_id, H5AC_LHEAP_DBLK, new_addr, (size_t)new_heap_size, dblk, H5AC__PIN_ENTRY_FLAG) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "unable to cache local heap data block")
             dblk = NULL;
 
@@ -282,11 +282,11 @@ H5HL_dblk_realloc(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t new_heap_size)
             /* (ignore [unlikely] case where heap data block ends up
              *      contiguous w/heap prefix again.
              */
-            if(H5AC2_resize_pinned_entry(heap->dblk, (size_t)new_heap_size) < 0)
+            if(H5AC_resize_pinned_entry(heap->dblk, (size_t)new_heap_size) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize heap data block in cache")
 
             /* Relocate the heap data block in the cache */
-            if(H5AC2_rename(f, H5AC2_LHEAP_DBLK, old_addr, new_addr) < 0)
+            if(H5AC_rename(f, H5AC_LHEAP_DBLK, old_addr, new_addr) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTRENAME, FAIL, "unable to move heap data block in cache")
         } /* end else */
     } /* end else */
@@ -425,7 +425,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:    H5HL_protect
  *
- * Purpose:     This function is a wrapper for the H5AC2_protect call.
+ * Purpose:     This function is a wrapper for the H5AC_protect call.
  *
  * Return:      Success:    Non-NULL pointer to the local heap prefix.
  *              Failure:    NULL
@@ -437,14 +437,14 @@ done:
  *-------------------------------------------------------------------------
  */
 H5HL_t *
-H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC2_protect_t rw)
+H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw)
 {
     H5HL_cache_prfx_ud_t prfx_udata; /* User data for protecting local heap prefix */
     H5HL_prfx_t *prfx = NULL;   /* Local heap prefix */
     H5HL_dblk_t *dblk = NULL;   /* Local heap data block */
     H5HL_t *heap;               /* Heap data structure */
-    unsigned prfx_cache_flags = H5AC2__NO_FLAGS_SET;         /* Cache flags for unprotecting prefix entry */
-    unsigned dblk_cache_flags = H5AC2__NO_FLAGS_SET;         /* Cache flags for unprotecting data block entry */
+    unsigned prfx_cache_flags = H5AC__NO_FLAGS_SET;         /* Cache flags for unprotecting prefix entry */
+    unsigned dblk_cache_flags = H5AC__NO_FLAGS_SET;         /* Cache flags for unprotecting data block entry */
     H5HL_t *ret_value;          /* Return value */
 
     FUNC_ENTER_NOAPI(H5HL_protect, NULL)
@@ -462,7 +462,7 @@ H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC2_protect_t rw)
     prfx_udata.free_block = H5HL_FREE_NULL;
 
     /* Protect the local heap prefix */
-    if(NULL == (prfx = (H5HL_prfx_t *)H5AC2_protect(f, dxpl_id, H5AC2_LHEAP_PRFX, addr, H5HL_SPEC_READ_SIZE, &prfx_udata, rw)))
+    if(NULL == (prfx = (H5HL_prfx_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_PRFX, addr, H5HL_SPEC_READ_SIZE, &prfx_udata, rw)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to load heap prefix")
 
     /* Get the pointer to the heap */
@@ -474,7 +474,7 @@ H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC2_protect_t rw)
         /* Check if heap has separate data block */
         if(heap->single_cache_obj) {
             /* Set the flag for pinning the prefix when unprotecting it */
-            prfx_cache_flags |= H5AC2__PIN_ENTRY_FLAG;
+            prfx_cache_flags |= H5AC__PIN_ENTRY_FLAG;
         } /* end if */
         else {
             H5HL_cache_dblk_ud_t dblk_udata; /* User data for protecting local heap data block */
@@ -486,15 +486,15 @@ H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC2_protect_t rw)
             dblk_udata.loaded = FALSE;
 
             /* Protect the local heap data block */
-            if(NULL == (dblk = (H5HL_dblk_t *)H5AC2_protect(f, dxpl_id, H5AC2_LHEAP_DBLK, heap->dblk_addr, heap->dblk_size, &dblk_udata, rw)))
+            if(NULL == (dblk = (H5HL_dblk_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_DBLK, heap->dblk_addr, heap->dblk_size, &dblk_udata, rw)))
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to load heap data block")
 
             /* Pin the prefix, if the data block was loaded from file */
             if(dblk_udata.loaded)
-                prfx_cache_flags |= H5AC2__PIN_ENTRY_FLAG;
+                prfx_cache_flags |= H5AC__PIN_ENTRY_FLAG;
 
             /* Set the flag for pinning the data block when unprotecting it */
-            dblk_cache_flags |= H5AC2__PIN_ENTRY_FLAG;
+            dblk_cache_flags |= H5AC__PIN_ENTRY_FLAG;
         } /* end if */
     } /* end if */
 
@@ -506,11 +506,11 @@ H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC2_protect_t rw)
 
 done:
     /* Release the prefix from the cache, now pinned */
-    if(prfx && H5AC2_unprotect(f, dxpl_id, H5AC2_LHEAP_PRFX, heap->prfx_addr, (size_t)0, prfx, prfx_cache_flags) < 0)
+    if(prfx && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_PRFX, heap->prfx_addr, (size_t)0, prfx, prfx_cache_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, NULL, "unable to release local heap prefix")
 
     /* Release the data block from the cache, now pinned */
-    if(dblk && H5AC2_unprotect(f, dxpl_id, H5AC2_LHEAP_DBLK, heap->dblk_addr, (size_t)0, dblk, dblk_cache_flags) < 0)
+    if(dblk && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_DBLK, heap->dblk_addr, (size_t)0, dblk, dblk_cache_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, NULL, "unable to release local heap data block")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -581,7 +581,7 @@ H5HL_unprotect(H5HL_t *heap)
         /* Check for separate heap data block */
         if(heap->single_cache_obj) {
             /* Mark local heap prefix as evictable again */
-            if(H5AC2_unpin_entry(heap->prfx) < 0)
+            if(H5AC_unpin_entry(heap->prfx) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPIN, FAIL, "unable to unpin local heap data block")
         } /* end if */
         else {
@@ -590,7 +590,7 @@ H5HL_unprotect(H5HL_t *heap)
 
             /* Mark local heap data block as evictable again */
             /* (data block still pins prefix) */
-            if(H5AC2_unpin_entry(heap->dblk) < 0)
+            if(H5AC_unpin_entry(heap->dblk) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPIN, FAIL, "unable to unpin local heap data block")
         } /* end else */
     } /* end if */
@@ -661,12 +661,12 @@ H5HL_dirty(H5HL_t *heap)
         /* Sanity check */
         HDassert(heap->dblk);
 
-        if(H5AC2_mark_pinned_or_protected_entry_dirty(heap->dblk) < 0)
+        if(H5AC_mark_pinned_or_protected_entry_dirty(heap->dblk) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, FAIL, "unable to mark heap data block as dirty")
     } /* end if */
 
     /* Mark heap prefix as dirty */
-    if(H5AC2_mark_pinned_or_protected_entry_dirty(heap->prfx) < 0)
+    if(H5AC_mark_pinned_or_protected_entry_dirty(heap->prfx) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, FAIL, "unable to mark heap prefix as dirty")
 
 done:
@@ -794,12 +794,12 @@ H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t buf_size, const void *
             /* Check for prefix & data block contiguous */
             if(heap->single_cache_obj) {
                 /* Resize prefix+data block */
-                if(H5AC2_resize_pinned_entry(heap->prfx, (size_t)(heap->prfx_size + new_dblk_size)) < 0)
+                if(H5AC_resize_pinned_entry(heap->prfx, (size_t)(heap->prfx_size + new_dblk_size)) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, UFAIL, "unable to resize heap prefix in cache")
             } /* end if */
             else {
                 /* Resize 'standalone' data block */
-                if(H5AC2_resize_pinned_entry(heap->dblk, (size_t)new_dblk_size) < 0)
+                if(H5AC_resize_pinned_entry(heap->dblk, (size_t)new_dblk_size) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, UFAIL, "unable to resize heap data block in cache")
             } /* end else */
 
@@ -1065,7 +1065,7 @@ H5HL_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
     H5HL_prfx_t *prfx = NULL;   /* Local heap prefix */
     H5HL_dblk_t *dblk = NULL;   /* Local heap data block */
     H5HL_t *heap;               /* Heap data structure */
-    unsigned cache_flags = H5AC2__NO_FLAGS_SET;         /* Cache flags for unprotecting entries */
+    unsigned cache_flags = H5AC__NO_FLAGS_SET;         /* Cache flags for unprotecting entries */
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(H5HL_delete, FAIL)
@@ -1083,7 +1083,7 @@ H5HL_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
     prfx_udata.free_block = H5HL_FREE_NULL;
 
     /* Protect the local heap prefix */
-    if(NULL == (prfx = (H5HL_prfx_t *)H5AC2_protect(f, dxpl_id, H5AC2_LHEAP_PRFX, addr, H5HL_SPEC_READ_SIZE, &prfx_udata, H5AC2_WRITE)))
+    if(NULL == (prfx = (H5HL_prfx_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_PRFX, addr, H5HL_SPEC_READ_SIZE, &prfx_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load heap prefix")
 
     /* Get the pointer to the heap */
@@ -1100,12 +1100,12 @@ H5HL_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
         dblk_udata.loaded = FALSE;
 
         /* Protect the local heap data block */
-        if(NULL == (dblk = (H5HL_dblk_t *)H5AC2_protect(f, dxpl_id, H5AC2_LHEAP_DBLK, heap->dblk_addr, heap->dblk_size, &dblk_udata, H5AC2_WRITE)))
+        if(NULL == (dblk = (H5HL_dblk_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_DBLK, heap->dblk_addr, heap->dblk_size, &dblk_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load heap data block")
 
         /* Pin the prefix, if the data block was loaded from file */
         if(dblk_udata.loaded) {
-            if(H5AC2_pin_protected_entry(prfx) < 0)
+            if(H5AC_pin_protected_entry(prfx) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTPIN, FAIL, "unable to pin local heap prefix")
         } /* end if */
     } /* end if */
@@ -1130,15 +1130,15 @@ H5HL_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
     } /* end else */
 
     /* Set the flags for releasing the prefix and data block */
-    cache_flags |= H5AC2__DIRTIED_FLAG | H5AC2__DELETED_FLAG;
+    cache_flags |= H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG;
 
 done:
     /* Release the data block from the cache, now deleted */
-    if(dblk && H5AC2_unprotect(f, dxpl_id, H5AC2_LHEAP_DBLK, heap->dblk_addr, (size_t)0, dblk, cache_flags) < 0)
+    if(dblk && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_DBLK, heap->dblk_addr, (size_t)0, dblk, cache_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release local heap data block")
 
     /* Release the prefix from the cache, now deleted */
-    if(prfx && H5AC2_unprotect(f, dxpl_id, H5AC2_LHEAP_PRFX, heap->prfx_addr, (size_t)0, prfx, cache_flags) < 0)
+    if(prfx && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_PRFX, heap->prfx_addr, (size_t)0, prfx, cache_flags) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release local heap prefix")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1182,7 +1182,7 @@ H5HL_get_size(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t *size)
     prfx_udata.free_block = H5HL_FREE_NULL;
 
     /* Protect the local heap prefix */
-    if(NULL == (prfx = (H5HL_prfx_t *)H5AC2_protect(f, dxpl_id, H5AC2_LHEAP_PRFX, addr, H5HL_SPEC_READ_SIZE, &prfx_udata, H5AC2_READ)))
+    if(NULL == (prfx = (H5HL_prfx_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_PRFX, addr, H5HL_SPEC_READ_SIZE, &prfx_udata, H5AC_READ)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load heap prefix")
 
     /* Get the pointer to the heap */
@@ -1192,7 +1192,7 @@ H5HL_get_size(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t *size)
     *size = heap->dblk_size;
 
 done:
-    if(prfx && H5AC2_unprotect(f, dxpl_id, H5AC2_LHEAP_PRFX, heap->prfx_addr, (size_t)0, prfx, H5AC2__NO_FLAGS_SET) < 0)
+    if(prfx && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_PRFX, heap->prfx_addr, (size_t)0, prfx, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release local heap prefix")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1236,7 +1236,7 @@ H5HL_heapsize(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *heap_size)
     prfx_udata.free_block = H5HL_FREE_NULL;
 
     /* Protect the local heap prefix */
-    if(NULL == (prfx = (H5HL_prfx_t *)H5AC2_protect(f, dxpl_id, H5AC2_LHEAP_PRFX, addr, H5HL_SPEC_READ_SIZE, &prfx_udata, H5AC2_READ)))
+    if(NULL == (prfx = (H5HL_prfx_t *)H5AC_protect(f, dxpl_id, H5AC_LHEAP_PRFX, addr, H5HL_SPEC_READ_SIZE, &prfx_udata, H5AC_READ)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load heap prefix")
 
     /* Get the pointer to the heap */
@@ -1246,7 +1246,7 @@ H5HL_heapsize(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *heap_size)
     *heap_size += (hsize_t)(heap->prfx_size + heap->dblk_size);
 
 done:
-    if(prfx && H5AC2_unprotect(f, dxpl_id, H5AC2_LHEAP_PRFX, heap->prfx_addr, (size_t)0, prfx, H5AC2__NO_FLAGS_SET) < 0)
+    if(prfx && H5AC_unprotect(f, dxpl_id, H5AC_LHEAP_PRFX, heap->prfx_addr, (size_t)0, prfx, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release local heap prefix")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5HLcache.c b/src/H5HLcache.c
index cf5668f..42f29c9 100644
--- a/src/H5HLcache.c
+++ b/src/H5HLcache.c
@@ -86,10 +86,10 @@ static herr_t H5HL_dblk_free_icr(haddr_t addr, size_t len, void *thing);
 /*********************/
 
 /*
- * H5HL prefix inherits cache-like properties from H5AC2
+ * H5HL prefix inherits cache-like properties from H5AC
  */
-const H5AC2_class_t H5AC2_LHEAP_PRFX[1] = {{
-    H5AC2_LHEAP_PRFX_ID,
+const H5AC_class_t H5AC_LHEAP_PRFX[1] = {{
+    H5AC_LHEAP_PRFX_ID,
     "local heap prefix",
     H5FD_MEM_LHEAP,
     H5HL_prfx_deserialize,
@@ -100,10 +100,10 @@ const H5AC2_class_t H5AC2_LHEAP_PRFX[1] = {{
 }};
 
 /*
- * H5HL data block inherits cache-like properties from H5AC2
+ * H5HL data block inherits cache-like properties from H5AC
  */
-const H5AC2_class_t H5AC2_LHEAP_DBLK[1] = {{
-    H5AC2_LHEAP_DBLK_ID,
+const H5AC_class_t H5AC_LHEAP_DBLK[1] = {{
+    H5AC_LHEAP_DBLK_ID,
     "local heap data block",
     H5FD_MEM_LHEAP,
     H5HL_dblk_deserialize,
diff --git a/src/H5HLdbg.c b/src/H5HLdbg.c
index cb9d070..b8a8d35 100644
--- a/src/H5HLdbg.c
+++ b/src/H5HLdbg.c
@@ -45,7 +45,7 @@
  *
  *              John Mainzer, 6/17/05
  *              Modified the function to use the new dirtied parameter of
- *              of H5AC2_unprotect() instead of modifying the is_dirty
+ *              of H5AC_unprotect() instead of modifying the is_dirty
  *              field of the cache info.
  *
  *-------------------------------------------------------------------------
@@ -69,7 +69,7 @@ H5HL_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent, int
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
-    if(NULL == (h = (H5HL_t *)H5HL_protect(f, dxpl_id, addr, H5AC2_READ)))
+    if(NULL == (h = (H5HL_t *)H5HL_protect(f, dxpl_id, addr, H5AC_READ)))
         HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load heap")
 
     fprintf(stream, "%*sLocal Heap...\n", indent, "");
diff --git a/src/H5HLint.c b/src/H5HLint.c
index 43e3b1f..c6d6839 100644
--- a/src/H5HLint.c
+++ b/src/H5HLint.c
@@ -397,7 +397,7 @@ H5HL_dblk_dest(H5HL_dblk_t *dblk)
         dblk->heap->dblk = NULL;
 
         /* Unpin the local heap prefix */
-        if(H5AC2_unpin_entry(dblk->heap->prfx) < 0)
+        if(H5AC_unpin_entry(dblk->heap->prfx) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPIN, FAIL, "can't unpin local heap prefix")
 
         /* Decrement ref. count on heap data structure */
diff --git a/src/H5HLpkg.h b/src/H5HLpkg.h
index 819ea9d..5faa022 100644
--- a/src/H5HLpkg.h
+++ b/src/H5HLpkg.h
@@ -40,10 +40,10 @@
 /*****************************/
 
 /* The local heap prefix cache subclass */
-H5_DLLVAR const H5AC2_class_t H5AC2_LHEAP_PRFX[1];
+H5_DLLVAR const H5AC_class_t H5AC_LHEAP_PRFX[1];
 
 /* The local heap data block cache subclass */
-H5_DLLVAR const H5AC2_class_t H5AC2_LHEAP_DBLK[1];
+H5_DLLVAR const H5AC_class_t H5AC_LHEAP_DBLK[1];
 
 /* Declare extern the free list to manage the H5HL_free_t struct */
 H5FL_EXTERN(H5HL_free_t);
@@ -106,14 +106,14 @@ struct H5HL_t {
 
 /* Struct for heap data block */
 struct H5HL_dblk_t {
-    H5AC2_info_t cache_info;    /* Information for H5AC2 cache functions, _must_ be */
+    H5AC_info_t cache_info;    /* Information for H5AC cache functions, _must_ be */
                                 /* first field in structure */
     H5HL_t                 *heap;       /* Pointer to heap for data block */
 };
 
 /* Struct for heap prefix */
 struct H5HL_prfx_t {
-    H5AC2_info_t cache_info;    /* Information for H5AC2 cache functions, _must_ be */
+    H5AC_info_t cache_info;    /* Information for H5AC cache functions, _must_ be */
                                 /* first field in structure */
     H5HL_t                 *heap;       /* Pointer to heap for prefix */
 };
diff --git a/src/H5HLprivate.h b/src/H5HLprivate.h
index 26f2cb7..6233545 100644
--- a/src/H5HLprivate.h
+++ b/src/H5HLprivate.h
@@ -33,7 +33,7 @@
 
 /* Private headers needed by this file. */
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Fprivate.h"		/* File access				*/
 
 /*
@@ -64,7 +64,7 @@ typedef struct H5HL_t H5HL_t;
  * Library prototypes...
  */
 H5_DLL herr_t H5HL_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, haddr_t *addr/*out*/);
-H5_DLL H5HL_t *H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC2_protect_t rw);
+H5_DLL H5HL_t *H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw);
 H5_DLL void *H5HL_offset_into(const H5HL_t *heap, size_t offset);
 H5_DLL herr_t H5HL_remove(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t offset,
     size_t size);
diff --git a/src/H5I.c b/src/H5I.c
index d64b4a2..1cff648 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -42,7 +42,7 @@
 
 
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"        /* Metadata cache                       */
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FLprivate.h"	/* Free Lists                           */
 #include "H5Ipkg.h"		/* IDs			  		*/
@@ -1259,7 +1259,7 @@ H5Idec_ref(hid_t id)
 {
     int ret_value;                      /* Return value */
 
-    FUNC_ENTER_API_META(H5Idec_ref, id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Idec_ref, id, H5AC_dxpl_id, FAIL)
     H5TRACE1("Is", "i", id);
 
     /* Check arguments */
@@ -1384,7 +1384,7 @@ H5Iinc_ref(hid_t id)
 {
     int ret_value;                      /* Return value */
 
-    FUNC_ENTER_API_META(H5Iinc_ref, id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Iinc_ref, id, H5AC_dxpl_id, FAIL)
     H5TRACE1("Is", "i", id);
 
     /* Check arguments */
@@ -2002,7 +2002,7 @@ H5Iget_name(hid_t id, char *name/*out*/, size_t size)
     H5TRACE3("Zs", "ixz", id, name, size);
 
     /* Call internal group routine to retrieve object's name */
-    if((ret_value = H5G_get_name(id, name, size, H5P_DEFAULT, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5G_get_name(id, name, size, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't retrieve object name")
 
 done:
diff --git a/src/H5L.c b/src/H5L.c
index e66e28c..2302da6 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -28,7 +28,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"          /* Generic Functions                    */
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"        /* Metadata cache                       */
 #include "H5Dprivate.h"         /* Datasets                             */
 #include "H5Eprivate.h"         /* Error handling                       */
 #include "H5Gpkg.h"             /* Groups                               */
@@ -315,7 +315,7 @@ H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
     H5G_loc_t	dst_loc, *dst_loc_p;
     herr_t      ret_value=SUCCEED;              /* Return value */
 
-    FUNC_ENTER_API_META(H5Lmove, src_loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Lmove, src_loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id,
              lapl_id);
 
@@ -343,7 +343,7 @@ H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
 
     /* Move the link */
     if(H5L_move(src_loc_p, src_name, dst_loc_p, dst_name, FALSE, lcpl_id,
-            lapl_id, H5AC2_dxpl_id) < 0)
+            lapl_id, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link")
 
 done:
@@ -373,7 +373,7 @@ H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
     H5G_loc_t	dst_loc, *dst_loc_p;
     herr_t      ret_value=SUCCEED;              /* Return value */
 
-    FUNC_ENTER_API_META(H5Lcopy, src_loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Lcopy, src_loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id,
              lapl_id);
 
@@ -401,7 +401,7 @@ H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
 
     /* Copy the link */
     if(H5L_move(src_loc_p, src_name, dst_loc_p, dst_name, TRUE, lcpl_id,
-                lapl_id, H5AC2_dxpl_id) < 0)
+                lapl_id, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link")
 
 done:
@@ -434,7 +434,7 @@ H5Lcreate_soft(const char *link_target,
     H5G_loc_t	link_loc;               /* Group location for new link */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_API_META(H5Lcreate_soft, link_loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Lcreate_soft, link_loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE5("e", "*si*sii", link_target, link_loc_id, link_name, lcpl_id, lapl_id);
 
     /* Check arguments */
@@ -448,7 +448,7 @@ H5Lcreate_soft(const char *link_target,
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a link creation property list")
 
     /* Create the link */
-    if(H5L_create_soft(link_target, &link_loc, link_name, lcpl_id, lapl_id, H5AC2_dxpl_id) < 0)
+    if(H5L_create_soft(link_target, &link_loc, link_name, lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
 
 done:
@@ -480,7 +480,7 @@ H5Lcreate_hard(hid_t cur_loc_id, const char *cur_name,
     H5G_loc_t	new_loc, *new_loc_p;
     herr_t      ret_value = SUCCEED;            /* Return value */
 
-    FUNC_ENTER_API_META(H5Lcreate_hard, cur_loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Lcreate_hard, cur_loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE6("e", "i*si*sii", cur_loc_id, cur_name, new_loc_id, new_name, lcpl_id,
              lapl_id);
 
@@ -510,7 +510,7 @@ H5Lcreate_hard(hid_t cur_loc_id, const char *cur_name,
 
     /* Create the link */
     if(H5L_create_hard(cur_loc_p, cur_name, new_loc_p, new_name,
-                lcpl_id, lapl_id, H5AC2_dxpl_id) < 0)
+                lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
 
 done:
@@ -549,7 +549,7 @@ H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type,
     H5G_loc_t	link_loc;
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_API_META(H5Lcreate_ud, link_loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Lcreate_ud, link_loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE7("e", "i*sLl*xzii", link_loc_id, link_name, link_type, udata,
              udata_size, lcpl_id, lapl_id);
 
@@ -560,7 +560,7 @@ H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type,
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no link name specified")
 
     /* Create external link */
-    if(H5L_create_ud(&link_loc, link_name, udata, udata_size, link_type, lcpl_id, lapl_id, H5AC2_dxpl_id) < 0)
+    if(H5L_create_ud(&link_loc, link_name, udata, udata_size, link_type, lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
 
 done:
@@ -591,7 +591,7 @@ H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id)
     H5G_loc_t	loc;                    /* Group's location */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_API_META(H5Ldelete, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Ldelete, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE3("e", "i*si", loc_id, name, lapl_id);
 
     /* Check arguments */
@@ -601,7 +601,7 @@ H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
 
     /* Unlink */
-    if(H5L_delete(&loc, name, lapl_id, H5AC2_dxpl_id) < 0)
+    if(H5L_delete(&loc, name, lapl_id, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_LINK, H5E_CANTDELETE, FAIL, "unable to delete link")
 
 done:
@@ -636,7 +636,7 @@ H5Ldelete_by_idx(hid_t loc_id, const char *group_name,
     H5L_trav_rmbi_t udata;              /* User data for callback */
     herr_t ret_value = SUCCEED;         /* Return value */
 
-    FUNC_ENTER_API_META(H5Ldelete_by_idx, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Ldelete_by_idx, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE6("e", "i*sIiIohi", loc_id, group_name, idx_type, order, n, lapl_id);
 
     /* Check arguments */
@@ -658,10 +658,10 @@ H5Ldelete_by_idx(hid_t loc_id, const char *group_name,
     udata.idx_type = idx_type;
     udata.order = order;
     udata.n = n;
-    udata.dxpl_id = H5AC2_dxpl_id;
+    udata.dxpl_id = H5AC_dxpl_id;
 
     /* Traverse the group hierarchy to remove the link */
-    if(H5G_traverse(&loc, group_name, H5G_TARGET_SLINK|H5G_TARGET_UDLINK|H5G_TARGET_MOUNT, H5L_delete_by_idx_cb, &udata, lapl_id, H5AC2_dxpl_id) < 0)
+    if(H5G_traverse(&loc, group_name, H5G_TARGET_SLINK|H5G_TARGET_UDLINK|H5G_TARGET_MOUNT, H5L_delete_by_idx_cb, &udata, lapl_id, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "name doesn't exist")
 
 done:
@@ -710,7 +710,7 @@ H5Lget_val(hid_t loc_id, const char *name, void *buf/*out*/, size_t size,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Get the link value */
-    if(H5L_get_val(&loc, name, buf, size, lapl_id, H5AC2_ind_dxpl_id) < 0)
+    if(H5L_get_val(&loc, name, buf, size, lapl_id, H5AC_ind_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link value")
 
 done:
@@ -768,12 +768,12 @@ H5Lget_val_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
     udata.idx_type = idx_type;
     udata.order = order;
     udata.n = n;
-    udata.dxpl_id = H5AC2_ind_dxpl_id;
+    udata.dxpl_id = H5AC_ind_dxpl_id;
     udata.buf = buf;
     udata.size = size;
 
     /* Traverse the group hierarchy to locate the object to get info about */
-    if(H5G_traverse(&loc, group_name, H5G_TARGET_SLINK | H5G_TARGET_UDLINK, H5L_get_val_by_idx_cb, &udata, lapl_id, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_traverse(&loc, group_name, H5G_TARGET_SLINK | H5G_TARGET_UDLINK, H5L_get_val_by_idx_cb, &udata, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "name doesn't exist")
 
 
@@ -816,7 +816,7 @@ H5Lexists(hid_t loc_id, const char *name, hid_t lapl_id)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Check for the existence of the link */
-    if((ret_value = H5L_exists(&loc, name, lapl_id, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5L_exists(&loc, name, lapl_id, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link info")
 
 done:
@@ -860,7 +860,7 @@ H5Lget_info(hid_t loc_id, const char *name, H5L_info_t *linfo /*out*/,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Get the link information */
-    if(H5L_get_info(&loc, name, linfo, lapl_id, H5AC2_ind_dxpl_id) < 0)
+    if(H5L_get_info(&loc, name, linfo, lapl_id, H5AC_ind_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link info")
 
 done:
@@ -914,11 +914,11 @@ H5Lget_info_by_idx(hid_t loc_id, const char *group_name,
     udata.idx_type = idx_type;
     udata.order = order;
     udata.n = n;
-    udata.dxpl_id = H5AC2_ind_dxpl_id;
+    udata.dxpl_id = H5AC_ind_dxpl_id;
     udata.linfo = linfo;
 
     /* Traverse the group hierarchy to locate the object to get info about */
-    if(H5G_traverse(&loc, group_name, H5G_TARGET_SLINK|H5G_TARGET_UDLINK, H5L_get_info_by_idx_cb, &udata, lapl_id, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_traverse(&loc, group_name, H5G_TARGET_SLINK|H5G_TARGET_UDLINK, H5L_get_info_by_idx_cb, &udata, lapl_id, H5AC_ind_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link info")
 
 
@@ -1103,13 +1103,13 @@ H5Lget_name_by_idx(hid_t loc_id, const char *group_name,
     udata.idx_type = idx_type;
     udata.order = order;
     udata.n = n;
-    udata.dxpl_id = H5AC2_ind_dxpl_id;
+    udata.dxpl_id = H5AC_ind_dxpl_id;
     udata.name = name;
     udata.size = size;
     udata.name_len = -1;
 
     /* Traverse the group hierarchy to locate the link to get name of */
-    if(H5G_traverse(&loc, group_name, H5G_TARGET_SLINK|H5G_TARGET_UDLINK, H5L_get_name_by_idx_cb, &udata, lapl_id, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_traverse(&loc, group_name, H5G_TARGET_SLINK|H5G_TARGET_UDLINK, H5L_get_name_by_idx_cb, &udata, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "name doesn't exist")
 
     /* Set the return value */
@@ -1175,7 +1175,7 @@ H5Literate(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order,
     lnk_op.op_func.op_new = op;
 
     /* Iterate over the links */
-    if((ret_value = H5G_iterate(grp_id, ".", idx_type, order, idx, &last_lnk, &lnk_op, op_data, H5P_DEFAULT, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5G_iterate(grp_id, ".", idx_type, order, idx, &last_lnk, &lnk_op, op_data, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "link iteration failed")
 
     /* Set the index we stopped at */
@@ -1247,7 +1247,7 @@ H5Literate_by_name(hid_t loc_id, const char *group_name,
     lnk_op.op_func.op_new = op;
 
     /* Iterate over the links */
-    if((ret_value = H5G_iterate(loc_id, group_name, idx_type, order, idx, &last_lnk, &lnk_op, op_data, lapl_id, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5G_iterate(loc_id, group_name, idx_type, order, idx, &last_lnk, &lnk_op, op_data, lapl_id, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "link iteration failed")
 
     /* Set the index we stopped at */
@@ -1309,7 +1309,7 @@ H5Lvisit(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order,
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no callback operator specified")
 
     /* Call internal group visitation routine */
-    if((ret_value = H5G_visit(grp_id, ".", idx_type, order, op, op_data, H5P_DEFAULT, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5G_visit(grp_id, ".", idx_type, order, op, op_data, H5P_DEFAULT, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "link visitation failed")
 
 done:
@@ -1371,7 +1371,7 @@ H5Lvisit_by_name(hid_t loc_id, const char *group_name, H5_index_t idx_type,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Call internal group visitation routine */
-    if((ret_value = H5G_visit(loc_id, group_name, idx_type, order, op, op_data, lapl_id, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5G_visit(loc_id, group_name, idx_type, order, op, op_data, lapl_id, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "link visitation failed")
 
 done:
diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c
index bde987c..2eb0917 100644
--- a/src/H5Lexternal.c
+++ b/src/H5Lexternal.c
@@ -20,7 +20,7 @@
 #define H5_INTERFACE_INIT_FUNC	H5L_init_extern_interface
 
 #include "H5private.h"          /* Generic Functions                    */
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"        /* Metadata cache                       */
 #include "H5Eprivate.h"         /* Error handling                       */
 #include "H5Gpkg.h"             /* Groups                               */
 #include "H5Iprivate.h"		/* IDs					*/
@@ -255,7 +255,7 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group,
     /* target file_name is an absolute pathname: see RM for detailed description */
     if (CHECK_ABSOLUTE(file_name) || CHECK_ABS_PATH(file_name)) {
         if(NULL == (ext_file = H5F_open(file_name, ((intent & H5F_ACC_RDWR) ? H5F_ACC_RDWR : H5F_ACC_RDONLY),
-                                H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC2_dxpl_id))) {
+                                H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id))) {
             H5E_clear_stack(NULL);
             /* get last component of file_name */
 	    GET_LAST_DELIMITER(file_name, ptr)
@@ -264,7 +264,7 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group,
         }
     } else if (CHECK_ABS_DRIVE(file_name)) {
         if(NULL == (ext_file = H5F_open(file_name, ((intent & H5F_ACC_RDWR) ? H5F_ACC_RDWR : H5F_ACC_RDONLY),
-                                H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC2_dxpl_id))) {
+                                H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id))) {
             H5E_clear_stack(NULL);
 	    /* strip "<drive-letter>:" */
 	    HDstrcpy(tempname, &file_name[2]);
@@ -285,7 +285,7 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group,
                     HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't prepend prefix to filename")
 
                 ext_file = H5F_open(full_name, ((intent & H5F_ACC_RDWR) ? H5F_ACC_RDWR : H5F_ACC_RDONLY),
-                            H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC2_dxpl_id);
+                            H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id);
                 if (full_name)
                     H5MM_xfree(full_name);
                 if (ext_file != NULL)
@@ -305,7 +305,7 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group,
             if (H5L_build_name(my_prefix, tempname, &full_name/*out*/) < 0)
                 HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't prepend prefix to filename")
             if ((ext_file=H5F_open(full_name, ((intent & H5F_ACC_RDWR) ? H5F_ACC_RDWR : H5F_ACC_RDONLY),
-                        H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC2_dxpl_id)) == NULL)
+                        H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)) == NULL)
                 H5E_clear_stack(NULL);
             if (full_name)
                 H5MM_xfree(full_name);
@@ -317,7 +317,7 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group,
         if (H5L_build_name(extpath, tempname, &full_name/*out*/) < 0)
             HGOTO_ERROR(H5E_LINK, H5E_CANTGET, FAIL, "can't prepend prefix to filename")
         if ((ext_file = H5F_open(full_name, ((intent & H5F_ACC_RDWR) ? H5F_ACC_RDWR : H5F_ACC_RDONLY),
-                    H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC2_dxpl_id)) == NULL)
+                    H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)) == NULL)
             H5E_clear_stack(NULL);
         if (full_name)
             H5MM_xfree(full_name);
@@ -326,7 +326,7 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group,
     /* try the relative file_name stored in tempname */
     if (ext_file == NULL) {
         if ((ext_file=H5F_open(tempname, ((intent & H5F_ACC_RDWR) ? H5F_ACC_RDWR : H5F_ACC_RDONLY),
-                        H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC2_dxpl_id)) == NULL)
+                        H5P_FILE_CREATE_DEFAULT, fapl_id, H5AC_dxpl_id)) == NULL)
             HGOTO_ERROR(H5E_LINK, H5E_CANTOPENFILE, FAIL, "unable to open external file")
     }
 
@@ -452,7 +452,7 @@ H5Lcreate_external(const char *file_name, const char *obj_name,
     uint8_t    *p;                      /* Pointer into external link buffer */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_API_META(H5Lcreate_external, link_loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Lcreate_external, link_loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE6("e", "*s*si*sii", file_name, obj_name, link_loc_id, link_name,
              lcpl_id, lapl_id);
 
@@ -479,7 +479,7 @@ H5Lcreate_external(const char *file_name, const char *obj_name,
     HDstrcpy((char *)p, obj_name);       /* External link's object */
 
     /* Create an external link */
-    if(H5L_create_ud(&link_loc, link_name, ext_link_buf, buf_size, H5L_TYPE_EXTERNAL, lcpl_id, lapl_id, H5AC2_dxpl_id) < 0)
+    if(H5L_create_ud(&link_loc, link_name, ext_link_buf, buf_size, H5L_TYPE_EXTERNAL, lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
 
 done:
diff --git a/src/H5MF.c b/src/H5MF.c
index 9882306..2608185 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -30,7 +30,7 @@
 /* Module Setup */
 /****************/
 
-#define H5C2_PACKAGE            /*suppress error about including H5C2pkg  */
+#define H5C_PACKAGE             /*suppress error about including H5Cpkg  */
 #define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
 
 
@@ -38,7 +38,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5C2pkg.h"            /* Metadata cache                       */
+#include "H5Cpkg.h"             /* Metadata cache                       */
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Fpkg.h"             /* File access				*/
 #include "H5MFprivate.h"	/* File memory management		*/
@@ -116,7 +116,7 @@ H5MF_alloc(const H5F_t *f, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed")
 
     /* Check for journaling in progress */
-    if(f->shared->cache2->mdj_enabled) {
+    if(f->shared->cache->mdj_enabled) {
         haddr_t	new_eoa;
 
         /* get updated EOA value */
@@ -124,8 +124,8 @@ H5MF_alloc(const H5F_t *f, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
             HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, HADDR_UNDEF, "file get eoa request failed")
 
         /* journal the updated EOA value */
-        if(H5C2_jb__eoa(&(f->shared->cache2->mdj_jbrb), new_eoa) < 0)
-            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTJOURNAL, HADDR_UNDEF, "H5C2_jb__eoa() failed.")
+        if(H5C_jb__eoa(&(f->shared->cache->mdj_jbrb), new_eoa) < 0)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_CANTJOURNAL, HADDR_UNDEF, "H5C_jb__eoa() failed.")
     } /* end if */
 
     /* Convert absolute file address to relative file address */
diff --git a/src/H5O.c b/src/H5O.c
index d113b32..47efbeb 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -314,12 +314,12 @@ H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location, according to the order in the index */
-    if(H5G_loc_find_by_idx(&loc, group_name, idx_type, order, n, &obj_loc/*out*/, lapl_id, H5AC2_dxpl_id) < 0)
+    if(H5G_loc_find_by_idx(&loc, group_name, idx_type, order, n, &obj_loc/*out*/, lapl_id, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found")
     loc_found = TRUE;
 
     /* Open the object */
-    if((ret_value = H5O_open_by_loc(&obj_loc, H5AC2_dxpl_id)) < 0)
+    if((ret_value = H5O_open_by_loc(&obj_loc, H5AC_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
 done:
@@ -395,7 +395,7 @@ H5Oopen_by_addr(hid_t loc_id, haddr_t addr)
     H5G_name_reset(obj_loc.path);       /* objects opened through this routine don't have a path name */
 
     /* Open the object */
-    if((ret_value = H5O_open_by_loc(&obj_loc, H5AC2_dxpl_id)) < 0)
+    if((ret_value = H5O_open_by_loc(&obj_loc, H5AC_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
 done:
@@ -436,7 +436,7 @@ H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id,
     H5G_loc_t	obj_loc;
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_API_META(H5Olink, obj_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Olink, obj_id, H5AC_dxpl_id, FAIL)
     H5TRACE5("e", "ii*sii", obj_id, new_loc_id, new_name, lcpl_id, lapl_id);
 
     /* Check arguments */
@@ -454,7 +454,7 @@ H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id,
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a link creation property list")
 
     /* Link to the object */
-    if(H5L_link(&new_loc, new_name, &obj_loc, lcpl_id, lapl_id, H5AC2_dxpl_id) < 0)
+    if(H5L_link(&new_loc, new_name, &obj_loc, lcpl_id, lapl_id, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link")
 
 done:
@@ -488,14 +488,14 @@ H5Oincr_refcount(hid_t object_id)
     H5O_loc_t  *oloc;
     herr_t      ret_value = SUCCEED;
 
-    FUNC_ENTER_API_META(H5Oincr_refcount, object_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Oincr_refcount, object_id, H5AC_dxpl_id, FAIL)
     H5TRACE1("e", "i", object_id);
 
     /* Get the object's oloc so we can adjust its link count */
     if((oloc = H5O_get_loc(object_id)) == NULL)
         HGOTO_ERROR(H5E_ATOM, H5E_BADVALUE, FAIL, "unable to get object location from ID")
 
-    if(H5O_link(oloc, 1, H5AC2_dxpl_id) < 0)
+    if(H5O_link(oloc, 1, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "modifying object link count failed")
 
 done:
@@ -529,14 +529,14 @@ H5Odecr_refcount(hid_t object_id)
     H5O_loc_t  *oloc;
     herr_t      ret_value = SUCCEED;
 
-    FUNC_ENTER_API_META(H5Odecr_refcount, object_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Odecr_refcount, object_id, H5AC_dxpl_id, FAIL)
     H5TRACE1("e", "i", object_id);
 
     /* Get the object's oloc so we can adjust its link count */
     if((oloc = H5O_get_loc(object_id)) == NULL)
         HGOTO_ERROR(H5E_ATOM, H5E_BADVALUE, FAIL, "unable to get object location from ID")
 
-    if(H5O_link(oloc, -1, H5AC2_dxpl_id) < 0)
+    if(H5O_link(oloc, -1, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "modifying object link count failed")
 
 done:
@@ -573,7 +573,7 @@ H5Oget_info(hid_t loc_id, H5O_info_t *oinfo)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no info struct")
 
     /* Retrieve the object's information */
-    if(H5G_loc_info(&loc, ".", TRUE, oinfo/*out*/, H5P_LINK_ACCESS_DEFAULT, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_loc_info(&loc, ".", TRUE, oinfo/*out*/, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
 done:
@@ -617,7 +617,7 @@ H5Oget_info_by_name(hid_t loc_id, const char *name, H5O_info_t *oinfo, hid_t lap
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Retrieve the object's information */
-    if(H5G_loc_info(&loc, name, TRUE, oinfo/*out*/, lapl_id, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_loc_info(&loc, name, TRUE, oinfo/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
 done:
@@ -677,12 +677,12 @@ H5Oget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location, according to the order in the index */
-    if(H5G_loc_find_by_idx(&loc, group_name, idx_type, order, n, &obj_loc/*out*/, lapl_id, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_loc_find_by_idx(&loc, group_name, idx_type, order, n, &obj_loc/*out*/, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "group not found")
     loc_found = TRUE;
 
     /* Retrieve the object's information */
-    if(H5O_get_info(obj_loc.oloc, H5AC2_ind_dxpl_id, TRUE, oinfo) < 0)
+    if(H5O_get_info(obj_loc.oloc, H5AC_ind_dxpl_id, TRUE, oinfo) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve object info")
 
 done:
@@ -717,7 +717,7 @@ H5Oset_comment(hid_t obj_id, const char *comment)
     H5G_loc_t	loc;                    /* Location of group */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_API_META(H5Oset_comment, obj_id, H5AC2_ind_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Oset_comment, obj_id, H5AC_ind_dxpl_id, FAIL)
     H5TRACE2("e", "i*s", obj_id, comment);
 
     /* Check args */
@@ -725,7 +725,7 @@ H5Oset_comment(hid_t obj_id, const char *comment)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
     /* (Re)set the object's comment */
-    if(H5G_loc_set_comment(&loc, ".", comment, H5P_LINK_ACCESS_DEFAULT, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_loc_set_comment(&loc, ".", comment, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
 done:
@@ -757,7 +757,7 @@ H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment,
     H5G_loc_t	loc;                    /* Location of group */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_API_META(H5Oset_comment_by_name, loc_id, H5AC2_ind_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Oset_comment_by_name, loc_id, H5AC_ind_dxpl_id, FAIL)
     H5TRACE4("e", "i*s*si", loc_id, name, comment, lapl_id);
 
     /* Check args */
@@ -772,7 +772,7 @@ H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* (Re)set the object's comment */
-    if(H5G_loc_set_comment(&loc, name, comment, lapl_id, H5AC2_ind_dxpl_id) < 0)
+    if(H5G_loc_set_comment(&loc, name, comment, lapl_id, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
 done:
@@ -810,7 +810,7 @@ H5Oget_comment(hid_t obj_id, char *comment, size_t bufsize)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
     /* Retrieve the object's comment */
-    if((ret_value = H5G_loc_get_comment(&loc, ".", comment/*out*/, bufsize, H5P_LINK_ACCESS_DEFAULT, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5G_loc_get_comment(&loc, ".", comment/*out*/, bufsize, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
 done:
@@ -856,7 +856,7 @@ H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comment, size_t buf
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Retrieve the object's comment */
-    if((ret_value = H5G_loc_get_comment(&loc, name, comment/*out*/, bufsize, lapl_id, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5G_loc_get_comment(&loc, name, comment/*out*/, bufsize, lapl_id, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
 done:
@@ -914,7 +914,7 @@ H5Ovisit(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order,
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no callback operator specified")
 
     /* Call internal object visitation routine */
-    if((ret_value = H5O_visit(obj_id, ".", idx_type, order, op, op_data, H5P_LINK_ACCESS_DEFAULT, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5O_visit(obj_id, ".", idx_type, order, op, op_data, H5P_LINK_ACCESS_DEFAULT, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "object visitation failed")
 
 done:
@@ -980,7 +980,7 @@ H5Ovisit_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not link access property list ID")
 
     /* Call internal object visitation routine */
-    if((ret_value = H5O_visit(loc_id, obj_name, idx_type, order, op, op_data, lapl_id, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5O_visit(loc_id, obj_name, idx_type, order, op, op_data, lapl_id, H5AC_ind_dxpl_id)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "object visitation failed")
 
 done:
@@ -1014,7 +1014,7 @@ H5Oclose(hid_t object_id)
     /* Will this ever change metadata?  No need for a transaction unless
      * it does.
      */
-    FUNC_ENTER_API_META(H5Oclose, object_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Oclose, object_id, H5AC_dxpl_id, FAIL)
     H5TRACE1("e", "i", object_id);
 
     /* Get the type of the object and close it in the correct way */
@@ -1192,7 +1192,7 @@ H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, hid_t ocpl_id,
     oh->mesg[0].chunkno = 0;
 
     /* Cache object header */
-    if(H5AC2_set(f, dxpl_id, H5AC2_OHDR, oh_addr, (size_t)oh_size, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(f, dxpl_id, H5AC_OHDR, oh_addr, (size_t)oh_size, oh, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "unable to cache object header")
     oh = NULL;
 
@@ -1292,12 +1292,12 @@ H5O_open_name(H5G_loc_t *loc, const char *name, hid_t lapl_id)
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(loc, name, &obj_loc/*out*/, lapl_id, H5AC2_dxpl_id) < 0)
+    if(H5G_loc_find(loc, name, &obj_loc/*out*/, lapl_id, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
     loc_found = TRUE;
 
     /* Open the object */
-    if((ret_value = H5O_open_by_loc(&obj_loc, H5AC2_ind_dxpl_id)) < 0)
+    if((ret_value = H5O_open_by_loc(&obj_loc, H5AC_ind_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
 done:
@@ -1433,7 +1433,7 @@ H5O_link(const H5O_loc_t *loc, int adjust, hid_t dxpl_id)
     HDassert(H5F_addr_defined(loc->addr));
 
     /* Get header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, (adjust ? H5AC2_WRITE : H5AC2_READ))))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, (adjust ? H5AC_WRITE : H5AC_READ))))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "unable to load object header")
 
     /* Pin the object header */
@@ -1441,7 +1441,7 @@ H5O_link(const H5O_loc_t *loc, int adjust, hid_t dxpl_id)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Unprotect the object header */
-    if(H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
 
     /* Check for adjusting link count */
@@ -1455,7 +1455,7 @@ H5O_link(const H5O_loc_t *loc, int adjust, hid_t dxpl_id)
             oh->nlink += adjust;
 
             /* Mark object header as dirty in cache */
-            if(H5AC2_mark_pinned_or_protected_entry_dirty(oh) < 0)
+            if(H5AC_mark_pinned_or_protected_entry_dirty(oh) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty")
 
             /* Check if the object should be deleted */
@@ -1486,7 +1486,7 @@ H5O_link(const H5O_loc_t *loc, int adjust, hid_t dxpl_id)
             oh->nlink += adjust;
 
             /* Mark object header as dirty in cache */
-            if(H5AC2_mark_pinned_or_protected_entry_dirty(oh) < 0)
+            if(H5AC_mark_pinned_or_protected_entry_dirty(oh) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty")
         } /* end if */
 
@@ -1537,7 +1537,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5O_protect
  *
- * Purpose:	Wrapper around H5AC2_protect for use during a H5O_protect->
+ * Purpose:	Wrapper around H5AC_protect for use during a H5O_protect->
  *              H5O_msg_append->...->H5O_msg_append->H5O_unprotect sequence of calls
  *              during an object's creation.
  *
@@ -1553,7 +1553,7 @@ done:
  *-------------------------------------------------------------------------
  */
 H5O_t *
-H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC2_protect_t prot)
+H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot)
 {
     H5O_t *oh;                  /* Object header protected */
     H5O_cache_ud_t udata;       /* User data for protecting object header */
@@ -1570,7 +1570,7 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC2_protect_t prot)
 
     /* Check for write access on the file */
     file_intent = H5F_INTENT(loc->file);
-    if((prot == H5AC2_WRITE) && (0 == (file_intent & H5F_ACC_RDWR)))
+    if((prot == H5AC_WRITE) && (0 == (file_intent & H5F_ACC_RDWR)))
 	HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "no write intent on file")
 
     /* Construct the user data for protect callback */
@@ -1585,7 +1585,7 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC2_protect_t prot)
     udata.common.cont_msg_info = &cont_msg_info;
 
     /* Lock the object header into the cache */
-    if(NULL == (oh = (H5O_t *)H5AC2_protect(loc->file, dxpl_id, H5AC2_OHDR, loc->addr, (size_t)H5O_SPEC_READ_SIZE, &udata, prot)))
+    if(NULL == (oh = (H5O_t *)H5AC_protect(loc->file, dxpl_id, H5AC_OHDR, loc->addr, (size_t)H5O_SPEC_READ_SIZE, &udata, prot)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header")
 
     /* Check if there are any continuation messages to process */
@@ -1619,7 +1619,7 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC2_protect_t prot)
 
             /* Bring the chunk into the cache */
             /* (which adds to the object header */
-            if(NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC2_protect(loc->file, dxpl_id, H5AC2_OHDR_CHK, cont_msg_info.msgs[curr_msg].addr, cont_msg_info.msgs[curr_msg].size, &chk_udata, prot)))
+            if(NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC_protect(loc->file, dxpl_id, H5AC_OHDR_CHK, cont_msg_info.msgs[curr_msg].addr, cont_msg_info.msgs[curr_msg].size, &chk_udata, prot)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header chunk")
 
             /* Sanity check */
@@ -1628,7 +1628,7 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC2_protect_t prot)
             HDassert(oh->nchunks == (chkcnt + 1));
 
             /* Release the chunk from the cache */
-            if(H5AC2_unprotect(loc->file, dxpl_id, H5AC2_OHDR_CHK, cont_msg_info.msgs[curr_msg].addr, (size_t)0, chk_proxy, H5AC2__NO_FLAGS_SET) < 0)
+            if(H5AC_unprotect(loc->file, dxpl_id, H5AC_OHDR_CHK, cont_msg_info.msgs[curr_msg].addr, (size_t)0, chk_proxy, H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header chunk")
 
             /* Advance to next continuation message */
@@ -1664,37 +1664,37 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC2_protect_t prot)
             /* (object header will have been marked dirty during protect, if we
              *  have write access -QAK)
              */
-            if(prot != H5AC2_WRITE)
+            if(prot != H5AC_WRITE)
                 oh->prefix_modified = TRUE;
 #ifndef NDEBUG
             else {
                 unsigned oh_status = 0;         /* Object header entry cache status */
 
                 /* Check the object header's status in the metadata cache */
-                if(H5AC2_get_entry_status(loc->file, loc->addr, &oh_status) < 0)
+                if(H5AC_get_entry_status(loc->file, loc->addr, &oh_status) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to check metadata cache status for object header")
 
                 /* Make certain that object header is dirty */
-                HDassert(!(oh_status & H5AC2_ES__IS_DIRTY));
+                HDassert(!(oh_status & H5AC_ES__IS_DIRTY));
             } /* end else */
 #endif /* NDEBUG */
 #endif /* H5_STRICT_FORMAT_CHECKS */
         } /* end if */
 
         /* Check for any messages that were modified while being read in */
-        if(udata.common.mesgs_modified && prot != H5AC2_WRITE)
+        if(udata.common.mesgs_modified && prot != H5AC_WRITE)
             oh->mesgs_modified = TRUE;
     } /* end if */
 
     /* Take care of loose ends for modifications made while bringing in the
      *      object header & chunks.
      */
-    if(prot == H5AC2_WRITE) {
+    if(prot == H5AC_WRITE) {
         /* Check for the object header prefix being modified somehow */
         /* (usually through updating the # of object header messages) */
         if(oh->prefix_modified) {
             /* Mark the header as dirty now */
-            if(H5AC2_mark_pinned_or_protected_entry_dirty(oh) < 0)
+            if(H5AC_mark_pinned_or_protected_entry_dirty(oh) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, NULL, "unable to mark object header as dirty")
 
             /* Reset flag */
@@ -1720,7 +1720,7 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC2_protect_t prot)
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header chunk")
 
                     /* Unprotect chunk, marking it dirty */
-                    if(H5O_chunk_unprotect(loc->file, dxpl_id, oh, chk_proxy, H5AC2__DIRTIED_FLAG) < 0)
+                    if(H5O_chunk_unprotect(loc->file, dxpl_id, oh, chk_proxy, H5AC__DIRTIED_FLAG) < 0)
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to unprotect object header chunk")
                 } /* end if */
             } /* end for */
@@ -1739,7 +1739,7 @@ H5O_assert(oh);
 
 done:
     if(ret_value == NULL && oh) {
-        if(H5AC2_unprotect(loc->file, dxpl_id, H5AC2_OHDR, loc->addr, (size_t)0, oh, H5AC2__NO_FLAGS_SET) < 0)
+        if(H5AC_unprotect(loc->file, dxpl_id, H5AC_OHDR, loc->addr, (size_t)0, oh, H5AC__NO_FLAGS_SET) < 0)
             HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
     } /* end if */
 
@@ -1750,7 +1750,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5O_pin
  *
- * Purpose:	Wrapper around H5AC2_pin_entry
+ * Purpose:	Wrapper around H5AC_pin_entry
  *
  * Return:	Success:	Non-negative
  *		Failure:	Negative
@@ -1784,7 +1784,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5O_unpin
  *
- * Purpose:	Wrapper around H5AC2_unpin_entry
+ * Purpose:	Wrapper around H5AC_unpin_entry
  *
  * Return:	Success:	Non-negative
  *		Failure:	Negative
@@ -1818,7 +1818,7 @@ done:
 /*-------------------------------------------------------------------------
  * Function:	H5O_unprotect
  *
- * Purpose:	Wrapper around H5AC2_unprotect for use during a H5O_protect->
+ * Purpose:	Wrapper around H5AC_unprotect for use during a H5O_protect->
  *              H5O_msg_append->...->H5O_msg_append->H5O_unprotect sequence of calls
  *              during an object's creation.
  *
@@ -1843,7 +1843,7 @@ H5O_unprotect(const H5O_loc_t *loc, hid_t dxpl_id, H5O_t *oh, unsigned oh_flags)
     HDassert(oh);
 
     /* Unprotect the object header */
-    if(H5AC2_unprotect(loc->file, dxpl_id, H5AC2_OHDR, oh->chunk[0].addr, (size_t)0, oh, oh_flags) < 0)
+    if(H5AC_unprotect(loc->file, dxpl_id, H5AC_OHDR, oh->chunk[0].addr, (size_t)0, oh, oh_flags) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
 done:
@@ -1869,7 +1869,7 @@ herr_t
 H5O_touch_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, hbool_t force)
 {
     H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that message is in */
-    unsigned chk_flags = H5AC2__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
+    unsigned chk_flags = H5AC__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
     time_t	now;                    /* Current time */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
@@ -1923,7 +1923,7 @@ H5O_touch_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, hbool_t force)
 
             /* Mark the message as dirty */
             oh->mesg[idx].dirty = TRUE;
-            chk_flags |= H5AC2__DIRTIED_FLAG;
+            chk_flags |= H5AC__DIRTIED_FLAG;
         } /* end if */
         else {
             /* XXX: For now, update access time & change fields in the object header */
@@ -1931,7 +1931,7 @@ H5O_touch_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, hbool_t force)
             oh->atime = oh->ctime = now;
 
             /* Mark object header as dirty in cache */
-            if(H5AC2_mark_pinned_or_protected_entry_dirty(oh) < 0)
+            if(H5AC_mark_pinned_or_protected_entry_dirty(oh) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty")
         } /* end else */
     } /* end if */
@@ -1964,7 +1964,7 @@ herr_t
 H5O_touch(const H5O_loc_t *loc, hbool_t force, hid_t dxpl_id)
 {
     H5O_t	*oh = NULL;             /* Object header to modify */
-    unsigned 	oh_flags = H5AC2__NO_FLAGS_SET; /* Flags for unprotecting object header */
+    unsigned 	oh_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting object header */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI(H5O_touch, FAIL)
@@ -1973,7 +1973,7 @@ H5O_touch(const H5O_loc_t *loc, hbool_t force, hid_t dxpl_id)
     HDassert(loc);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_WRITE)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Create/Update the modification time message */
@@ -1981,7 +1981,7 @@ H5O_touch(const H5O_loc_t *loc, hbool_t force, hid_t dxpl_id)
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "unable to update object modificaton time")
 
     /* Mark object header as changed */
-    oh_flags |= H5AC2__DIRTIED_FLAG;
+    oh_flags |= H5AC__DIRTIED_FLAG;
 
 done:
     if(oh && H5O_unprotect(loc, dxpl_id, oh, oh_flags) < 0)
@@ -2074,7 +2074,7 @@ H5O_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
 {
     H5O_t *oh = NULL;           /* Object header information */
     H5O_loc_t loc;              /* Object location for object to delete */
-    unsigned oh_flags = H5AC2__NO_FLAGS_SET; /* Flags for unprotecting object header */
+    unsigned oh_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting object header */
     herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(H5O_delete, FAIL)
@@ -2089,7 +2089,7 @@ H5O_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
     loc.holding_file = FALSE;
 
     /* Get the object header information */
-    if(NULL == (oh = H5O_protect(&loc, dxpl_id, H5AC2_WRITE)))
+    if(NULL == (oh = H5O_protect(&loc, dxpl_id, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Delete object */
@@ -2097,7 +2097,7 @@ H5O_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "can't delete object from file")
 
     /* Mark object header as deleted */
-    oh_flags = H5AC2__DIRTIED_FLAG | H5AC2__DELETED_FLAG;
+    oh_flags = H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG;
 
 done:
     if(oh && H5O_unprotect(&loc, dxpl_id, oh, oh_flags) < 0)
@@ -2177,7 +2177,7 @@ H5O_obj_type(const H5O_loc_t *loc, H5O_type_t *obj_type, hid_t dxpl_id)
     FUNC_ENTER_NOAPI(H5O_obj_type, FAIL)
 
     /* Load the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Retrieve the type of the object */
@@ -2185,7 +2185,7 @@ H5O_obj_type(const H5O_loc_t *loc, H5O_type_t *obj_type, hid_t dxpl_id)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to determine object type")
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2255,7 +2255,7 @@ H5O_obj_class(const H5O_loc_t *loc, hid_t dxpl_id)
     FUNC_ENTER_NOAPI_NOINIT(H5O_obj_class)
 
     /* Load the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header")
 
     /* Test whether entry qualifies as a particular type of object */
@@ -2263,7 +2263,7 @@ H5O_obj_class(const H5O_loc_t *loc, hid_t dxpl_id)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to determine object type")
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2541,7 +2541,7 @@ H5O_get_info(const H5O_loc_t *loc, hid_t dxpl_id, hbool_t want_ih_info, H5O_info
     HDassert(oinfo);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Reset the object info structure */
@@ -2659,7 +2659,7 @@ H5O_get_info(const H5O_loc_t *loc, hid_t dxpl_id, hbool_t want_ih_info, H5O_info
     HDassert(oinfo->hdr.space.total == (oinfo->hdr.space.free + oinfo->hdr.space.meta + oinfo->hdr.space.mesg));
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2692,7 +2692,7 @@ H5O_get_create_plist(const H5O_loc_t *loc, hid_t dxpl_id, H5P_genplist_t *oc_pli
     HDassert(oc_plist);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Set property values, if they were used for the object */
@@ -2714,7 +2714,7 @@ H5O_get_create_plist(const H5O_loc_t *loc, hid_t dxpl_id, H5P_genplist_t *oc_pli
     } /* end if */
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2747,14 +2747,14 @@ H5O_get_nlinks(const H5O_loc_t *loc, hid_t dxpl_id, hsize_t *nlinks)
     HDassert(nlinks);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Retrieve the # of link messages seen when the object header was loaded */
     *nlinks = oh->link_msgs_seen;
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2866,7 +2866,7 @@ H5O_get_rc_and_type(const H5O_loc_t *loc, hid_t dxpl_id, unsigned *rc, H5O_type_
     HDassert(otype);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Set the object's reference count */
@@ -2877,7 +2877,7 @@ H5O_get_rc_and_type(const H5O_loc_t *loc, hid_t dxpl_id, unsigned *rc, H5O_type_
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to determine object type")
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -3160,7 +3160,7 @@ H5O_inc_rc(H5O_t *oh)
 
     /* Pin the object header when the reference count goes above 0 */
     if(oh->rc == 0)
-        if(H5AC2_pin_protected_entry(oh) < 0)
+        if(H5AC_pin_protected_entry(oh) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Increment reference count */
@@ -3199,7 +3199,7 @@ H5O_dec_rc(H5O_t *oh)
 
     /* Unpin the object header when the reference count goes back to 0 */
     if(oh->rc == 0)
-        if(H5AC2_unpin_entry(oh) < 0)
+        if(H5AC_unpin_entry(oh) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPIN, FAIL, "unable to unpin object header")
 
 done:
diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c
index 3680cb7..202c190 100644
--- a/src/H5Oalloc.c
+++ b/src/H5Oalloc.c
@@ -110,7 +110,7 @@ H5O_add_gap(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno, unsigned idx,
     uint8_t *new_gap_loc, size_t new_gap_size)
 {
     H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that message is in */
-    unsigned chk_flags = H5AC2__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
+    unsigned chk_flags = H5AC__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
     hbool_t merged_with_null;           /* Whether the gap was merged with a null message */
     unsigned u;                         /* Local index variable */
     herr_t ret_value = SUCCEED;         /* Return value */
@@ -195,7 +195,7 @@ H5O_add_gap(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno, unsigned idx,
             oh->chunk[chunkno].gap = new_gap_size;
 
         /* Mark the chunk as modified */
-        chk_flags |= H5AC2__DIRTIED_FLAG;
+        chk_flags |= H5AC__DIRTIED_FLAG;
     } /* end if */
 
 done:
@@ -232,7 +232,7 @@ H5O_eliminate_gap(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg,
     uint8_t *gap_loc, size_t gap_size)
 {
     H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that message is in */
-    unsigned chk_flags = H5AC2__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
+    unsigned chk_flags = H5AC__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
     uint8_t *move_start, *move_end;     /* Pointers to area of messages to move */
     hbool_t null_before_gap;    /* Flag whether the null message is before the gap or not */
     herr_t ret_value = SUCCEED;         /* Return value */
@@ -314,7 +314,7 @@ H5O_eliminate_gap(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg,
 
     /* Mark null message as dirty */
     mesg->dirty = TRUE;
-    chk_flags |= H5AC2__DIRTIED_FLAG;
+    chk_flags |= H5AC__DIRTIED_FLAG;
 
 done:
     /* Release chunk */
@@ -344,7 +344,7 @@ H5O_alloc_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned null_idx,
     const H5O_msg_class_t *new_type, void *new_native, size_t new_size)
 {
     H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that message is in */
-    unsigned chk_flags = H5AC2__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
+    unsigned chk_flags = H5AC__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
     H5O_mesg_t *alloc_msg;              /* Pointer to null message to allocate out of */
     herr_t ret_value = SUCCEED; 	/* Return value */
 
@@ -401,7 +401,7 @@ H5O_alloc_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned null_idx,
             null_msg->dirty = TRUE;
 
             /* Release chunk, marking it dirty */
-            if(H5O_chunk_unprotect(f, dxpl_id, oh, null_chk_proxy, H5AC2__DIRTIED_FLAG) < 0)
+            if(H5O_chunk_unprotect(f, dxpl_id, oh, null_chk_proxy, H5AC__DIRTIED_FLAG) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, UFAIL, "unable to unprotect object header chunk")
 
             /* Check for gap in new null message's chunk */
@@ -430,7 +430,7 @@ H5O_alloc_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned null_idx,
 
     /* Mark the new message as dirty */
     alloc_msg->dirty = TRUE;
-    chk_flags |= H5AC2__DIRTIED_FLAG;
+    chk_flags |= H5AC__DIRTIED_FLAG;
 
 done:
     /* Release chunk */
@@ -521,7 +521,7 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno,
     size_t size, unsigned * msg_idx)
 {
     H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that message is in */
-    unsigned chk_flags = H5AC2__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
+    unsigned chk_flags = H5AC__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
     size_t      delta;          /* Change in chunk's size */
     size_t      aligned_size = H5O_ALIGN_OH(oh, size);
     uint8_t     *old_image;     /* Old address of chunk's image in memory */
@@ -615,7 +615,7 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno,
         oh->flags |= new_size_flags;
 
         /* Mark object header as dirty in cache */
-        if(H5AC2_mark_pinned_or_protected_entry_dirty(oh) < 0)
+        if(H5AC_mark_pinned_or_protected_entry_dirty(oh) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty")
     } /* end if */
 
@@ -646,7 +646,7 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno,
 
     /* Mark the extended message as dirty */
     oh->mesg[extend_msg].dirty = TRUE;
-    chk_flags |= H5AC2__DIRTIED_FLAG;
+    chk_flags |= H5AC__DIRTIED_FLAG;
 
     /* Allocate more memory space for chunk's image */
     old_image = oh->chunk[chunkno].image;
@@ -677,7 +677,7 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno,
         if(chunkno > 0 && (H5O_CONT_ID == oh->mesg[u].type->id) &&
                 (((H5O_cont_t *)(oh->mesg[u].native))->chunkno == chunkno)) {
             H5O_chunk_proxy_t *chk_proxy2 = NULL;       /* Chunk that continuation message is in */
-            unsigned chk_flags2 = H5AC2__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
+            unsigned chk_flags2 = H5AC__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
             unsigned cont_chunkno = oh->mesg[u].chunkno;    /* Chunk # for continuation message */
 
             /* Protect chunk containing continuation message */
@@ -690,7 +690,7 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno,
 
             /* Flag continuation message as dirty */
             oh->mesg[u].dirty = TRUE;
-            chk_flags2 |= H5AC2__DIRTIED_FLAG;
+            chk_flags2 |= H5AC__DIRTIED_FLAG;
 
             /* Release chunk containing continuation message */
             if(H5O_chunk_unprotect(f, dxpl_id, oh, chk_proxy2, chk_flags2) < 0)
@@ -699,7 +699,7 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno,
     } /* end for */
 
     /* Mark the chunk size in the cache as changed */
-    chk_flags |= H5AC2__SIZE_CHANGED_FLAG;
+    chk_flags |= H5AC__SIZE_CHANGED_FLAG;
 
     /* Set return value */
     *msg_idx = extend_msg;
@@ -1001,7 +1001,7 @@ H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size)
         null_msg->dirty = TRUE;
 
         /* Release chunk, marking it dirty */
-        if(H5O_chunk_unprotect(f, dxpl_id, oh, null_chk_proxy, H5AC2__DIRTIED_FLAG) < 0)
+        if(H5O_chunk_unprotect(f, dxpl_id, oh, null_chk_proxy, H5AC__DIRTIED_FLAG) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, UFAIL, "unable to unprotect object header chunk")
     } /* end if */
     HDassert(found_null >= 0);
@@ -1117,7 +1117,7 @@ H5O_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, UFAIL, "can't split null message")
 
     /* Mark object header as dirty in cache */
-    if(H5AC2_mark_pinned_or_protected_entry_dirty(oh) < 0)
+    if(H5AC_mark_pinned_or_protected_entry_dirty(oh) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, UFAIL, "unable to mark object header as dirty")
 
     /* Set return value */
@@ -1147,7 +1147,7 @@ H5O_release_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg,
     hbool_t adj_link)
 {
     H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that message is in */
-    unsigned chk_flags = H5AC2__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
+    unsigned chk_flags = H5AC__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
     herr_t ret_value = SUCCEED; 	                /* Return value */
 
     FUNC_ENTER_NOAPI(H5O_release_mesg, FAIL)
@@ -1181,7 +1181,7 @@ H5O_release_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg,
 
     /* Mark the message as modified */
     mesg->dirty = TRUE;
-    chk_flags |= H5AC2__DIRTIED_FLAG;
+    chk_flags |= H5AC__DIRTIED_FLAG;
 
     /* Release chunk */
     if(H5O_chunk_unprotect(f, dxpl_id, oh, chk_proxy, chk_flags) < 0)
@@ -1285,7 +1285,7 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                                 curr_msg->dirty = TRUE;
 
                                 /* Release chunk, marking it dirty */
-                                if(H5O_chunk_unprotect(f, dxpl_id, oh, null_chk_proxy, H5AC2__DIRTIED_FLAG) < 0)
+                                if(H5O_chunk_unprotect(f, dxpl_id, oh, null_chk_proxy, H5AC__DIRTIED_FLAG) < 0)
                                     HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
 
 
@@ -1345,9 +1345,9 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                             null_msg->dirty = TRUE;
 
                             /* Release chunks, marking them dirty */
-                            if(H5O_chunk_unprotect(f, dxpl_id, oh, null_chk_proxy, H5AC2__DIRTIED_FLAG) < 0)
+                            if(H5O_chunk_unprotect(f, dxpl_id, oh, null_chk_proxy, H5AC__DIRTIED_FLAG) < 0)
                                 HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
-                            if(H5O_chunk_unprotect(f, dxpl_id, oh, curr_chk_proxy, H5AC2__DIRTIED_FLAG) < 0)
+                            if(H5O_chunk_unprotect(f, dxpl_id, oh, curr_chk_proxy, H5AC__DIRTIED_FLAG) < 0)
                                 HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
 
                             /* Check for gap in null message's chunk */
@@ -1373,7 +1373,7 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                                 null_msg->dirty = TRUE;
 
                                 /* Release null message's chunk, marking it dirty */
-                                if(H5O_chunk_unprotect(f, dxpl_id, oh, null_chk_proxy, H5AC2__DIRTIED_FLAG) < 0)
+                                if(H5O_chunk_unprotect(f, dxpl_id, oh, null_chk_proxy, H5AC__DIRTIED_FLAG) < 0)
                                     HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
 
                                 /* Add the gap to the chunk */
@@ -1392,7 +1392,7 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                                 null_msg->dirty = TRUE;
 
                                 /* Release null message's chunk, marking it dirty */
-                                if(H5O_chunk_unprotect(f, dxpl_id, oh, null_chk_proxy, H5AC2__DIRTIED_FLAG) < 0)
+                                if(H5O_chunk_unprotect(f, dxpl_id, oh, null_chk_proxy, H5AC__DIRTIED_FLAG) < 0)
                                     HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
 
                                 /* Create new null message for previous location of non-null message */
@@ -1419,7 +1419,7 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                             oh->mesg[new_null_msg].dirty = TRUE;
 
                             /* Release new null message's chunk, marking it dirty */
-                            if(H5O_chunk_unprotect(f, dxpl_id, oh, curr_chk_proxy, H5AC2__DIRTIED_FLAG) < 0)
+                            if(H5O_chunk_unprotect(f, dxpl_id, oh, curr_chk_proxy, H5AC__DIRTIED_FLAG) < 0)
                                 HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
 
                             /* Check for gap in new null message's chunk */
@@ -1553,7 +1553,7 @@ H5O_merge_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                             curr_msg->dirty = TRUE;
 
                             /* Release new null message's chunk, marking it dirty */
-                            if(H5O_chunk_unprotect(f, dxpl_id, oh, curr_chk_proxy, H5AC2__DIRTIED_FLAG) < 0)
+                            if(H5O_chunk_unprotect(f, dxpl_id, oh, curr_chk_proxy, H5AC__DIRTIED_FLAG) < 0)
                                 HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
 
                             /* Remove second message from list of messages */
@@ -1695,11 +1695,11 @@ H5O_remove_empty_chunks(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
                         unsigned chk_proxy_status = 0;  /* Metadata cache status of chunk proxy for chunk */
 
                         /* Check the chunk proxy's status in the metadata cache */
-                        if(H5AC2_get_entry_status(f, oh->chunk[u].addr, &chk_proxy_status) < 0)
+                        if(H5AC_get_entry_status(f, oh->chunk[u].addr, &chk_proxy_status) < 0)
                             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to check metadata cache status for chunk proxy")
 
                         /* If the entry is in the cache, update its chunk index */
-                        if(chk_proxy_status & H5AC2_ES__IN_CACHE) {
+                        if(chk_proxy_status & H5AC_ES__IN_CACHE) {
                             if(H5O_chunk_update_idx(f, dxpl_id, oh, u) < 0)
                                 HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "unable to update index for chunk proxy")
                         } /* end if */
diff --git a/src/H5Oattribute.c b/src/H5Oattribute.c
index 244dd5e..cad15ce 100644
--- a/src/H5Oattribute.c
+++ b/src/H5Oattribute.c
@@ -233,7 +233,7 @@ H5O_attr_create(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
     HDassert(attr);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_WRITE)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Pin the object header */
@@ -241,7 +241,7 @@ H5O_attr_create(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Unprotect the object header */
-    if(H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
 
     /* Check if this object already has attribute information */
@@ -490,7 +490,7 @@ H5O_attr_open_by_name(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
     HDassert(name);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, NULL, "unable to load object header")
 
     /* Check for attribute info stored */
@@ -535,7 +535,7 @@ H5O_attr_open_by_name(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
     }
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -621,7 +621,7 @@ H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type,
 
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, NULL, "unable to load object header")
 
     /* Check for attribute info stored */
@@ -649,7 +649,7 @@ H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type,
     }
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -824,7 +824,7 @@ H5O_attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
 {
     H5O_iter_wrt_t *udata = (H5O_iter_wrt_t *)_udata;   /* Operator user data */
     H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that message is in */
-    unsigned chk_flags = H5AC2__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
+    unsigned chk_flags = H5AC__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
     herr_t ret_value = H5_ITER_CONT;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5O_attr_write_cb)
@@ -853,7 +853,7 @@ H5O_attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
 
         /* Mark the message as modified */
         mesg->dirty = TRUE;
-        chk_flags |= H5AC2__DIRTIED_FLAG;
+        chk_flags |= H5AC__DIRTIED_FLAG;
 
         /* Release chunk */
         if(H5O_chunk_unprotect(udata->f, udata->dxpl_id, oh, chk_proxy, chk_flags) < 0)
@@ -910,7 +910,7 @@ H5O_attr_write(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
     HDassert(attr);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_WRITE)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Pin the object header */
@@ -918,7 +918,7 @@ H5O_attr_write(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Unprotect the object header */
-    if(H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
 
     /* Check for attribute info stored */
@@ -1032,7 +1032,7 @@ H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
 {
     H5O_iter_ren_t *udata = (H5O_iter_ren_t *)_udata;   /* Operator user data */
     H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that message is in */
-    unsigned chk_flags = H5AC2__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
+    unsigned chk_flags = H5AC__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
     herr_t ret_value = H5_ITER_CONT;   /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5O_attr_rename_mod_cb)
@@ -1060,7 +1060,7 @@ H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
 
         /* Mark the message as modified */
         mesg->dirty = TRUE;
-        chk_flags |= H5AC2__DIRTIED_FLAG;
+        chk_flags |= H5AC__DIRTIED_FLAG;
 
         /* Release chunk */
         if(H5O_chunk_unprotect(udata->f, udata->dxpl_id, oh, chk_proxy, chk_flags) < 0)
@@ -1162,7 +1162,7 @@ H5O_attr_rename(const H5O_loc_t *loc, hid_t dxpl_id, const char *old_name,
     HDassert(new_name);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_WRITE)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Pin the object header */
@@ -1170,7 +1170,7 @@ H5O_attr_rename(const H5O_loc_t *loc, hid_t dxpl_id, const char *old_name,
         HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Unprotect the object header */
-    if(H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
 
     /* Check for attribute info stored */
@@ -1260,7 +1260,7 @@ H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, hid_t dxpl_id,
     HDassert(attr_op);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
@@ -1276,7 +1276,7 @@ H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, hid_t dxpl_id,
             HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid index specified")
 
         /* Release the object header */
-        if(H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+        if(H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
         oh = NULL;
 
@@ -1291,7 +1291,7 @@ H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, hid_t dxpl_id,
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "error building attribute table")
 
         /* Release the object header */
-        if(H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+        if(H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
             HGOTO_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
         oh = NULL;
 
@@ -1306,7 +1306,7 @@ H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, hid_t dxpl_id,
 
 done:
     /* Release resources */
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
     if(atable.attrs && H5A_attr_release_table(&atable) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTFREE, FAIL, "unable to release attribute table")
@@ -1553,7 +1553,7 @@ H5O_attr_remove(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
     HDassert(name);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_WRITE)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Pin the object header */
@@ -1561,7 +1561,7 @@ H5O_attr_remove(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Unprotect the object header */
-    if(H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
 
     /* Check for attribute info stored */
@@ -1643,7 +1643,7 @@ H5O_attr_remove_by_idx(const H5O_loc_t *loc, H5_index_t idx_type,
     HDassert(loc);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_WRITE)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Pin the object header */
@@ -1651,7 +1651,7 @@ H5O_attr_remove_by_idx(const H5O_loc_t *loc, H5_index_t idx_type,
         HGOTO_ERROR(H5E_ATTR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Unprotect the object header */
-    if(H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
 
     /* Check for attribute info stored */
@@ -1830,7 +1830,7 @@ H5O_attr_exists(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
     HDassert(name);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
@@ -1866,7 +1866,7 @@ H5O_attr_exists(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
     } /* end else */
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1968,14 +1968,14 @@ H5O_attr_count(const H5O_loc_t *loc, hid_t dxpl_id)
     HDassert(loc);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_ATTR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Retrieve # of attributes on object */
     ret_value = (int)H5O_attr_count_real(loc->file, dxpl_id, oh);
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_ATTR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index f6b5cbb..158f432 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -94,8 +94,8 @@ static herr_t H5O_add_cont_msg(H5O_cont_msgs_t *cont_msg_info,
 /*********************/
 
 /* H5O object header prefix inherits cache-like properties from H5AC */
-const H5AC2_class_t H5AC2_OHDR[1] = {{
-    H5AC2_OHDR_ID,
+const H5AC_class_t H5AC_OHDR[1] = {{
+    H5AC_OHDR_ID,
     "object header",
     H5FD_MEM_OHDR,
     H5O_cache_deserialize,
@@ -106,8 +106,8 @@ const H5AC2_class_t H5AC2_OHDR[1] = {{
 }};
 
 /* H5O object header chunk inherits cache-like properties from H5AC */
-const H5AC2_class_t H5AC2_OHDR_CHK[1] = {{
-    H5AC2_OHDR_CHK_ID,
+const H5AC_class_t H5AC_OHDR_CHK[1] = {{
+    H5AC_OHDR_CHK_ID,
     "object header chunk",
     H5FD_MEM_OHDR,
     H5O_cache_chk_deserialize,
diff --git a/src/H5Ochunk.c b/src/H5Ochunk.c
index 813006e..0420799 100644
--- a/src/H5Ochunk.c
+++ b/src/H5Ochunk.c
@@ -114,7 +114,7 @@ H5O_chunk_add(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
     chk_proxy->chunkno = idx;
 
     /* Insert the chunk proxy into the cache */
-    if(H5AC2_set(f, dxpl_id, H5AC2_OHDR_CHK, oh->chunk[idx].addr, oh->chunk[idx].size, chk_proxy, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, oh->chunk[idx].size, chk_proxy, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "unable to cache object header chunk")
     chk_proxy = NULL;
 
@@ -175,7 +175,7 @@ H5O_chunk_protect(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
         chk_udata.chunkno = idx;
 
         /* Get the chunk proxy */
-        if(NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC2_protect(f, dxpl_id, H5AC2_OHDR_CHK, oh->chunk[idx].addr, oh->chunk[idx].size, &chk_udata, H5AC2_WRITE)))
+        if(NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC_protect(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, oh->chunk[idx].size, &chk_udata, H5AC_WRITE)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header chunk")
 
         /* Sanity check */
@@ -217,20 +217,20 @@ H5O_chunk_unprotect(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_chunk_proxy_t *chk_p
     HDassert(f);
     HDassert(oh);
     HDassert(chk_proxy);
-    HDassert(!(chk_flags & (unsigned)~(H5AC2__DIRTIED_FLAG | H5AC2__SIZE_CHANGED_FLAG)));
+    HDassert(!(chk_flags & (unsigned)~(H5AC__DIRTIED_FLAG | H5AC__SIZE_CHANGED_FLAG)));
 
     /* Check for releasing first chunk */
     if(0 == chk_proxy->chunkno) {
         /* Check for resizing the first chunk */
-        if(chk_flags & H5AC2__SIZE_CHANGED_FLAG) {
+        if(chk_flags & H5AC__SIZE_CHANGED_FLAG) {
             /* Resize object header in cache */
-            if(H5AC2_resize_pinned_entry(oh, oh->chunk[0].size) < 0)
+            if(H5AC_resize_pinned_entry(oh, oh->chunk[0].size) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTRESIZE, FAIL, "unable to resize chunk in cache")
         } /* end if */
         /* Check for dirtying the first chunk */
-        else if(chk_flags & H5AC2__DIRTIED_FLAG) {
+        else if(chk_flags & H5AC__DIRTIED_FLAG) {
             /* Mark object header as dirty in cache */
-            if(H5AC2_mark_pinned_or_protected_entry_dirty(oh) < 0)
+            if(H5AC_mark_pinned_or_protected_entry_dirty(oh) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty")
         } /* end else/if */
         else
@@ -244,7 +244,7 @@ H5O_chunk_unprotect(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_chunk_proxy_t *chk_p
     } /* end if */
     else {
         /* Release the chunk proxy from the cache, marking it dirty */
-        if(H5AC2_unprotect(f, dxpl_id, H5AC2_OHDR_CHK, oh->chunk[chk_proxy->chunkno].addr, oh->chunk[chk_proxy->chunkno].size, chk_proxy, chk_flags) < 0)
+        if(H5AC_unprotect(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[chk_proxy->chunkno].addr, oh->chunk[chk_proxy->chunkno].size, chk_proxy, chk_flags) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header chunk")
     } /* end else */
 
@@ -289,14 +289,14 @@ H5O_chunk_update_idx(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
     chk_udata.chunkno = idx;
 
     /* Get the chunk proxy */
-    if(NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC2_protect(f, dxpl_id, H5AC2_OHDR_CHK, oh->chunk[idx].addr, oh->chunk[idx].size, &chk_udata, H5AC2_WRITE)))
+    if(NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC_protect(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, oh->chunk[idx].size, &chk_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
 
     /* Update index for chunk proxy in cache */
     chk_proxy->chunkno = idx;
 
     /* Release the chunk proxy from the cache, marking it deleted */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_OHDR_CHK, oh->chunk[idx].addr, oh->chunk[idx].size, chk_proxy, H5AC2__DIRTIED_FLAG) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, oh->chunk[idx].size, chk_proxy, H5AC__DIRTIED_FLAG) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header chunk")
 
 done:
@@ -340,7 +340,7 @@ H5O_chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
     chk_udata.chunkno = idx;
 
     /* Get the chunk proxy */
-    if(NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC2_protect(f, dxpl_id, H5AC2_OHDR_CHK, oh->chunk[idx].addr, oh->chunk[idx].size, &chk_udata, H5AC2_WRITE)))
+    if(NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC_protect(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, oh->chunk[idx].size, &chk_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
 
     /* Sanity check */
@@ -348,7 +348,7 @@ H5O_chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
     HDassert(chk_proxy->chunkno == idx);
 
     /* Release the chunk proxy from the cache, marking it deleted */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_OHDR_CHK, oh->chunk[idx].addr, oh->chunk[idx].size, chk_proxy, (H5AC2__DIRTIED_FLAG | H5AC2__DELETED_FLAG)) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_OHDR_CHK, oh->chunk[idx].addr, oh->chunk[idx].size, chk_proxy, (H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header chunk")
 
 done:
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c
index 7edad1e..94c7646 100644
--- a/src/H5Ocopy.c
+++ b/src/H5Ocopy.c
@@ -34,7 +34,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FLprivate.h"	/* Free lists                           */
 #include "H5Iprivate.h"		/* IDs			  		*/
@@ -187,7 +187,7 @@ H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
 
     herr_t      ret_value = SUCCEED;        /* Return value */
 
-    FUNC_ENTER_API_META(H5Ocopy, dst_loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Ocopy, dst_loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name,
              ocpypl_id, lcpl_id);
 
@@ -213,7 +213,7 @@ H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
         H5G_loc_reset(&tmp_loc);
 
         /* Check if object already exists in destination */
-        if(H5G_loc_find(&dst_loc, dst_name, &tmp_loc, H5P_DEFAULT, H5AC2_dxpl_id) >= 0) {
+        if(H5G_loc_find(&dst_loc, dst_name, &tmp_loc, H5P_DEFAULT, H5AC_dxpl_id) >= 0) {
             H5G_name_free(&tmp_path);
             HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "destination object already exists")
         } /* end if */
@@ -225,7 +225,7 @@ H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
     H5G_loc_reset(&src_loc);
 
     /* Find the source object to copy */
-    if(H5G_loc_find(&loc, src_name, &src_loc/*out*/, H5P_DEFAULT, H5AC2_dxpl_id) < 0)
+    if(H5G_loc_find(&loc, src_name, &src_loc/*out*/, H5P_DEFAULT, H5AC_dxpl_id) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "source object not found")
     loc_found = TRUE;
 
@@ -317,7 +317,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */,
     HDassert(cpy_info);
 
     /* Get source object header */
-    if(NULL == (oh_src = H5O_protect(oloc_src, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh_src = H5O_protect(oloc_src, dxpl_id, H5AC_READ)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Get pointer to object class for this object */
@@ -720,7 +720,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */,
     } /* end if */
 
     /* Insert destination object header in cache */
-    if(H5AC2_set(oloc_dst->file, dxpl_id, H5AC2_OHDR, oloc_dst->addr, (size_t)dst_oh_size, oh_dst, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(oloc_dst->file, dxpl_id, H5AC_OHDR, oloc_dst->addr, (size_t)dst_oh_size, oh_dst, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "unable to cache object header")
     oh_dst = NULL;
 
@@ -730,7 +730,7 @@ done:
         HDfree(deleted);
 
     /* Release pointer to source object header and its derived objects */
-    if(oh_src && H5O_unprotect(oloc_src, dxpl_id, oh_src, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh_src && H5O_unprotect(oloc_src, dxpl_id, oh_src, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     /* Release pointer to destination object header */
@@ -942,7 +942,7 @@ H5O_copy_obj(H5G_loc_t *src_loc, H5G_loc_t *dst_loc, const char *dst_name,
     hid_t ocpypl_id, hid_t lcpl_id)
 {
     H5P_genplist_t  *ocpy_plist=NULL;           /* Object copy property list created */
-    hid_t           dxpl_id=H5AC2_dxpl_id;
+    hid_t           dxpl_id=H5AC_dxpl_id;
     H5G_name_t      new_path;                   /* Copied object group hier. path */
     H5O_loc_t       new_oloc;                   /* Copied object object location */
     H5G_loc_t       new_loc;                    /* Group location of object copied */
diff --git a/src/H5Odbg.c b/src/H5Odbg.c
index 3767852..b751e14 100644
--- a/src/H5Odbg.c
+++ b/src/H5Odbg.c
@@ -538,14 +538,14 @@ H5O_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int f
     loc.addr = addr;
     loc.holding_file = FALSE;
 
-    if(NULL == (oh = H5O_protect(&loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(&loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* debug */
     H5O_debug_real(f, dxpl_id, oh, addr, stream, indent, fwidth);
 
 done:
-    if(oh && H5O_unprotect(&loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(&loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Oefl.c b/src/H5Oefl.c
index 49a183e..d6e6ede 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -122,7 +122,7 @@ H5O_efl_decode(H5F_t *f, hid_t dxpl_id, unsigned UNUSED mesg_flags,
 #ifndef NDEBUG
     HDassert(H5F_addr_defined(mesg->heap_addr));
 
-    if(NULL == (heap = H5HL_protect(f, dxpl_id, mesg->heap_addr, H5AC2_READ)))
+    if(NULL == (heap = H5HL_protect(f, dxpl_id, mesg->heap_addr, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read protect link value")
 
     s = H5HL_offset_into(heap, 0);
@@ -139,7 +139,7 @@ H5O_efl_decode(H5F_t *f, hid_t dxpl_id, unsigned UNUSED mesg_flags,
     if(NULL == mesg->slot)
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
-    if(NULL == (heap = H5HL_protect(f, dxpl_id, mesg->heap_addr, H5AC2_READ)))
+    if(NULL == (heap = H5HL_protect(f, dxpl_id, mesg->heap_addr, H5AC_READ)))
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "unable to read protect link value")
     for(u = 0; u < mesg->nused; u++) {
 	/* Name */
@@ -450,7 +450,7 @@ H5O_efl_copy_file(H5F_t UNUSED *file_src, void *mesg_src, H5F_t *file_dst,
         HGOTO_ERROR(H5E_EFL, H5E_CANTINIT, NULL, "can't create heap")
 
     /* Pin the heap down in memory */
-    if(NULL == (heap = H5HL_protect(file_dst, dxpl_id, efl_dst->heap_addr, H5AC2_WRITE)))
+    if(NULL == (heap = H5HL_protect(file_dst, dxpl_id, efl_dst->heap_addr, H5AC_WRITE)))
         HGOTO_ERROR(H5E_EFL, H5E_PROTECT, NULL, "unable to protect EFL file name heap")
 
     /* Insert "empty" name first */
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index fdbac17..9f7a0fc 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -23,7 +23,7 @@
 #define H5O_PACKAGE		/*suppress error about including H5Opkg	  */
 
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Dprivate.h"		/* Datasets				*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FLprivate.h"	/* Free Lists				*/
@@ -523,7 +523,7 @@ H5O_fill_copy(const void *_src, void *_dst)
             H5T_path_t *tpath;      /* Conversion information */
 
             /* Set up type conversion function */
-            if(NULL == (tpath = H5T_path_find(src->type, dst->type, NULL, NULL, H5AC2_ind_dxpl_id, FALSE)))
+            if(NULL == (tpath = H5T_path_find(src->type, dst->type, NULL, NULL, H5AC_ind_dxpl_id, FALSE)))
                 HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, NULL, "unable to convert between src and dst data types")
 
             /* If necessary, convert fill value datatypes (which copies VL components, etc.) */
@@ -551,7 +551,7 @@ H5O_fill_copy(const void *_src, void *_dst)
                 } /* end if */
 
                 /* Convert fill value */
-                if(H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, dst->buf, bkg_buf, H5AC2_ind_dxpl_id) < 0) {
+                if(H5T_convert(tpath, src_id, dst_id, (size_t)1, (size_t)0, (size_t)0, dst->buf, bkg_buf, H5AC_ind_dxpl_id) < 0) {
                     H5I_dec_ref(src_id);
                     H5I_dec_ref(dst_id);
                     if(bkg_buf)
diff --git a/src/H5Omdj_msg.c b/src/H5Omdj_msg.c
index 954f61f..e4cb0b5 100644
--- a/src/H5Omdj_msg.c
+++ b/src/H5Omdj_msg.c
@@ -176,7 +176,7 @@ H5O_mdj_msg_decode(H5F_t *f,
     /* get the journal file path length */
     UINT32DECODE(p, path_len);
 
-    if ( path_len > H5C2__MAX_JOURNAL_FILE_NAME_LEN ) {
+    if ( path_len > H5C__MAX_JOURNAL_FILE_NAME_LEN ) {
 
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "path length too big.")
     }
@@ -251,7 +251,7 @@ H5O_mdj_msg_encode(H5F_t *f,
 	HGOTO_ERROR(H5E_SYSTEM, H5E_SYSERRSTR, FAIL, "Bad params on entry.");
     }
 
-    if ( mesg->mdc_jnl_file_name_len > H5C2__MAX_JOURNAL_FILE_NAME_LEN ) {
+    if ( mesg->mdc_jnl_file_name_len > H5C__MAX_JOURNAL_FILE_NAME_LEN ) {
 
         HGOTO_ERROR(H5E_SYSTEM, H5E_SYSERRSTR, FAIL, \
         	"Bad params on entry -- path len too long.");
@@ -315,7 +315,7 @@ H5O_mdj_msg_copy(const void *_mesg, void *_dest)
     /* Sanity check */
     HDassert(mesg);
 
-    if ( mesg->mdc_jnl_file_name_len > H5C2__MAX_JOURNAL_FILE_NAME_LEN ) {
+    if ( mesg->mdc_jnl_file_name_len > H5C__MAX_JOURNAL_FILE_NAME_LEN ) {
 
         HGOTO_ERROR(H5E_SYSTEM, H5E_SYSERRSTR, FAIL, "path len too long.");
     }
diff --git a/src/H5Omessage.c b/src/H5Omessage.c
index d3c14cd..b3bda5f 100644
--- a/src/H5Omessage.c
+++ b/src/H5Omessage.c
@@ -132,7 +132,7 @@ H5O_msg_create(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags,
 	HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "no write intent on file")
 
     /* Protect the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_WRITE)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Pin the object header */
@@ -140,7 +140,7 @@ H5O_msg_create(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags,
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Unprotect the object header */
-    if(H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
 
     /* Go append message to object header */
@@ -293,7 +293,7 @@ H5O_msg_write(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags,
 	HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "no write intent on file")
 
     /* Protect the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_WRITE)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Pin the object header */
@@ -301,7 +301,7 @@ H5O_msg_write(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags,
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Unprotect the object header */
-    if(H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
 
     /* Call the "real" modify routine */
@@ -500,7 +500,7 @@ H5O_msg_read(const H5O_loc_t *loc, unsigned type_id, void *mesg,
     HDassert(type_id < NELMTS(H5O_msg_class_g));
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header")
 
     /* Call the "real" read routine */
@@ -508,7 +508,7 @@ H5O_msg_read(const H5O_loc_t *loc, unsigned type_id, void *mesg,
 	HGOTO_ERROR(H5E_OHDR, H5E_READERROR, NULL, "unable to load object header")
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -825,14 +825,14 @@ H5O_msg_count(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
     HDassert(type);
 
     /* Load the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Count the messages of the correct type */
     ret_value = H5O_msg_count_real(oh, type);
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -906,7 +906,7 @@ H5O_msg_exists(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
     HDassert(type_id < NELMTS(H5O_msg_class_g));
 
     /* Load the object header */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Call the "real" exists routine */
@@ -914,7 +914,7 @@ H5O_msg_exists(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
 	HGOTO_ERROR(H5E_OHDR, H5E_READERROR, FAIL, "unable to verify object header message")
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1003,7 +1003,7 @@ H5O_msg_remove(const H5O_loc_t *loc, unsigned type_id, int sequence, hbool_t adj
     HDassert(type);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_WRITE)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Pin the object header */
@@ -1011,7 +1011,7 @@ H5O_msg_remove(const H5O_loc_t *loc, unsigned type_id, int sequence, hbool_t adj
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Unprotect the object header */
-    if(H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
 
     /* Call the "real" remove routine */
@@ -1063,7 +1063,7 @@ H5O_msg_remove_op(const H5O_loc_t *loc, unsigned type_id, int sequence,
     HDassert(type);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_WRITE)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Pin the object header */
@@ -1071,7 +1071,7 @@ H5O_msg_remove_op(const H5O_loc_t *loc, unsigned type_id, int sequence,
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Unprotect the object header */
-    if(H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header")
 
     /* Call the "real" remove routine */
@@ -1262,7 +1262,7 @@ H5O_msg_iterate(const H5O_loc_t *loc, unsigned type_id,
     HDassert(op);
 
     /* Protect the object header to iterate over */
-    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Call the "real" iterate routine */
@@ -1270,7 +1270,7 @@ H5O_msg_iterate(const H5O_loc_t *loc, unsigned type_id,
         HERROR(H5E_OHDR, H5E_BADITER, "unable to iterate over object header messages");
 
 done:
-    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1368,7 +1368,7 @@ done:
             HDONE_ERROR(H5E_OHDR, H5E_CANTUPDATE, FAIL, "unable to update time on object")
 
         /* Mark object header as dirty in cache */
-        if(H5AC2_mark_pinned_or_protected_entry_dirty(oh) < 0)
+        if(H5AC_mark_pinned_or_protected_entry_dirty(oh) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty")
     } /* end if */
 
@@ -1996,7 +1996,7 @@ H5O_copy_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx,
 {
     H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that message is in */
     H5O_mesg_t *idx_msg = &oh->mesg[idx];       /* Pointer to message to modify */
-    unsigned chk_flags = H5AC2__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
+    unsigned chk_flags = H5AC__NO_FLAGS_SET;   /* Flags for unprotecting chunk */
     herr_t      ret_value = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5O_copy_mesg)
@@ -2024,7 +2024,7 @@ H5O_copy_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx,
 
     /* Mark the message as modified */
     idx_msg->dirty = TRUE;
-    chk_flags |= H5AC2__DIRTIED_FLAG;
+    chk_flags |= H5AC__DIRTIED_FLAG;
 
     /* Release chunk */
     if(H5O_chunk_unprotect(f, dxpl_id, oh, chk_proxy, chk_flags) < 0)
diff --git a/src/H5Opkg.h b/src/H5Opkg.h
index d18d7e6..a256f3d 100644
--- a/src/H5Opkg.h
+++ b/src/H5Opkg.h
@@ -24,7 +24,7 @@
 #include "H5Oprivate.h"		/* Object headers		  	*/
 
 /* Other private headers needed by this file */
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"        /* Metadata cache                       */
 
 /* Object header macros */
 #define H5O_NMESGS	8 		/*initial number of messages	     */
@@ -246,7 +246,7 @@ typedef struct H5O_chunk_t {
 } H5O_chunk_t;
 
 struct H5O_t {
-    H5AC2_info_t cache_info;    /* Information for metadata cache functions, _must_ be */
+    H5AC_info_t cache_info;    /* Information for metadata cache functions, _must_ be */
                                 /* first field in structure */
 
     /* File-specific information (not stored) */
@@ -347,7 +347,7 @@ typedef struct H5O_cache_ud_t {
 
 /* Structure representing each chunk in the cache */
 typedef struct H5O_chunk_proxy_t {
-    H5AC2_info_t cache_info;    /* Information for metadata cache functions, _must_ be */
+    H5AC_info_t cache_info;    /* Information for metadata cache functions, _must_ be */
                                 /* first field in structure */
 
     H5O_t       *oh;                    /* Object header for this chunk */
@@ -363,11 +363,11 @@ typedef struct H5O_chk_cache_ud_t {
 } H5O_chk_cache_ud_t;
 
 
-/* H5O object header inherits cache-like properties from H5AC2 */
-H5_DLLVAR const H5AC2_class_t H5AC2_OHDR[1];
+/* H5O object header inherits cache-like properties from H5AC */
+H5_DLLVAR const H5AC_class_t H5AC_OHDR[1];
 
-/* H5O object header chunk inherits cache-like properties from H5AC2 */
-H5_DLLVAR const H5AC2_class_t H5AC2_OHDR_CHK[1];
+/* H5O object header chunk inherits cache-like properties from H5AC */
+H5_DLLVAR const H5AC_class_t H5AC_OHDR_CHK[1];
 
 /* Header message ID to class mapping */
 H5_DLLVAR const H5O_msg_class_t *const H5O_msg_class_g[H5O_MSG_TYPES];
diff --git a/src/H5Oprivate.h b/src/H5Oprivate.h
index 657b3b5..a960ff8 100644
--- a/src/H5Oprivate.h
+++ b/src/H5Oprivate.h
@@ -37,7 +37,7 @@
 #include "H5Spublic.h"		/* Dataspace functions			*/
 
 /* Private headers needed by this file */
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"        /* Metadata cache                       */
 #include "H5Fprivate.h"		/* File access				*/
 #include "H5SLprivate.h"	/* Skip lists				*/
 #include "H5Tprivate.h"		/* Datatype functions			*/
@@ -532,7 +532,7 @@ typedef uint32_t H5O_refcount_t;        /* Contains # of links to object, if >1
  *	The value of this field is undefined unless mdc_jnl_enabled is TRUE.
  *
  * mdc_jnl_file_name: Array of char of length
- *	H5C2__MAX_JOURNAL_FILE_NAME_LEN + 1 used to store the journal
+ *	H5C__MAX_JOURNAL_FILE_NAME_LEN + 1 used to store the journal
  *	file path.
  *
  *	The value of this field is undefined unless mdc_jnl_enabled is TRUE.
@@ -546,7 +546,7 @@ typedef struct H5O_mdj_msg_t {
     hbool_t	mdc_jnl_enabled;
     int32_t     mdc_jnl_magic;
     size_t      mdc_jnl_file_name_len;
-    char        mdc_jnl_file_name[H5C2__MAX_JOURNAL_FILE_NAME_LEN + 1];
+    char        mdc_jnl_file_name[H5C__MAX_JOURNAL_FILE_NAME_LEN + 1];
 
 } H5O_mdj_msg_t;
 
@@ -596,7 +596,7 @@ H5_DLL herr_t H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint,
 H5_DLL herr_t H5O_open(H5O_loc_t *loc);
 H5_DLL herr_t H5O_close(H5O_loc_t *loc);
 H5_DLL int H5O_link(const H5O_loc_t *loc, int adjust, hid_t dxpl_id);
-H5_DLL H5O_t *H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC2_protect_t prot);
+H5_DLL H5O_t *H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot);
 H5_DLL herr_t H5O_pin(H5O_t *oh);
 H5_DLL herr_t H5O_unpin(H5O_t *oh);
 H5_DLL herr_t H5O_unprotect(const H5O_loc_t *loc, hid_t dxpl_id, H5O_t *oh,
diff --git a/src/H5Otest.c b/src/H5Otest.c
index eade638..b670dea 100644
--- a/src/H5Otest.c
+++ b/src/H5Otest.c
@@ -33,7 +33,7 @@
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Apkg.h"		/* Attributes	  			*/
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Iprivate.h"		/* IDs			  		*/
 #include "H5Opkg.h"             /* Object headers			*/
@@ -108,12 +108,12 @@ H5O_is_attr_dense_test(hid_t oid)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC2_ind_dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, H5AC_ind_dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1 && NULL == H5A_get_ainfo(loc->file, H5AC2_ind_dxpl_id, oh, &ainfo))
+    if(oh->version > H5O_VERSION_1 && NULL == H5A_get_ainfo(loc->file, H5AC_ind_dxpl_id, oh, &ainfo))
         /* Clear error stack from not finding attribute info */
         H5E_clear_stack(NULL);
 
@@ -128,7 +128,7 @@ H5O_is_attr_dense_test(hid_t oid)
         ret_value = FALSE;
 
 done:
-    if(oh && H5O_unprotect(loc, H5AC2_ind_dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, H5AC_ind_dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -170,12 +170,12 @@ H5O_is_attr_empty_test(hid_t oid)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC2_ind_dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, H5AC_ind_dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1 && NULL == (ainfo_ptr = H5A_get_ainfo(loc->file, H5AC2_ind_dxpl_id, oh, &ainfo)))
+    if(oh->version > H5O_VERSION_1 && NULL == (ainfo_ptr = H5A_get_ainfo(loc->file, H5AC_ind_dxpl_id, oh, &ainfo)))
         /* Clear error stack from not finding attribute info */
         H5E_clear_stack(NULL);
 
@@ -191,7 +191,7 @@ H5O_is_attr_empty_test(hid_t oid)
                 HDassert(nattrs == 0);
 
                 /* Retrieve # of records in name index */
-                if(H5B2_get_nrec(loc->file, H5AC2_ind_dxpl_id, H5A_BT2_NAME, ainfo.name_bt2_addr, &nattrs) < 0)
+                if(H5B2_get_nrec(loc->file, H5AC_ind_dxpl_id, H5A_BT2_NAME, ainfo.name_bt2_addr, &nattrs) < 0)
                     HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index")
             } /* end if */
 
@@ -206,7 +206,7 @@ H5O_is_attr_empty_test(hid_t oid)
     ret_value = (nattrs == 0) ? TRUE : FALSE;
 
 done:
-    if(oh && H5O_unprotect(loc, H5AC2_ind_dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, H5AC_ind_dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -248,12 +248,12 @@ H5O_num_attrs_test(hid_t oid, hsize_t *nattrs)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC2_ind_dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, H5AC_ind_dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1 && NULL == H5A_get_ainfo(loc->file, H5AC2_ind_dxpl_id, oh, &ainfo))
+    if(oh->version > H5O_VERSION_1 && NULL == H5A_get_ainfo(loc->file, H5AC_ind_dxpl_id, oh, &ainfo))
         /* Clear error stack from not finding attribute info */
         H5E_clear_stack(NULL);
 
@@ -268,7 +268,7 @@ H5O_num_attrs_test(hid_t oid, hsize_t *nattrs)
             HDassert(obj_nattrs == 0);
 
             /* Retrieve # of records in name index */
-            if(H5B2_get_nrec(loc->file, H5AC2_ind_dxpl_id, H5A_BT2_NAME, ainfo.name_bt2_addr, &obj_nattrs) < 0)
+            if(H5B2_get_nrec(loc->file, H5AC_ind_dxpl_id, H5A_BT2_NAME, ainfo.name_bt2_addr, &obj_nattrs) < 0)
                 HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index")
         } /* end if */
 
@@ -280,7 +280,7 @@ H5O_num_attrs_test(hid_t oid, hsize_t *nattrs)
     *nattrs = obj_nattrs;
 
 done:
-    if(oh && H5O_unprotect(loc, H5AC2_ind_dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, H5AC_ind_dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -323,12 +323,12 @@ H5O_attr_dense_info_test(hid_t oid, hsize_t *name_count, hsize_t *corder_count)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC2_ind_dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, H5AC_ind_dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Check for attribute info stored */
     ainfo.fheap_addr = HADDR_UNDEF;
-    if(oh->version > H5O_VERSION_1 && NULL == H5A_get_ainfo(loc->file, H5AC2_ind_dxpl_id, oh, &ainfo))
+    if(oh->version > H5O_VERSION_1 && NULL == H5A_get_ainfo(loc->file, H5AC_ind_dxpl_id, oh, &ainfo))
         /* Clear error stack from not finding attribute info */
         H5E_clear_stack(NULL);
 
@@ -339,20 +339,20 @@ H5O_attr_dense_info_test(hid_t oid, hsize_t *name_count, hsize_t *corder_count)
         HGOTO_DONE(FAIL)
 
     /* Retrieve # of records in name index */
-    if(H5B2_get_nrec(loc->file, H5AC2_ind_dxpl_id, H5A_BT2_NAME, ainfo.name_bt2_addr, name_count) < 0)
+    if(H5B2_get_nrec(loc->file, H5AC_ind_dxpl_id, H5A_BT2_NAME, ainfo.name_bt2_addr, name_count) < 0)
         HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index")
 
     /* Check if there is a creation order index */
     if(H5F_addr_defined(ainfo.corder_bt2_addr)) {
         /* Retrieve # of records in creation order index */
-        if(H5B2_get_nrec(loc->file, H5AC2_ind_dxpl_id, H5A_BT2_CORDER, ainfo.corder_bt2_addr, corder_count) < 0)
+        if(H5B2_get_nrec(loc->file, H5AC_ind_dxpl_id, H5A_BT2_CORDER, ainfo.corder_bt2_addr, corder_count) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from creation order index")
     } /* end if */
     else
         *corder_count = 0;
 
 done:
-    if(oh && H5O_unprotect(loc, H5AC2_ind_dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, H5AC_ind_dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -396,7 +396,7 @@ H5O_check_msg_marked_test(hid_t oid, hbool_t flag_val)
         HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found")
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC2_ind_dxpl_id, H5AC2_READ)))
+    if(NULL == (oh = H5O_protect(loc, H5AC_ind_dxpl_id, H5AC_READ)))
 	HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Locate "unknown" message  */
@@ -415,7 +415,7 @@ H5O_check_msg_marked_test(hid_t oid, hbool_t flag_val)
         HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "'unknown' message type not found")
 
 done:
-    if(oh && H5O_unprotect(loc, H5AC2_ind_dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+    if(oh && H5O_unprotect(loc, H5AC_ind_dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 59e715b..2ee2802 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -35,7 +35,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Dprivate.h"		/* Datasets				*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Iprivate.h"		/* IDs			  		*/
@@ -2106,7 +2106,7 @@ H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value)
         HDmemcpy(fill.buf, value, (size_t)fill.size);
 
         /* Set up type conversion function */
-        if(NULL == (tpath = H5T_path_find(type, type, NULL, NULL, H5AC2_ind_dxpl_id, FALSE)))
+        if(NULL == (tpath = H5T_path_find(type, type, NULL, NULL, H5AC_ind_dxpl_id, FALSE)))
             HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "unable to convert between src and dest data types")
 
         /* If necessary, convert fill value datatypes (which copies VL components, etc.) */
@@ -2118,7 +2118,7 @@ H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
             /* Convert the fill value */
-            if(H5T_convert(tpath, type_id, type_id, (size_t)1, (size_t)0, (size_t)0, fill.buf, bkg_buf, H5AC2_ind_dxpl_id) < 0) {
+            if(H5T_convert(tpath, type_id, type_id, (size_t)1, (size_t)0, (size_t)0, fill.buf, bkg_buf, H5AC_ind_dxpl_id) < 0) {
                 if(bkg_buf)
                     bkg_buf = H5FL_BLK_FREE(type_conv, bkg_buf);
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, FAIL, "datatype conversion failed")
@@ -2273,7 +2273,7 @@ H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value/*out*/)
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Get the fill value */
-    if(H5P_get_fill_value(plist, type, value, H5AC2_ind_dxpl_id) < 0)
+    if(H5P_get_fill_value(plist, type, value, H5AC_ind_dxpl_id) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fill value")
 
 done:
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index b637555..fa67a7a 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -35,7 +35,7 @@
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5AC1private.h"	/* Metadata cache			*/
-#include "H5AC2private.h"	/* Metadata cache2			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Dprivate.h"		/* Datasets				*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Fprivate.h"		/* Files		  	*/
@@ -59,8 +59,8 @@
 /* Definitions for the initial metadata cache resize configuration */
 #define H5F_ACS_META_CACHE_INIT_CONFIG_SIZE	sizeof(H5AC1_cache_config_t)
 #define H5F_ACS_META_CACHE_INIT_CONFIG_DEF	H5AC1__DEFAULT_CACHE_CONFIG
-#define H5F_ACS_JNL_INIT_CONFIG_SIZE		sizeof(H5AC2_jnl_config_t)
-#define H5F_ACS_JNL_INIT_CONFIG_DEF		H5AC2__DEFAULT_JNL_CONFIG
+#define H5F_ACS_JNL_INIT_CONFIG_SIZE		sizeof(H5AC_jnl_config_t)
+#define H5F_ACS_JNL_INIT_CONFIG_DEF		H5AC__DEFAULT_JNL_CONFIG
 /* Definitions for size of raw data chunk cache(elements) */
 #define H5F_ACS_DATA_CACHE_ELMT_SIZE_SIZE       sizeof(size_t)
 #define H5F_ACS_DATA_CACHE_ELMT_SIZE_DEF        521
@@ -191,7 +191,7 @@ static herr_t
 H5P_facc_reg_prop(H5P_genclass_t *pclass)
 {
     H5AC1_cache_config_t mdc_initCacheCfg = H5F_ACS_META_CACHE_INIT_CONFIG_DEF;  /* Default metadata cache settings */
-    H5AC2_jnl_config_t initJnlCfg = H5F_ACS_JNL_INIT_CONFIG_DEF; /* Default journaling config settings */
+    H5AC_jnl_config_t initJnlCfg = H5F_ACS_JNL_INIT_CONFIG_DEF; /* Default journaling config settings */
     size_t rdcc_nelmts = H5F_ACS_DATA_CACHE_ELMT_SIZE_DEF;      /* Default raw data chunk cache # of elements */
     size_t rdcc_nbytes = H5F_ACS_DATA_CACHE_BYTE_SIZE_DEF;      /* Default raw data chunk cache # of bytes */
     double rdcc_w0 = H5F_ACS_PREEMPT_READ_CHUNKS_DEF;           /* Default raw data chunk cache dirty ratio */
@@ -1402,7 +1402,7 @@ H5Pget_mdc_config(hid_t plist_id, H5AC1_cache_config_t *config_ptr)
     if(config_ptr == NULL)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config_ptr on entry.")
 
-    if(!H5AC2_validate_cache_config_ver(config_ptr->version))
+    if(!H5AC_validate_cache_config_ver(config_ptr->version))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unknown config version.")
 
     /* If we ever support multiple versions of H5AC1_cache_config_t, we
@@ -1433,7 +1433,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pset_jnl_config(hid_t plist_id, const H5AC2_jnl_config_t *config_ptr)
+H5Pset_jnl_config(hid_t plist_id, const H5AC_jnl_config_t *config_ptr)
 {
     H5P_genplist_t *plist;              /* Property list pointer */
     herr_t ret_value = SUCCEED;         /* return value */
@@ -1446,7 +1446,7 @@ H5Pset_jnl_config(hid_t plist_id, const H5AC2_jnl_config_t *config_ptr)
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     /* Validate the new configuration */
-    if(H5AC2_validate_jnl_config(config_ptr) < 0)
+    if(H5AC_validate_jnl_config(config_ptr) < 0)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid journaling configuration")
 
     /* Set the modified config */
@@ -1479,7 +1479,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_jnl_config(hid_t plist_id, H5AC2_jnl_config_t *config_ptr)
+H5Pget_jnl_config(hid_t plist_id, H5AC_jnl_config_t *config_ptr)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
     herr_t ret_value = SUCCEED;   /* return value */
@@ -1490,7 +1490,7 @@ H5Pget_jnl_config(hid_t plist_id, H5AC2_jnl_config_t *config_ptr)
     /* Validate the config_ptr */
     if(NULL == config_ptr)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config_ptr on entry.")
-    if(!H5AC2_validate_jnl_config_ver(config_ptr->version))
+    if(!H5AC_validate_jnl_config_ver(config_ptr->version))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unknown config version.")
 
     /* Get the plist structure */
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index c6dbabb..ff20a13 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -24,7 +24,7 @@
 
 /* Public headers needed by this file */
 #include "H5public.h"
-#include "H5AC2public.h"
+#include "H5ACpublic.h"
 #include "H5C1public.h"
 #include "H5Dpublic.h"
 #include "H5Fpublic.h"
@@ -257,9 +257,9 @@ H5_DLL herr_t H5Pset_mdc_config(hid_t    plist_id,
 H5_DLL herr_t H5Pget_mdc_config(hid_t     plist_id,
        H5AC1_cache_config_t * config_ptr);	/* out */
 H5_DLL herr_t H5Pset_jnl_config(hid_t    plist_id,
-       const H5AC2_jnl_config_t * config_ptr);
+       const H5AC_jnl_config_t * config_ptr);
 H5_DLL herr_t H5Pget_jnl_config(hid_t     plist_id,
-       H5AC2_jnl_config_t * config_ptr);	/* out */
+       H5AC_jnl_config_t * config_ptr);	/* out */
 H5_DLL herr_t H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref);
 H5_DLL herr_t H5Pget_gc_references(hid_t fapl_id, unsigned *gc_ref/*out*/);
 H5_DLL herr_t H5Pset_fclose_degree(hid_t fapl_id, H5F_close_degree_t degree);
diff --git a/src/H5R.c b/src/H5R.c
index ed65cbb..9b524af 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -20,7 +20,7 @@
 
 
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"        /* Metadata cache                       */
 #include "H5Dprivate.h"		/* Datasets				*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Gprivate.h"		/* Groups				*/
@@ -311,7 +311,7 @@ H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t
     H5S_t	*space = NULL;          /* Pointer to dataspace containing region */
     herr_t      ret_value;      /* Return value */
 
-    FUNC_ENTER_API_META(H5Rcreate, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Rcreate, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE5("e", "*xi*sRti", ref, loc_id, name, ref_type, space_id);
 
     /* Check args */
@@ -329,7 +329,7 @@ H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataspace")
 
     /* Create reference */
-    if((ret_value = H5R_create(ref, &loc, name, ref_type, space, H5AC2_dxpl_id)) < 0)
+    if((ret_value = H5R_create(ref, &loc, name, ref_type, space, H5AC_dxpl_id)) < 0)
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to create reference")
 
 done:
@@ -528,7 +528,7 @@ H5Rdereference(hid_t id, H5R_type_t ref_type, const void *_ref)
     file = loc.oloc->file;
 
     /* Create reference */
-    if((ret_value = H5R_dereference(file, H5AC2_dxpl_id, ref_type, _ref)) < 0)
+    if((ret_value = H5R_dereference(file, H5AC_dxpl_id, ref_type, _ref)) < 0)
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable dereference object")
 
 done:
@@ -647,7 +647,7 @@ H5Rget_region(hid_t id, H5R_type_t ref_type, const void *ref)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer")
 
     /* Get the dataspace with the correct region selected */
-    if((space = H5R_get_region(loc.oloc->file, H5AC2_ind_dxpl_id, ref)) == NULL)
+    if((space = H5R_get_region(loc.oloc->file, H5AC_ind_dxpl_id, ref)) == NULL)
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCREATE, FAIL, "unable to create dataspace")
 
     /* Atomize */
@@ -789,7 +789,7 @@ H5Rget_obj_type2(hid_t id, H5R_type_t ref_type, const void *ref,
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer")
 
     /* Get the object information */
-    if(H5R_get_obj_type(loc.oloc->file, H5AC2_ind_dxpl_id, ref_type, ref, obj_type) < 0)
+    if(H5R_get_obj_type(loc.oloc->file, H5AC_ind_dxpl_id, ref_type, ref, obj_type) < 0)
 	HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to determine object type")
 
 done:
@@ -947,7 +947,7 @@ H5Rget_name(hid_t id, H5R_type_t ref_type, const void *_ref, char *name,
     file = loc.oloc->file;
 
     /* Get name */
-    if((ret_value = H5R_get_name(file, H5P_DEFAULT, H5AC2_dxpl_id, id, ref_type, _ref, name, size)) < 0)
+    if((ret_value = H5R_get_name(file, H5P_DEFAULT, H5AC_dxpl_id, id, ref_type, _ref, name, size)) < 0)
         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to determine object path")
 
 done:
diff --git a/src/H5Rdeprec.c b/src/H5Rdeprec.c
index e69adc1..0e2acc8 100644
--- a/src/H5Rdeprec.c
+++ b/src/H5Rdeprec.c
@@ -41,7 +41,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Gprivate.h"		/* Groups				*/
 #include "H5Oprivate.h"		/* Object headers		  	*/
@@ -148,7 +148,7 @@ H5Rget_obj_type1(hid_t id, H5R_type_t ref_type, const void *ref)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, H5G_UNKNOWN, "invalid reference pointer")
 
     /* Get the object information */
-    if(H5R_get_obj_type(loc.oloc->file, H5AC2_ind_dxpl_id, ref_type, ref, &obj_type) < 0)
+    if(H5R_get_obj_type(loc.oloc->file, H5AC_ind_dxpl_id, ref_type, ref, &obj_type) < 0)
 	HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, H5G_UNKNOWN, "unable to determine object type")
 
     /* Set return value */
diff --git a/src/H5S.c b/src/H5S.c
index 8cdbbc5..dd16498 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -947,7 +947,7 @@ done:
  *
  *              John Mainzer, 6/6/05
  *              Updated function to use the new dirtied parameter of
- *              H5AC2_unprotect() instead of manipulating the is_dirty
+ *              H5AC_unprotect() instead of manipulating the is_dirty
  *              field of the cache info.
  *
  *-------------------------------------------------------------------------
diff --git a/src/H5SM.c b/src/H5SM.c
index 8950f80..7dd8050 100755
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -210,7 +210,7 @@ H5SM_init(H5F_t *f, H5P_genplist_t * fc_plist, const H5O_loc_t *ext_loc, hid_t d
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for SOHM table")
 
     /* Cache the new table */
-    if(H5AC2_set(f, dxpl_id, H5AC2_SOHM_TABLE, table_addr, (size_t)table_size, table, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(f, dxpl_id, H5AC_SOHM_TABLE, table_addr, (size_t)table_size, table, H5AC__NO_FLAGS_SET) < 0)
 	HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, FAIL, "can't add SOHM table to cache")
 
     /* Record the address of the master table in the file */
@@ -360,7 +360,7 @@ H5SM_type_shared(H5F_t *f, unsigned type_id, hid_t dxpl_id)
         /* Determine size of table in file */
         table_size = (hsize_t) H5SM_TABLE_SIZE(f) + (hsize_t)(f->shared->sohm_nindexes * H5SM_INDEX_HEADER_SIZE(f));
 
-        if(NULL == (table = (H5SM_master_table_t *)H5AC2_protect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC2_READ)))
+        if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC_READ)))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
     } /* end if */
     else
@@ -376,7 +376,7 @@ H5SM_type_shared(H5F_t *f, unsigned type_id, hid_t dxpl_id)
 
 done:
     /* Release the master SOHM table */
-    if(table && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, H5AC2__NO_FLAGS_SET) < 0)
+    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -414,7 +414,7 @@ H5SM_get_fheap_addr(H5F_t *f, hid_t dxpl_id, unsigned type_id, haddr_t *fheap_ad
     table_size = (hsize_t) H5SM_TABLE_SIZE(f) + (hsize_t)(f->shared->sohm_nindexes * H5SM_INDEX_HEADER_SIZE(f));
 
     /* Look up the master SOHM table */
-    if(NULL == (table = (H5SM_master_table_t *)H5AC2_protect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC2_READ)))
+    if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC_READ)))
 	HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
     /* Look up index for message type */
@@ -426,7 +426,7 @@ H5SM_get_fheap_addr(H5F_t *f, hid_t dxpl_id, unsigned type_id, haddr_t *fheap_ad
 
 done:
     /* Release the master SOHM table */
-    if(table && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, H5AC2__NO_FLAGS_SET) < 0)
+    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -547,7 +547,7 @@ H5SM_delete_index(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id, hbool_t
     /* Determine whether index is a list or a B-tree. */
     if(header->index_type == H5SM_LIST) {
         /* Eject entry from cache */
-        if(H5AC2_expunge_entry(f, dxpl_id, H5AC2_SOHM_LIST, header->index_addr) < 0)
+        if(H5AC_expunge_entry(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "unable to remove list index from cache")
 
         /* Free the file space used */
@@ -635,7 +635,7 @@ H5SM_create_list(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id)
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed for SOHM list")
 
     /* Put the list into the cache */
-    if(H5AC2_set(f, dxpl_id, H5AC2_SOHM_LIST, addr, (size_t)size, list, H5AC2__NO_FLAGS_SET) < 0)
+    if(H5AC_set(f, dxpl_id, H5AC_SOHM_LIST, addr, (size_t)size, list, H5AC__NO_FLAGS_SET) < 0)
 	HGOTO_ERROR(H5E_CACHE, H5E_CANTINS, HADDR_UNDEF, "can't add SOHM list to cache")
 
     /* Set return value */
@@ -735,7 +735,7 @@ H5SM_convert_list_to_btree(H5F_t *f, H5SM_index_header_t *header,
     } /* end for */
 
     /* Unprotect list in cache and release heap */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_LIST, header->index_addr, (size_t)0, list, H5AC2__DELETED_FLAG) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, (size_t)0, list, H5AC__DELETED_FLAG) < 0)
 	HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "unable to release SOHM list")
     *_list = list = NULL;
 
@@ -801,7 +801,7 @@ H5SM_convert_btree_to_list(H5F_t * f, H5SM_index_header_t * header, hid_t dxpl_i
     cache_udata.header = header;
 
     /* Protect the SOHM list */
-    if(NULL == (list = (H5SM_list_t *)H5AC2_protect(f, dxpl_id, H5AC2_SOHM_LIST, header->index_addr, H5SM_LIST_SIZE(f, header->list_max), &cache_udata, H5AC2_WRITE)))
+    if(NULL == (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, H5SM_LIST_SIZE(f, header->list_max), &cache_udata, H5AC_WRITE)))
         HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM list index")
 
     /* Delete the B-tree and have messages copy themselves to the
@@ -812,7 +812,7 @@ H5SM_convert_btree_to_list(H5F_t * f, H5SM_index_header_t * header, hid_t dxpl_i
 
 done:
     /* Release the SOHM list from the cache */
-    if(list && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_LIST, header->index_addr, (size_t)0, list, H5AC2__DIRTIED_FLAG) < 0)
+    if(list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, (size_t)0, list, H5AC__DIRTIED_FLAG) < 0)
         HDONE_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "unable to unprotect SOHM index")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -908,7 +908,7 @@ H5SM_can_share(H5F_t *f, hid_t dxpl_id, H5SM_master_table_t *table,
     if(table)
         my_table = table;
     else {
-        if(NULL == (my_table = (H5SM_master_table_t *)H5AC2_protect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC2_READ)))
+        if(NULL == (my_table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC_READ)))
             HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
     } /* end if */
 
@@ -932,7 +932,7 @@ H5SM_can_share(H5F_t *f, hid_t dxpl_id, H5SM_master_table_t *table,
 
 done:
     /* Release the master SOHM table, if we protected it */
-    if(my_table && my_table != table && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, my_table, H5AC2__NO_FLAGS_SET) < 0)
+    if(my_table && my_table != table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, my_table, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_SOHM, H5E_CANTRELEASE, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -999,7 +999,7 @@ H5SM_try_share(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id,
 {
     H5SM_master_table_t *table = NULL;
     hsize_t             table_size;     /* Size of SOHM master table in file */
-    unsigned            cache_flags = H5AC2__NO_FLAGS_SET;
+    unsigned            cache_flags = H5AC__NO_FLAGS_SET;
     ssize_t             index_num;
     htri_t              tri_ret;
     htri_t              ret_value = TRUE;
@@ -1018,7 +1018,7 @@ H5SM_try_share(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id,
     table_size = (hsize_t) H5SM_TABLE_SIZE(f) + (hsize_t)(f->shared->sohm_nindexes * H5SM_INDEX_HEADER_SIZE(f));
 
     /* Look up the master SOHM table */
-    if(NULL == (table = (H5SM_master_table_t *)H5AC2_protect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC2_WRITE)))
+    if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
     /* "complex" sharing checks */
@@ -1033,7 +1033,7 @@ H5SM_try_share(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id,
     if(table->indexes[index_num].index_addr == HADDR_UNDEF) {
         if(H5SM_create_index(f, &(table->indexes[index_num]), dxpl_id) < 0)
             HGOTO_ERROR(H5E_SOHM, H5E_CANTINIT, FAIL, "unable to create SOHM index")
-        cache_flags |= H5AC2__DIRTIED_FLAG;
+        cache_flags |= H5AC__DIRTIED_FLAG;
     } /* end if */
 
     /* Write the message as a shared message.  This may or may not cause the
@@ -1055,7 +1055,7 @@ H5SM_try_share(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id,
 
 done:
     /* Release the master SOHM table */
-    if(table && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, cache_flags) < 0)
+    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, cache_flags) < 0)
 	HDONE_ERROR(H5E_CACHE, H5E_CANTRELEASE, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1202,7 +1202,7 @@ H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
         cache_udata.header = header;
 
         /* The index is a list; get it from the cache */
-        if(NULL == (list = (H5SM_list_t *)H5AC2_protect(f, dxpl_id, H5AC2_SOHM_LIST, header->index_addr, H5SM_LIST_SIZE(f, header->list_max), &cache_udata, H5AC2_WRITE)))
+        if(NULL == (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, H5SM_LIST_SIZE(f, header->list_max), &cache_udata, H5AC_WRITE)))
 	    HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, FAIL, "unable to load SOHM index")
 
         /* See if the message is already in the index and get its location.
@@ -1331,7 +1331,7 @@ H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
         } /* end else */
 
         ++(header->num_messages);
-        (*cache_flags_ptr) |= H5AC2__DIRTIED_FLAG;
+        (*cache_flags_ptr) |= H5AC__DIRTIED_FLAG;
     } /* end else */
 
     /* Set the file pointer & message type for the shared component */
@@ -1348,7 +1348,7 @@ done:
         HDONE_ERROR(H5E_HEAP, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
 
     /* If we got a list out of the cache, release it (it is always dirty after writing a message) */
-    if(list && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_LIST, header->index_addr, (size_t)0, list, H5AC2__DIRTIED_FLAG) < 0)
+    if(list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, (size_t)0, list, H5AC__DIRTIED_FLAG) < 0)
 	HDONE_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM index")
 
     if(encoding_buf)
@@ -1381,7 +1381,7 @@ H5SM_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5O_shared_t *sh_mesg)
 {
     H5SM_master_table_t  *table = NULL;
     hsize_t               table_size;   /* Size of SOHM master table in file */
-    unsigned              cache_flags = H5AC2__NO_FLAGS_SET;
+    unsigned              cache_flags = H5AC__NO_FLAGS_SET;
     ssize_t               index_num;
     void                 *mesg_buf = NULL;
     void                 *native_mesg = NULL;
@@ -1401,7 +1401,7 @@ H5SM_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5O_shared_t *sh_mesg)
     table_size = (hsize_t) H5SM_TABLE_SIZE(f) + (hsize_t)(f->shared->sohm_nindexes * H5SM_INDEX_HEADER_SIZE(f));
 
     /* Look up the master SOHM table */
-    if(NULL == (table = (H5SM_master_table_t *)H5AC2_protect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC2_WRITE)))
+    if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC_WRITE)))
 	HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
     /* Find the correct index and try to delete from it */
@@ -1416,7 +1416,7 @@ H5SM_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5O_shared_t *sh_mesg)
 	HGOTO_ERROR(H5E_SOHM, H5E_CANTDELETE, FAIL, "unable to delete mesage from SOHM index")
 
     /* Release the master SOHM table */
-    if(H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, cache_flags) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, cache_flags) < 0)
 	HGOTO_ERROR(H5E_CACHE, H5E_CANTRELEASE, FAIL, "unable to close SOHM master table")
     table = NULL;
 
@@ -1434,7 +1434,7 @@ H5SM_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5O_shared_t *sh_mesg)
 
 done:
     /* Release the master SOHM table (should only happen on error) */
-    if(table && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, cache_flags) < 0)
+    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, cache_flags) < 0)
 	HDONE_ERROR(H5E_CACHE, H5E_CANTRELEASE, FAIL, "unable to close SOHM master table")
 
     /* Release any native message we decoded */
@@ -1669,7 +1669,7 @@ H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
         cache_udata.header = header;
 
         /* If the index is stored as a list, get it from the cache */
-        if(NULL == (list = (H5SM_list_t *)H5AC2_protect(f, dxpl_id, H5AC2_SOHM_LIST, header->index_addr, H5SM_LIST_SIZE(f, header->list_max), &cache_udata, H5AC2_WRITE)))
+        if(NULL == (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, H5SM_LIST_SIZE(f, header->list_max), &cache_udata, H5AC_WRITE)))
 	    HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM index")
 
         /* Find the message in the list */
@@ -1704,7 +1704,7 @@ H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
 
         /* Updated the index header, so set its dirty flag */
         --header->num_messages;
-        *cache_flags |= H5AC2__DIRTIED_FLAG;
+        *cache_flags |= H5AC__DIRTIED_FLAG;
 
         /* Remove the message from the index */
         if(header->index_type == H5SM_LIST)
@@ -1727,7 +1727,7 @@ H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
         if(header->num_messages == 0) {
 
             /* Unprotect cache and release heap */
-            if(list && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_LIST, header->index_addr, (size_t)0, list, H5AC2__DELETED_FLAG) < 0)
+            if(list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, (size_t)0, list, H5AC__DELETED_FLAG) < 0)
 	        HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "unable to release SOHM list")
             list = NULL;
 
@@ -1751,7 +1751,7 @@ H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
 
 done:
     /* Release the SOHM list */
-    if(list && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_LIST, header->index_addr, (size_t)0, list, H5AC2__DIRTIED_FLAG) < 0)
+    if(list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, (size_t)0, list, H5AC__DIRTIED_FLAG) < 0)
 	HDONE_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM index")
 
     /* Release the fractal heap if we opened it */
@@ -1833,7 +1833,7 @@ H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist, hid_t dxpl_id)
         table_size = (hsize_t) H5SM_TABLE_SIZE(f) + (hsize_t)(shared->sohm_nindexes * H5SM_INDEX_HEADER_SIZE(f));
 
         /* Read the rest of the SOHM table information from the cache */
-        if(NULL == (table = (H5SM_master_table_t *)H5AC2_protect(f, dxpl_id, H5AC2_SOHM_TABLE, shared->sohm_addr, (size_t)table_size, f, H5AC2_READ)))
+        if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, shared->sohm_addr, (size_t)table_size, f, H5AC_READ)))
             HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
         /* Get index conversion limits */
@@ -1872,7 +1872,7 @@ H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist, hid_t dxpl_id)
 
 done:
     /* Release the master SOHM table if we took it out of the cache */
-    if(table && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_TABLE, shared->sohm_addr, (size_t)0, table, H5AC2__NO_FLAGS_SET) < 0)
+    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, shared->sohm_addr, (size_t)0, table, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_CACHE, H5E_CANTRELEASE, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2063,7 +2063,7 @@ H5SM_get_refcount(H5F_t *f, hid_t dxpl_id, unsigned type_id,
     table_size = (hsize_t) H5SM_TABLE_SIZE(f) + (hsize_t)(f->shared->sohm_nindexes * H5SM_INDEX_HEADER_SIZE(f));
 
     /* Look up the master SOHM table */
-    if(NULL == (table = (H5SM_master_table_t *)H5AC2_protect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC2_READ)))
+    if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC_READ)))
 	HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
     /* Find the correct index and find the message in it */
@@ -2102,7 +2102,7 @@ H5SM_get_refcount(H5F_t *f, hid_t dxpl_id, unsigned type_id,
         cache_udata.header = header;
 
         /* If the index is stored as a list, get it from the cache */
-        if(NULL == (list = (H5SM_list_t *)H5AC2_protect(f, dxpl_id, H5AC2_SOHM_LIST, header->index_addr, H5SM_LIST_SIZE(f, header->list_max), &cache_udata, H5AC2_READ)))
+        if(NULL == (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, H5SM_LIST_SIZE(f, header->list_max), &cache_udata, H5AC_READ)))
 	    HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM index")
 
         /* Find the message in the list */
@@ -2127,9 +2127,9 @@ H5SM_get_refcount(H5F_t *f, hid_t dxpl_id, unsigned type_id,
 
 done:
     /* Release resources */
-    if(list && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_LIST, header->index_addr, (size_t)0, list, H5AC2__NO_FLAGS_SET) < 0)
+    if(list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, header->index_addr, (size_t)0, list, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM index")
-    if(table && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, H5AC2__NO_FLAGS_SET) < 0)
+    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_CACHE, H5E_CANTRELEASE, FAIL, "unable to close SOHM master table")
     if(fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
@@ -2295,7 +2295,7 @@ H5SM_read_mesg(H5F_t *f, const H5SM_sohm_t *mesg, H5HF_t *fheap,
 	        HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "unable to open object header")
 
             /* Load the object header from the cache */
-            if(NULL == (oh = H5O_protect(&oloc, dxpl_id, H5AC2_READ)))
+            if(NULL == (oh = H5O_protect(&oloc, dxpl_id, H5AC_READ)))
 	        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
         } /* end if */
         else
@@ -2324,7 +2324,7 @@ H5SM_read_mesg(H5F_t *f, const H5SM_sohm_t *mesg, H5HF_t *fheap,
 done:
     /* Close the object header if we opened one and had an error */
     if(oh && oh != open_oh) {
-        if(oh && H5O_unprotect(&oloc, dxpl_id, oh, H5AC2__NO_FLAGS_SET) < 0)
+        if(oh && H5O_unprotect(&oloc, dxpl_id, oh, H5AC__NO_FLAGS_SET) < 0)
             HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
         if(H5O_close(&oloc) < 0)
@@ -2451,7 +2451,7 @@ H5SM_table_debug(H5F_t *f, hid_t dxpl_id, haddr_t table_addr,
     table_size = (hsize_t) H5SM_TABLE_SIZE(f) + (hsize_t) (f->shared->sohm_nindexes * H5SM_INDEX_HEADER_SIZE(f));
 
     /* Look up the master SOHM table */
-    if(NULL == (table = (H5SM_master_table_t *)H5AC2_protect(f, dxpl_id, H5AC2_SOHM_TABLE, table_addr, (size_t)table_size, f, H5AC2_READ)))
+    if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, table_addr, (size_t)table_size, f, H5AC_READ)))
 	HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
     HDfprintf(stream, "%*sShared Message Master Table...\n", indent, "");
@@ -2479,7 +2479,7 @@ H5SM_table_debug(H5F_t *f, hid_t dxpl_id, haddr_t table_addr,
     } /* end for */
 
 done:
-    if(table && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_TABLE, table_addr, (size_t)0, table, H5AC2__NO_FLAGS_SET) < 0)
+    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, table_addr, (size_t)0, table, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_CACHE, H5E_CANTRELEASE, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2537,7 +2537,7 @@ H5SM_list_debug(H5F_t *f, hid_t dxpl_id, haddr_t list_addr,
     cache_udata.header = &header;
 
     /* Get the list from the cache */
-    if(NULL == (list = (H5SM_list_t *)H5AC2_protect(f, dxpl_id, H5AC2_SOHM_LIST, list_addr, H5SM_LIST_SIZE(f, header.list_max), &cache_udata, H5AC2_READ)))
+    if(NULL == (list = (H5SM_list_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_LIST, list_addr, H5SM_LIST_SIZE(f, header.list_max), &cache_udata, H5AC_READ)))
 	HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, FAIL, "unable to load SOHM index")
 
     HDfprintf(stream, "%*sShared Message List Index...\n", indent, "");
@@ -2569,7 +2569,7 @@ H5SM_list_debug(H5F_t *f, hid_t dxpl_id, haddr_t list_addr,
     } /* end for */
 
 done:
-    if(list && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_LIST, list_addr, (size_t)0, list, H5AC2__NO_FLAGS_SET) < 0)
+    if(list && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_LIST, list_addr, (size_t)0, list, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM index")
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2612,7 +2612,7 @@ H5SM_ih_size(H5F_t *f, hid_t dxpl_id, H5F_info_t *finfo)
     table_size = (hsize_t) H5SM_TABLE_SIZE(f) + (hsize_t)(f->shared->sohm_nindexes * H5SM_INDEX_HEADER_SIZE(f));
 
     /* Look up the master SOHM table */
-    if(NULL == (table = (H5SM_master_table_t *)H5AC2_protect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC2_READ)))
+    if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC_READ)))
 	HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
     /* Get SOHM header size */
@@ -2651,7 +2651,7 @@ done:
     /* Release resources */
     if(fheap && H5HF_close(fheap, dxpl_id) < 0)
         HDONE_ERROR(H5E_HEAP, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
-    if(table && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, H5AC2__NO_FLAGS_SET) < 0)
+    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_CACHE, H5E_CANTRELEASE, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5SMcache.c b/src/H5SMcache.c
index 5945cea..e245b9b 100644
--- a/src/H5SMcache.c
+++ b/src/H5SMcache.c
@@ -72,9 +72,9 @@ static herr_t H5SM_list_free_icr(haddr_t addr, size_t len, void *thing);
 /*********************/
 /* Package Variables */
 /*********************/
-/* H5SM inherits cache-like properties from H5AC2 */
-const H5AC2_class_t H5AC2_SOHM_TABLE[1] = {{
-    H5AC2_SOHM_TABLE_ID,
+/* H5SM inherits cache-like properties from H5AC */
+const H5AC_class_t H5AC_SOHM_TABLE[1] = {{
+    H5AC_SOHM_TABLE_ID,
     "shared object header message",
     H5FD_MEM_SOHM_TABLE,
     H5SM_table_deserialize,
@@ -84,8 +84,8 @@ const H5AC2_class_t H5AC2_SOHM_TABLE[1] = {{
     NULL
 }};
 
-const H5AC2_class_t H5AC2_SOHM_LIST[1] = {{
-    H5AC2_SOHM_LIST_ID,
+const H5AC_class_t H5AC_SOHM_LIST[1] = {{
+    H5AC_SOHM_LIST_ID,
     "shared object header message",
     H5FD_MEM_SOHM_INDEX,
     H5SM_list_deserialize,
@@ -379,7 +379,7 @@ H5SM_list_deserialize(haddr_t UNUSED addr, size_t UNUSED len, const void *image,
     /* Allocate space for the SOHM list data structure */
     if(NULL == (list = H5FL_MALLOC(H5SM_list_t)))
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    HDmemset(&list->cache_info, 0, sizeof(H5AC2_info_t));
+    HDmemset(&list->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Allocate list in memory as an array*/
     if((list->messages = (H5SM_sohm_t *)H5FL_ARR_MALLOC(H5SM_sohm_t, udata->header->list_max)) == NULL)
diff --git a/src/H5SMpkg.h b/src/H5SMpkg.h
index 7af60f6..242257e 100755
--- a/src/H5SMpkg.h
+++ b/src/H5SMpkg.h
@@ -32,7 +32,7 @@
 #include "H5SMprivate.h"	/* Shared Object Header Messages	*/
 
 /* Other private headers needed by this file */
-#include "H5AC2private.h"       /* Metadata Cache		  	*/
+#include "H5ACprivate.h"        /* Metadata Cache		  	*/
 #include "H5B2private.h"        /* B-trees                              */
 #include "H5HFprivate.h"        /* Fractal heaps		  	*/
 
@@ -174,7 +174,7 @@ typedef struct {
 /* Typedef for a SOHM list */
 typedef struct {
     /* Information for H5AC cache functions, _must_ be first field in structure */
-    H5AC2_info_t cache_info;
+    H5AC_info_t cache_info;
 
     H5SM_index_header_t *header;    /* Pointer to the corresponding index header */
     H5SM_sohm_t *messages;          /* Actual list, stored as an array */
@@ -184,7 +184,7 @@ typedef struct {
 /* Typedef for shared object header message master table */
 struct H5SM_master_table_t {
     /* Information for H5AC cache functions, _must_ be first field in structure */
-    H5AC2_info_t cache_info;
+    H5AC_info_t cache_info;
 
     unsigned num_indexes;           /* Number of indexes */
     H5SM_index_header_t *indexes;   /* Array of num_indexes indexes */
@@ -238,8 +238,8 @@ H5FL_ARR_EXTERN(H5SM_index_header_t);
 H5FL_EXTERN(H5SM_list_t);
 H5FL_ARR_EXTERN(H5SM_sohm_t);
 
-H5_DLLVAR const H5AC2_class_t H5AC2_SOHM_TABLE[1];
-H5_DLLVAR const H5AC2_class_t H5AC2_SOHM_LIST[1];
+H5_DLLVAR const H5AC_class_t H5AC_SOHM_TABLE[1];
+H5_DLLVAR const H5AC_class_t H5AC_SOHM_LIST[1];
 H5_DLLVAR const H5B2_class_t H5SM_INDEX[1];
 
 /****************************/
diff --git a/src/H5SMtest.c b/src/H5SMtest.c
index 4b17785..7350f28 100644
--- a/src/H5SMtest.c
+++ b/src/H5SMtest.c
@@ -26,7 +26,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Fpkg.h"		/* File access                          */
 #include "H5SMpkg.h"            /* Shared object header messages        */
@@ -98,7 +98,7 @@ H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id,
         table_size = (hsize_t) H5SM_TABLE_SIZE(f) + (hsize_t)(f->shared->sohm_nindexes * H5SM_INDEX_HEADER_SIZE(f));
 
         /* Look up the master SOHM table */
-        if(NULL == (table = (H5SM_master_table_t *)H5AC2_protect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC2_READ)))
+        if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)table_size, f, H5AC_READ)))
             HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
 
         /* Find the correct index for this message type */
@@ -115,7 +115,7 @@ H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id,
 
 done:
     /* Release resources */
-    if(table && H5AC2_unprotect(f, dxpl_id, H5AC2_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, H5AC2__NO_FLAGS_SET) < 0)
+    if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, (size_t)0, table, H5AC__NO_FLAGS_SET) < 0)
 	HDONE_ERROR(H5E_CACHE, H5E_CANTRELEASE, FAIL, "unable to close SOHM master table")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5T.c b/src/H5T.c
index 54d9e61..08794a1 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -27,7 +27,7 @@
 
 
 #include "H5private.h"		/*generic functions			*/
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"        /* Metadata cache                       */
 #include "H5Dprivate.h"		/*datasets (for H5Tcopy)		*/
 #include "H5Eprivate.h"		/*error handling			*/
 #include "H5Fprivate.h"		/* Files				*/
@@ -1012,22 +1012,22 @@ H5T_init_interface(void)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
     status = 0;
 
-    status |= H5T_register(H5T_PERS_SOFT, "i_i", fixedpt, fixedpt, H5T_conv_i_i, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "i_f", fixedpt, floatpt, H5T_conv_i_f, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "f_f", floatpt, floatpt, H5T_conv_f_f, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "f_i", floatpt, fixedpt, H5T_conv_f_i, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "s_s", string, string, H5T_conv_s_s, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "b_b", bitfield, bitfield, H5T_conv_b_b, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "ibo", fixedpt, fixedpt, H5T_conv_order, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "ibo(opt)", fixedpt, fixedpt, H5T_conv_order_opt, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "fbo", floatpt, floatpt, H5T_conv_order, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "fbo(opt)", floatpt, floatpt, H5T_conv_order_opt, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "struct(no-opt)", compound, compound, H5T_conv_struct, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "struct(opt)", compound, compound, H5T_conv_struct_opt, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "enum", enum_type, enum_type, H5T_conv_enum, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "vlen", vlen, vlen, H5T_conv_vlen, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "array", array, array, H5T_conv_array, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "objref", objref, objref, H5T_conv_order_opt, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "i_i", fixedpt, fixedpt, H5T_conv_i_i, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "i_f", fixedpt, floatpt, H5T_conv_i_f, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "f_f", floatpt, floatpt, H5T_conv_f_f, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "f_i", floatpt, fixedpt, H5T_conv_f_i, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "s_s", string, string, H5T_conv_s_s, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "b_b", bitfield, bitfield, H5T_conv_b_b, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "ibo", fixedpt, fixedpt, H5T_conv_order, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "ibo(opt)", fixedpt, fixedpt, H5T_conv_order_opt, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "fbo", floatpt, floatpt, H5T_conv_order, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "fbo(opt)", floatpt, floatpt, H5T_conv_order_opt, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "struct(no-opt)", compound, compound, H5T_conv_struct, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "struct(opt)", compound, compound, H5T_conv_struct_opt, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "enum", enum_type, enum_type, H5T_conv_enum, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "vlen", vlen, vlen, H5T_conv_vlen, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "array", array, array, H5T_conv_array, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_SOFT, "objref", objref, objref, H5T_conv_order_opt, H5AC_dxpl_id, FALSE);
 
     /*
      * Native conversions should be listed last since we can use hardware to
@@ -1039,261 +1039,261 @@ H5T_init_interface(void)
 
     /* floating point */
 #if H5T_CONV_INTERNAL_FP_FP
-    status |= H5T_register(H5T_PERS_HARD, "flt_dbl", native_float, native_double, H5T_conv_float_double, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_flt", native_double, native_float, H5T_conv_double_float, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_dbl", native_float, native_double, H5T_conv_float_double, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_flt", native_double, native_float, H5T_conv_double_float, H5AC_dxpl_id, FALSE);
 #endif /*H5T_CONV_INTERNAL_FP_FP*/
 #if H5T_CONV_INTERNAL_FP_LDOUBLE
-    status |= H5T_register(H5T_PERS_HARD, "flt_ldbl", native_float, native_ldouble, H5T_conv_float_ldouble, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_ldbl", native_double, native_ldouble, H5T_conv_double_ldouble, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_flt", native_ldouble, native_float, H5T_conv_ldouble_float, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_dbl", native_ldouble, native_double, H5T_conv_ldouble_double, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_ldbl", native_float, native_ldouble, H5T_conv_float_ldouble, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_ldbl", native_double, native_ldouble, H5T_conv_double_ldouble, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_flt", native_ldouble, native_float, H5T_conv_ldouble_float, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_dbl", native_ldouble, native_double, H5T_conv_ldouble_double, H5AC_dxpl_id, FALSE);
 #endif /*H5T_CONV_INTERNAL_FP_LDOUBLE*/
 
     /* from long_long */
-    status |= H5T_register(H5T_PERS_HARD, "llong_ullong", native_llong, native_ullong, H5T_conv_llong_ullong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_llong", native_ullong, native_llong, H5T_conv_ullong_llong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_long", native_llong, native_long, H5T_conv_llong_long, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_ulong", native_llong, native_ulong, H5T_conv_llong_ulong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_long", native_ullong, native_long, H5T_conv_ullong_long, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_ulong", native_ullong, native_ulong, H5T_conv_ullong_ulong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_short", native_llong, native_short, H5T_conv_llong_short, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_ushort", native_llong, native_ushort, H5T_conv_llong_ushort, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_short", native_ullong, native_short, H5T_conv_ullong_short, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_ushort", native_ullong, native_ushort, H5T_conv_ullong_ushort, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_int", native_llong, native_int, H5T_conv_llong_int, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_uint", native_llong, native_uint, H5T_conv_llong_uint, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_int", native_ullong, native_int, H5T_conv_ullong_int, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_uint", native_ullong, native_uint, H5T_conv_ullong_uint, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_schar", native_llong, native_schar, H5T_conv_llong_schar, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_uchar", native_llong, native_uchar, H5T_conv_llong_uchar, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_schar", native_ullong, native_schar, H5T_conv_ullong_schar, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_uchar", native_ullong, native_uchar, H5T_conv_ullong_uchar, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_ullong", native_llong, native_ullong, H5T_conv_llong_ullong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_llong", native_ullong, native_llong, H5T_conv_ullong_llong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_long", native_llong, native_long, H5T_conv_llong_long, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_ulong", native_llong, native_ulong, H5T_conv_llong_ulong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_long", native_ullong, native_long, H5T_conv_ullong_long, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_ulong", native_ullong, native_ulong, H5T_conv_ullong_ulong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_short", native_llong, native_short, H5T_conv_llong_short, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_ushort", native_llong, native_ushort, H5T_conv_llong_ushort, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_short", native_ullong, native_short, H5T_conv_ullong_short, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_ushort", native_ullong, native_ushort, H5T_conv_ullong_ushort, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_int", native_llong, native_int, H5T_conv_llong_int, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_uint", native_llong, native_uint, H5T_conv_llong_uint, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_int", native_ullong, native_int, H5T_conv_ullong_int, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_uint", native_ullong, native_uint, H5T_conv_ullong_uint, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_schar", native_llong, native_schar, H5T_conv_llong_schar, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_uchar", native_llong, native_uchar, H5T_conv_llong_uchar, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_schar", native_ullong, native_schar, H5T_conv_ullong_schar, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_uchar", native_ullong, native_uchar, H5T_conv_ullong_uchar, H5AC_dxpl_id, FALSE);
 
     /* From long */
-    status |= H5T_register(H5T_PERS_HARD, "long_llong", native_long, native_llong, H5T_conv_long_llong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_ullong", native_long, native_ullong, H5T_conv_long_ullong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_llong", native_ulong, native_llong, H5T_conv_ulong_llong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_ullong", native_ulong, native_ullong, H5T_conv_ulong_ullong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_ulong", native_long, native_ulong, H5T_conv_long_ulong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_long", native_ulong, native_long, H5T_conv_ulong_long, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_short", native_long, native_short, H5T_conv_long_short, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_ushort", native_long, native_ushort, H5T_conv_long_ushort, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_short", native_ulong, native_short, H5T_conv_ulong_short, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_ushort", native_ulong, native_ushort, H5T_conv_ulong_ushort, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_int", native_long, native_int, H5T_conv_long_int, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_uint", native_long, native_uint, H5T_conv_long_uint, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_int", native_ulong, native_int, H5T_conv_ulong_int, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_uint", native_ulong, native_uint, H5T_conv_ulong_uint, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_schar", native_long, native_schar, H5T_conv_long_schar, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_uchar", native_long, native_uchar, H5T_conv_long_uchar, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_schar", native_ulong, native_schar, H5T_conv_ulong_schar, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_uchar", native_ulong, native_uchar, H5T_conv_ulong_uchar, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_llong", native_long, native_llong, H5T_conv_long_llong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_ullong", native_long, native_ullong, H5T_conv_long_ullong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_llong", native_ulong, native_llong, H5T_conv_ulong_llong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_ullong", native_ulong, native_ullong, H5T_conv_ulong_ullong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_ulong", native_long, native_ulong, H5T_conv_long_ulong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_long", native_ulong, native_long, H5T_conv_ulong_long, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_short", native_long, native_short, H5T_conv_long_short, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_ushort", native_long, native_ushort, H5T_conv_long_ushort, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_short", native_ulong, native_short, H5T_conv_ulong_short, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_ushort", native_ulong, native_ushort, H5T_conv_ulong_ushort, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_int", native_long, native_int, H5T_conv_long_int, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_uint", native_long, native_uint, H5T_conv_long_uint, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_int", native_ulong, native_int, H5T_conv_ulong_int, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_uint", native_ulong, native_uint, H5T_conv_ulong_uint, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_schar", native_long, native_schar, H5T_conv_long_schar, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_uchar", native_long, native_uchar, H5T_conv_long_uchar, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_schar", native_ulong, native_schar, H5T_conv_ulong_schar, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_uchar", native_ulong, native_uchar, H5T_conv_ulong_uchar, H5AC_dxpl_id, FALSE);
 
     /* From short */
-    status |= H5T_register(H5T_PERS_HARD, "short_llong", native_short, native_llong, H5T_conv_short_llong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_ullong", native_short, native_ullong, H5T_conv_short_ullong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_llong", native_ushort, native_llong, H5T_conv_ushort_llong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_ullong", native_ushort, native_ullong, H5T_conv_ushort_ullong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_long", native_short, native_long, H5T_conv_short_long, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_ulong", native_short, native_ulong, H5T_conv_short_ulong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_long", native_ushort, native_long, H5T_conv_ushort_long, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_ulong", native_ushort, native_ulong, H5T_conv_ushort_ulong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_ushort", native_short, native_ushort, H5T_conv_short_ushort, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_short", native_ushort, native_short, H5T_conv_ushort_short, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_int", native_short, native_int, H5T_conv_short_int, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_uint", native_short, native_uint, H5T_conv_short_uint, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_int", native_ushort, native_int, H5T_conv_ushort_int, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_uint", native_ushort, native_uint, H5T_conv_ushort_uint, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_schar", native_short, native_schar, H5T_conv_short_schar, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_uchar", native_short, native_uchar, H5T_conv_short_uchar, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_schar", native_ushort, native_schar, H5T_conv_ushort_schar, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_uchar", native_ushort, native_uchar, H5T_conv_ushort_uchar, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_llong", native_short, native_llong, H5T_conv_short_llong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_ullong", native_short, native_ullong, H5T_conv_short_ullong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_llong", native_ushort, native_llong, H5T_conv_ushort_llong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_ullong", native_ushort, native_ullong, H5T_conv_ushort_ullong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_long", native_short, native_long, H5T_conv_short_long, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_ulong", native_short, native_ulong, H5T_conv_short_ulong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_long", native_ushort, native_long, H5T_conv_ushort_long, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_ulong", native_ushort, native_ulong, H5T_conv_ushort_ulong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_ushort", native_short, native_ushort, H5T_conv_short_ushort, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_short", native_ushort, native_short, H5T_conv_ushort_short, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_int", native_short, native_int, H5T_conv_short_int, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_uint", native_short, native_uint, H5T_conv_short_uint, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_int", native_ushort, native_int, H5T_conv_ushort_int, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_uint", native_ushort, native_uint, H5T_conv_ushort_uint, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_schar", native_short, native_schar, H5T_conv_short_schar, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_uchar", native_short, native_uchar, H5T_conv_short_uchar, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_schar", native_ushort, native_schar, H5T_conv_ushort_schar, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_uchar", native_ushort, native_uchar, H5T_conv_ushort_uchar, H5AC_dxpl_id, FALSE);
 
     /* From int */
-    status |= H5T_register(H5T_PERS_HARD, "int_llong", native_int, native_llong, H5T_conv_int_llong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_ullong", native_int, native_ullong, H5T_conv_int_ullong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_llong", native_uint, native_llong, H5T_conv_uint_llong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_ullong", native_uint, native_ullong, H5T_conv_uint_ullong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_long", native_int, native_long, H5T_conv_int_long, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_ulong", native_int, native_ulong, H5T_conv_int_ulong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_long", native_uint, native_long, H5T_conv_uint_long, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_ulong", native_uint, native_ulong, H5T_conv_uint_ulong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_short", native_int, native_short, H5T_conv_int_short, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_ushort", native_int, native_ushort, H5T_conv_int_ushort, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_short", native_uint, native_short, H5T_conv_uint_short, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_ushort", native_uint, native_ushort, H5T_conv_uint_ushort, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_uint", native_int, native_uint, H5T_conv_int_uint, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_int", native_uint, native_int, H5T_conv_uint_int, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_schar", native_int, native_schar, H5T_conv_int_schar, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_uchar", native_int, native_uchar, H5T_conv_int_uchar, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_schar", native_uint, native_schar, H5T_conv_uint_schar, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_uchar", native_uint, native_uchar, H5T_conv_uint_uchar, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_llong", native_int, native_llong, H5T_conv_int_llong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_ullong", native_int, native_ullong, H5T_conv_int_ullong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_llong", native_uint, native_llong, H5T_conv_uint_llong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_ullong", native_uint, native_ullong, H5T_conv_uint_ullong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_long", native_int, native_long, H5T_conv_int_long, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_ulong", native_int, native_ulong, H5T_conv_int_ulong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_long", native_uint, native_long, H5T_conv_uint_long, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_ulong", native_uint, native_ulong, H5T_conv_uint_ulong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_short", native_int, native_short, H5T_conv_int_short, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_ushort", native_int, native_ushort, H5T_conv_int_ushort, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_short", native_uint, native_short, H5T_conv_uint_short, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_ushort", native_uint, native_ushort, H5T_conv_uint_ushort, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_uint", native_int, native_uint, H5T_conv_int_uint, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_int", native_uint, native_int, H5T_conv_uint_int, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_schar", native_int, native_schar, H5T_conv_int_schar, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_uchar", native_int, native_uchar, H5T_conv_int_uchar, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_schar", native_uint, native_schar, H5T_conv_uint_schar, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_uchar", native_uint, native_uchar, H5T_conv_uint_uchar, H5AC_dxpl_id, FALSE);
 
     /* From char */
-    status |= H5T_register(H5T_PERS_HARD, "schar_llong", native_schar, native_llong, H5T_conv_schar_llong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_ullong", native_schar, native_ullong, H5T_conv_schar_ullong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_llong", native_uchar, native_llong, H5T_conv_uchar_llong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_ullong", native_uchar, native_ullong, H5T_conv_uchar_ullong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_long", native_schar, native_long, H5T_conv_schar_long, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_ulong", native_schar, native_ulong, H5T_conv_schar_ulong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_long", native_uchar, native_long, H5T_conv_uchar_long, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_ulong", native_uchar, native_ulong, H5T_conv_uchar_ulong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_short", native_schar, native_short, H5T_conv_schar_short, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_ushort", native_schar, native_ushort, H5T_conv_schar_ushort, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_short", native_uchar, native_short, H5T_conv_uchar_short, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_ushort", native_uchar, native_ushort, H5T_conv_uchar_ushort, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_int", native_schar, native_int, H5T_conv_schar_int, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_uint", native_schar, native_uint, H5T_conv_schar_uint, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_int", native_uchar, native_int, H5T_conv_uchar_int, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_uint", native_uchar, native_uint, H5T_conv_uchar_uint, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_uchar", native_schar, native_uchar, H5T_conv_schar_uchar, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_schar", native_uchar, native_schar, H5T_conv_uchar_schar, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_llong", native_schar, native_llong, H5T_conv_schar_llong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_ullong", native_schar, native_ullong, H5T_conv_schar_ullong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_llong", native_uchar, native_llong, H5T_conv_uchar_llong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_ullong", native_uchar, native_ullong, H5T_conv_uchar_ullong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_long", native_schar, native_long, H5T_conv_schar_long, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_ulong", native_schar, native_ulong, H5T_conv_schar_ulong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_long", native_uchar, native_long, H5T_conv_uchar_long, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_ulong", native_uchar, native_ulong, H5T_conv_uchar_ulong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_short", native_schar, native_short, H5T_conv_schar_short, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_ushort", native_schar, native_ushort, H5T_conv_schar_ushort, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_short", native_uchar, native_short, H5T_conv_uchar_short, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_ushort", native_uchar, native_ushort, H5T_conv_uchar_ushort, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_int", native_schar, native_int, H5T_conv_schar_int, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_uint", native_schar, native_uint, H5T_conv_schar_uint, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_int", native_uchar, native_int, H5T_conv_uchar_int, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_uint", native_uchar, native_uint, H5T_conv_uchar_uint, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_uchar", native_schar, native_uchar, H5T_conv_schar_uchar, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_schar", native_uchar, native_schar, H5T_conv_uchar_schar, H5AC_dxpl_id, FALSE);
 
     /* From char to floats */
-    status |= H5T_register(H5T_PERS_HARD, "schar_flt", native_schar, native_float, H5T_conv_schar_float, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "schar_dbl", native_schar, native_double, H5T_conv_schar_double, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_flt", native_schar, native_float, H5T_conv_schar_float, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_dbl", native_schar, native_double, H5T_conv_schar_double, H5AC_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_INTEGER_LDOUBLE
-    status |= H5T_register(H5T_PERS_HARD, "schar_ldbl", native_schar, native_ldouble, H5T_conv_schar_ldouble, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "schar_ldbl", native_schar, native_ldouble, H5T_conv_schar_ldouble, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_INTEGER_LDOUBLE */
 
     /* From unsigned char to floats */
-    status |= H5T_register(H5T_PERS_HARD, "uchar_flt", native_uchar, native_float, H5T_conv_uchar_float, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uchar_dbl", native_uchar, native_double, H5T_conv_uchar_double, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_flt", native_uchar, native_float, H5T_conv_uchar_float, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_dbl", native_uchar, native_double, H5T_conv_uchar_double, H5AC_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_INTEGER_LDOUBLE
-    status |= H5T_register(H5T_PERS_HARD, "uchar_ldbl", native_uchar, native_ldouble, H5T_conv_uchar_ldouble, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uchar_ldbl", native_uchar, native_ldouble, H5T_conv_uchar_ldouble, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_INTEGER_LDOUBLE */
 
     /* From short to floats */
-    status |= H5T_register(H5T_PERS_HARD, "short_flt", native_short, native_float, H5T_conv_short_float, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "short_dbl", native_short, native_double, H5T_conv_short_double, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_flt", native_short, native_float, H5T_conv_short_float, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_dbl", native_short, native_double, H5T_conv_short_double, H5AC_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_INTEGER_LDOUBLE
-    status |= H5T_register(H5T_PERS_HARD, "short_ldbl", native_short, native_ldouble, H5T_conv_short_ldouble, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "short_ldbl", native_short, native_ldouble, H5T_conv_short_ldouble, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_INTEGER_LDOUBLE */
 
     /* From unsigned short to floats */
-    status |= H5T_register(H5T_PERS_HARD, "ushort_flt", native_ushort, native_float, H5T_conv_ushort_float, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ushort_dbl", native_ushort, native_double, H5T_conv_ushort_double, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_flt", native_ushort, native_float, H5T_conv_ushort_float, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_dbl", native_ushort, native_double, H5T_conv_ushort_double, H5AC_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_INTEGER_LDOUBLE
-    status |= H5T_register(H5T_PERS_HARD, "ushort_ldbl", native_ushort, native_ldouble, H5T_conv_ushort_ldouble, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ushort_ldbl", native_ushort, native_ldouble, H5T_conv_ushort_ldouble, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_INTEGER_LDOUBLE */
 
     /* From int to floats */
-    status |= H5T_register(H5T_PERS_HARD, "int_flt", native_int, native_float, H5T_conv_int_float, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "int_dbl", native_int, native_double, H5T_conv_int_double, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_flt", native_int, native_float, H5T_conv_int_float, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_dbl", native_int, native_double, H5T_conv_int_double, H5AC_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_INTEGER_LDOUBLE
-    status |= H5T_register(H5T_PERS_HARD, "int_ldbl", native_int, native_ldouble, H5T_conv_int_ldouble, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "int_ldbl", native_int, native_ldouble, H5T_conv_int_ldouble, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_INTEGER_LDOUBLE */
 
     /* From unsigned int to floats */
-    status |= H5T_register(H5T_PERS_HARD, "uint_flt", native_uint, native_float, H5T_conv_uint_float, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "uint_dbl", native_uint, native_double, H5T_conv_uint_double, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_flt", native_uint, native_float, H5T_conv_uint_float, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_dbl", native_uint, native_double, H5T_conv_uint_double, H5AC_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_INTEGER_LDOUBLE
-    status |= H5T_register(H5T_PERS_HARD, "uint_ldbl", native_uint, native_ldouble, H5T_conv_uint_ldouble, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "uint_ldbl", native_uint, native_ldouble, H5T_conv_uint_ldouble, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_INTEGER_LDOUBLE */
 
     /* From long to floats */
-    status |= H5T_register(H5T_PERS_HARD, "long_flt", native_long, native_float, H5T_conv_long_float, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "long_dbl", native_long, native_double, H5T_conv_long_double, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_flt", native_long, native_float, H5T_conv_long_float, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_dbl", native_long, native_double, H5T_conv_long_double, H5AC_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_INTEGER_LDOUBLE
-    status |= H5T_register(H5T_PERS_HARD, "long_ldbl", native_long, native_ldouble, H5T_conv_long_ldouble, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "long_ldbl", native_long, native_ldouble, H5T_conv_long_ldouble, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_INTEGER_LDOUBLE */
 
     /* From unsigned long to floats */
 #if H5T_CONV_INTERNAL_ULONG_FP
-    status |= H5T_register(H5T_PERS_HARD, "ulong_flt", native_ulong, native_float, H5T_conv_ulong_float, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ulong_dbl", native_ulong, native_double, H5T_conv_ulong_double, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_flt", native_ulong, native_float, H5T_conv_ulong_float, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_dbl", native_ulong, native_double, H5T_conv_ulong_double, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_ULONG_FP */
 #if H5T_CONV_INTERNAL_ULONG_LDOUBLE
-    status |= H5T_register(H5T_PERS_HARD, "ulong_ldbl", native_ulong, native_ldouble, H5T_conv_ulong_ldouble, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ulong_ldbl", native_ulong, native_ldouble, H5T_conv_ulong_ldouble, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_ULONG_LDOUBLE */
 
     /* From long long to floats */
-    status |= H5T_register(H5T_PERS_HARD, "llong_flt", native_llong, native_float, H5T_conv_llong_float, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "llong_dbl", native_llong, native_double, H5T_conv_llong_double, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_flt", native_llong, native_float, H5T_conv_llong_float, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_dbl", native_llong, native_double, H5T_conv_llong_double, H5AC_dxpl_id, FALSE);
 #ifdef H5T_CONV_INTERNAL_LLONG_LDOUBLE
-    status |= H5T_register(H5T_PERS_HARD, "llong_ldbl", native_llong, native_ldouble, H5T_conv_llong_ldouble, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "llong_ldbl", native_llong, native_ldouble, H5T_conv_llong_ldouble, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_LLONG_LDOUBLE */
 
     /* From unsigned long long to floats */
 #if H5T_CONV_INTERNAL_ULLONG_FP
-    status |= H5T_register(H5T_PERS_HARD, "ullong_flt", native_ullong, native_float, H5T_conv_ullong_float, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "ullong_dbl", native_ullong, native_double, H5T_conv_ullong_double, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_flt", native_ullong, native_float, H5T_conv_ullong_float, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_dbl", native_ullong, native_double, H5T_conv_ullong_double, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_ULLONG_FP */
 #ifdef H5T_CONV_INTERNAL_ULLONG_LDOUBLE
-    status |= H5T_register(H5T_PERS_HARD, "ullong_ldbl", native_ullong, native_ldouble, H5T_conv_ullong_ldouble, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ullong_ldbl", native_ullong, native_ldouble, H5T_conv_ullong_ldouble, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_ULLONG_LDOUBLE */
 
     /* From floats to char */
-    status |= H5T_register(H5T_PERS_HARD, "flt_schar", native_float, native_schar, H5T_conv_float_schar, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_schar", native_double, native_schar, H5T_conv_double_schar, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_schar", native_float, native_schar, H5T_conv_float_schar, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_schar", native_double, native_schar, H5T_conv_double_schar, H5AC_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_LDOUBLE_INTEGER
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_schar", native_ldouble, native_schar, H5T_conv_ldouble_schar, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_schar", native_ldouble, native_schar, H5T_conv_ldouble_schar, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_LDOUBLE_INTEGER */
 
     /* From floats to unsigned char */
-    status |= H5T_register(H5T_PERS_HARD, "flt_uchar", native_float, native_uchar, H5T_conv_float_uchar, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_uchar", native_double, native_uchar, H5T_conv_double_uchar, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_uchar", native_float, native_uchar, H5T_conv_float_uchar, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_uchar", native_double, native_uchar, H5T_conv_double_uchar, H5AC_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_LDOUBLE_INTEGER
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_uchar", native_ldouble, native_uchar, H5T_conv_ldouble_uchar, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_uchar", native_ldouble, native_uchar, H5T_conv_ldouble_uchar, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_LDOUBLE_INTEGER */
 
     /* From floats to short */
-    status |= H5T_register(H5T_PERS_HARD, "flt_short", native_float, native_short, H5T_conv_float_short, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_short", native_double, native_short, H5T_conv_double_short, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_short", native_float, native_short, H5T_conv_float_short, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_short", native_double, native_short, H5T_conv_double_short, H5AC_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_LDOUBLE_INTEGER
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_short", native_ldouble, native_short, H5T_conv_ldouble_short, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_short", native_ldouble, native_short, H5T_conv_ldouble_short, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_LDOUBLE_INTEGER */
 
     /* From floats to unsigned short */
-    status |= H5T_register(H5T_PERS_HARD, "flt_ushort", native_float, native_ushort, H5T_conv_float_ushort, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_ushort", native_double, native_ushort, H5T_conv_double_ushort, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_ushort", native_float, native_ushort, H5T_conv_float_ushort, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_ushort", native_double, native_ushort, H5T_conv_double_ushort, H5AC_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_LDOUBLE_INTEGER
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_ushort", native_ldouble, native_ushort, H5T_conv_ldouble_ushort, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_ushort", native_ldouble, native_ushort, H5T_conv_ldouble_ushort, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_LDOUBLE_INTEGER */
 
     /* From floats to int */
-    status |= H5T_register(H5T_PERS_HARD, "flt_int", native_float, native_int, H5T_conv_float_int, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_int", native_double, native_int, H5T_conv_double_int, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_int", native_float, native_int, H5T_conv_float_int, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_int", native_double, native_int, H5T_conv_double_int, H5AC_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_LDOUBLE_INTEGER
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_int", native_ldouble, native_int, H5T_conv_ldouble_int, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_int", native_ldouble, native_int, H5T_conv_ldouble_int, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_LDOUBLE_INTEGER */
 
     /* From floats to unsigned int */
-    status |= H5T_register(H5T_PERS_HARD, "flt_uint", native_float, native_uint, H5T_conv_float_uint, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_uint", native_double, native_uint, H5T_conv_double_uint, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_uint", native_float, native_uint, H5T_conv_float_uint, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_uint", native_double, native_uint, H5T_conv_double_uint, H5AC_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_LDOUBLE_UINT
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_uint", native_ldouble, native_uint, H5T_conv_ldouble_uint, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_uint", native_ldouble, native_uint, H5T_conv_ldouble_uint, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_LDOUBLE_UINT */
 
-    status |= H5T_register(H5T_PERS_HARD, "flt_long", native_float, native_long, H5T_conv_float_long, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_long", native_double, native_long, H5T_conv_double_long, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_long", native_float, native_long, H5T_conv_float_long, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_long", native_double, native_long, H5T_conv_double_long, H5AC_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_LDOUBLE_INTEGER
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_long", native_ldouble, native_long, H5T_conv_ldouble_long, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_long", native_ldouble, native_long, H5T_conv_ldouble_long, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_LDOUBLE_INTEGER */
 
     /* From floats to unsigned long */
-    status |= H5T_register(H5T_PERS_HARD, "flt_ulong", native_float, native_ulong, H5T_conv_float_ulong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_ulong", native_double, native_ulong, H5T_conv_double_ulong, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_ulong", native_float, native_ulong, H5T_conv_float_ulong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_ulong", native_double, native_ulong, H5T_conv_double_ulong, H5AC_dxpl_id, FALSE);
 #if H5T_CONV_INTERNAL_LDOUBLE_INTEGER
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_ulong", native_ldouble, native_ulong, H5T_conv_ldouble_ulong, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_ulong", native_ldouble, native_ulong, H5T_conv_ldouble_ulong, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_LDOUBLE_INTEGER */
 
     /* From floats to long long */
 #if H5T_CONV_INTERNAL_FP_LLONG
-    status |= H5T_register(H5T_PERS_HARD, "flt_llong", native_float, native_llong, H5T_conv_float_llong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_llong", native_double, native_llong, H5T_conv_double_llong, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_llong", native_float, native_llong, H5T_conv_float_llong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_llong", native_double, native_llong, H5T_conv_double_llong, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_FP_LLONG */
 #ifdef H5T_CONV_INTERNAL_LDOUBLE_LLONG
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_llong", native_ldouble, native_llong, H5T_conv_ldouble_llong, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_llong", native_ldouble, native_llong, H5T_conv_ldouble_llong, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_LDOUBLE_LLONG */
 
     /* From floats to unsigned long long */
 #if H5T_CONV_INTERNAL_FP_ULLONG
-    status |= H5T_register(H5T_PERS_HARD, "flt_ullong", native_float, native_ullong, H5T_conv_float_ullong, H5AC2_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_HARD, "dbl_ullong", native_double, native_ullong, H5T_conv_double_ullong, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "flt_ullong", native_float, native_ullong, H5T_conv_float_ullong, H5AC_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "dbl_ullong", native_double, native_ullong, H5T_conv_double_ullong, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_FP_ULLONG */
 #if H5T_CONV_INTERNAL_LDOUBLE_ULLONG
-    status |= H5T_register(H5T_PERS_HARD, "ldbl_ullong", native_ldouble, native_ullong, H5T_conv_ldouble_ullong, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "ldbl_ullong", native_ldouble, native_ullong, H5T_conv_ldouble_ullong, H5AC_dxpl_id, FALSE);
 #endif /* H5T_CONV_INTERNAL_LDOUBLE_ULLONG */
 
     /*
@@ -1301,7 +1301,7 @@ H5T_init_interface(void)
      * data types we use are not important as long as the source and
      * destination are equal.
      */
-    status |= H5T_register(H5T_PERS_HARD, "no-op", native_int, native_int, H5T_conv_noop, H5AC2_dxpl_id, FALSE);
+    status |= H5T_register(H5T_PERS_HARD, "no-op", native_int, native_int, H5T_conv_noop, H5AC_dxpl_id, FALSE);
 
     /* Initialize the +/- Infinity values for floating-point types */
     status |= H5T_init_inf();
@@ -1425,7 +1425,7 @@ H5T_term_interface(void)
 		path->cdata.command = H5T_CONV_FREE;
 		if ((path->func)(FAIL, FAIL, &(path->cdata),
 				 (size_t)0, (size_t)0, (size_t)0,
-                                 NULL, NULL,H5AC2_dxpl_id)<0) {
+                                 NULL, NULL,H5AC_dxpl_id)<0) {
 #ifdef H5T_DEBUG
 		    if (H5DEBUG(T)) {
 			fprintf (H5DEBUG(T), "H5T: conversion function "
@@ -1700,7 +1700,7 @@ H5Tclose(hid_t type_id)
     H5T_t	*dt = NULL;
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_API_META(H5Tclose, type_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Tclose, type_id, H5AC_dxpl_id, FAIL)
     H5TRACE1("e", "i", type_id);
 
     /* Check args */
@@ -2445,7 +2445,7 @@ H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id,
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no conversion function specified");
 
     /* Go register the function */
-    if(H5T_register(pers,name,src,dst,func,H5AC2_ind_dxpl_id,TRUE)<0)
+    if(H5T_register(pers,name,src,dst,func,H5AC_ind_dxpl_id,TRUE)<0)
 	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register conversion function");
 
 done:
@@ -2587,7 +2587,7 @@ H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id,
     if (dst_id>0 && (NULL==(dst=H5I_object_verify(dst_id,H5I_DATATYPE))))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "dst is not a data type");
 
-    if (H5T_unregister(pers,name,src,dst,func,H5AC2_ind_dxpl_id)<0)
+    if (H5T_unregister(pers,name,src,dst,func,H5AC_ind_dxpl_id)<0)
         HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDELETE, FAIL, "internal unregister function failed");
 
 done:
@@ -2633,7 +2633,7 @@ H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata)
 	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "no address to receive cdata pointer");
 
     /* Find it */
-    if (NULL==(path=H5T_path_find(src, dst, NULL, NULL, H5AC2_ind_dxpl_id, FALSE)))
+    if (NULL==(path=H5T_path_find(src, dst, NULL, NULL, H5AC_ind_dxpl_id, FALSE)))
 	HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, NULL, "conversion function not found");
 
     if (pcdata)
@@ -2932,7 +2932,7 @@ H5T_decode(const unsigned char *buf)
 	HGOTO_ERROR(H5E_DATATYPE, H5E_VERSION, NULL, "unknown version of encoded datatype")
 
     /* Decode the serialized datatype message */
-    if((ret_value = H5O_msg_decode(f, H5AC2_dxpl_id, H5O_DTYPE_ID, buf)) == NULL)
+    if((ret_value = H5O_msg_decode(f, H5AC_dxpl_id, H5O_DTYPE_ID, buf)) == NULL)
 	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, NULL, "can't decode object")
 
 done:
@@ -3452,7 +3452,7 @@ H5T_free(H5T_t *dt)
         /* Remove the datatype from the list of opened objects in the file */
         if(H5FO_top_decr(dt->sh_loc.file, dt->sh_loc.u.loc.oh_addr) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
-        if(H5FO_delete(dt->sh_loc.file, H5AC2_dxpl_id, dt->sh_loc.u.loc.oh_addr) < 0)
+        if(H5FO_delete(dt->sh_loc.file, H5AC_dxpl_id, dt->sh_loc.u.loc.oh_addr) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "can't remove datatype from list of open objects")
         if(H5O_close(&dt->oloc) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to close data type object header")
@@ -4615,7 +4615,7 @@ H5T_compiler_conv(H5T_t *src, H5T_t *dst)
     FUNC_ENTER_NOAPI_NOINIT(H5T_compiler_conv)
 
     /* Find it */
-    if (NULL==(path=H5T_path_find(src, dst, NULL, NULL, H5AC2_ind_dxpl_id, FALSE)))
+    if (NULL==(path=H5T_path_find(src, dst, NULL, NULL, H5AC_ind_dxpl_id, FALSE)))
 	HGOTO_ERROR(H5E_DATATYPE, H5E_NOTFOUND, FAIL, "conversion function not found")
 
     ret_value = (htri_t)path->is_hard;
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index 14b410a..db0443d 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -25,7 +25,7 @@
 
 
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"        /* Metadata cache                       */
 #include "H5Eprivate.h"		/* Error handling			*/
 #include "H5FOprivate.h"	/* File objects				*/
 #include "H5Iprivate.h"		/* IDs					*/
@@ -80,7 +80,7 @@ H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id,
     H5T_t	*type;                  /* Datatype for ID */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_API_META(H5Tcommit2, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Tcommit2, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE6("e", "i*siiii", loc_id, name, type_id, lcpl_id, tcpl_id, tapl_id);
 
     /* Check arguments */
@@ -113,7 +113,7 @@ H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id,
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype access property list")
 
     /* Commit the type */
-    if(H5T_commit_named(&loc, name, type, lcpl_id, tcpl_id, tapl_id, H5AC2_dxpl_id) < 0)
+    if(H5T_commit_named(&loc, name, type, lcpl_id, tcpl_id, tapl_id, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype")
 
 done:
@@ -229,7 +229,7 @@ H5Tcommit_anon(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t tapl_id)
     H5T_t	*type = NULL;
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_API_META(H5Tcommit_anon, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Tcommit_anon, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE4("e", "iiii", loc_id, type_id, tcpl_id, tapl_id);
 
     /* Check arguments */
@@ -253,7 +253,7 @@ H5Tcommit_anon(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t tapl_id)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype access property list")
 
     /* Commit the type */
-    if(H5T_commit(loc.oloc->file, type, tcpl_id, H5AC2_dxpl_id) < 0)
+    if(H5T_commit(loc.oloc->file, type, tcpl_id, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype")
 
 done:
@@ -492,7 +492,7 @@ H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id)
     H5O_type_t   obj_type;              /* Type of object at location */
     H5G_loc_t    type_loc;              /* Group object for datatype */
     hbool_t      obj_found = FALSE;     /* Object at 'name' found */
-    hid_t        dxpl_id = H5AC2_dxpl_id; /* dxpl to use to open datatype */
+    hid_t        dxpl_id = H5AC_dxpl_id; /* dxpl to use to open datatype */
     hid_t        ret_value = FAIL;
 
     FUNC_ENTER_API(H5Topen2, FAIL)
@@ -603,7 +603,7 @@ H5Tget_create_plist(hid_t dtype_id)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
 
         /* Retrieve any object creation properties */
-        if(H5O_get_create_plist(&type->oloc, H5AC2_ind_dxpl_id, new_plist) < 0)
+        if(H5O_get_create_plist(&type->oloc, H5AC_ind_dxpl_id, new_plist) < 0)
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "can't get object creation info")
     } /* end if */
 
diff --git a/src/H5Tdeprec.c b/src/H5Tdeprec.c
index d6f741e..1adfa05 100644
--- a/src/H5Tdeprec.c
+++ b/src/H5Tdeprec.c
@@ -41,7 +41,7 @@
 /* Headers */
 /***********/
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"       /* Metadata cache                       */
+#include "H5ACprivate.h"        /* Metadata cache                       */
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FOprivate.h"	/* File objects				*/
 #include "H5Iprivate.h"		/* IDs					*/
@@ -128,7 +128,7 @@ H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id)
     H5T_t	*type;                  /* Datatype for ID */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_API_META(H5Tcommit1, loc_id, H5AC2_dxpl_id, FAIL)
+    FUNC_ENTER_API_META(H5Tcommit1, loc_id, H5AC_dxpl_id, FAIL)
     H5TRACE3("e", "i*si", loc_id, name, type_id);
 
     /* Check arguments */
@@ -141,7 +141,7 @@ H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id)
 
     /* Commit the datatype to the file, using default property list values */
     if(H5T_commit_named(&loc, name, type, H5P_LINK_CREATE_DEFAULT,
-            H5P_DATATYPE_CREATE_DEFAULT, H5P_DATATYPE_ACCESS_DEFAULT, H5AC2_dxpl_id) < 0)
+            H5P_DATATYPE_CREATE_DEFAULT, H5P_DATATYPE_ACCESS_DEFAULT, H5AC_dxpl_id) < 0)
 	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype")
 
 done:
@@ -175,7 +175,7 @@ H5Topen1(hid_t loc_id, const char *name)
     H5O_type_t   obj_type;              /* Type of object at location */
     H5G_loc_t    type_loc;              /* Group object for datatype */
     hbool_t      obj_found = FALSE;     /* Object at 'name' found */
-    hid_t        dxpl_id = H5AC2_dxpl_id; /* dxpl to use to open datatype */
+    hid_t        dxpl_id = H5AC_dxpl_id; /* dxpl to use to open datatype */
     hid_t        ret_value = FAIL;
 
     FUNC_ENTER_API(H5Topen1, FAIL)
diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c
index c720565..5ef3e7a 100644
--- a/src/H5Zscaleoffset.c
+++ b/src/H5Zscaleoffset.c
@@ -16,7 +16,7 @@
 #define H5Z_PACKAGE		/*suppress error about including H5Zpkg	  */
 
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5AC2private.h"	/* Metadata cache			*/
+#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5Iprivate.h"		/* IDs			  		*/
 #include "H5MMprivate.h"	/* Memory management			*/
@@ -878,7 +878,7 @@ H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id)
             HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, FAIL, "cannot use C integer datatype for cast")
 
         /* Get dataset fill value and store in cd_values[] */
-        if(H5Z_scaleoffset_set_parms_fillval(dcpl_plist, type, scale_type, cd_values, need_convert, H5AC2_ind_dxpl_id) < 0)
+        if(H5Z_scaleoffset_set_parms_fillval(dcpl_plist, type, scale_type, cd_values, need_convert, H5AC_ind_dxpl_id) < 0)
             HGOTO_ERROR(H5E_PLINE, H5E_CANTSET, FAIL, "unable to set fill value")
     } /* end else */
 
diff --git a/src/H5config.h.in b/src/H5config.h.in
index 107b4b6..9e135b8 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -288,7 +288,7 @@
 /* Define if `struct timezone' is defined */
 #undef HAVE_STRUCT_TIMEZONE
 
-/* Define to 1 if `tm_zone' is member of `struct tm'. */
+/* Define to 1 if `struct tm' is a member of `tm_zone'. */
 #undef HAVE_STRUCT_TM_TM_ZONE
 
 /* Define if `struct videoconfig' is defined */
@@ -466,6 +466,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
diff --git a/src/H5private.h b/src/H5private.h
index 749da71..9f59047 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -1753,11 +1753,11 @@ static herr_t		H5_INTERFACE_INIT_FUNC(void);
         /* Clear thread error stack entering public functions */	      \
         H5E_clear_stack(NULL);                                                \
                                                                               \
-	if (H5AC2_begin_transaction(id, &do_transaction, &id_oloc,            \
+	if (H5AC_begin_transaction(id, &do_transaction, &id_oloc,            \
 				    &id_oloc_open, &transaction_begun,        \
 				    &trans_num, FUNC) < 0) {                  \
 		    HGOTO_ERROR(H5E_CACHE, H5E_CANTJOURNAL, err,              \
-				"H5AC2_begin_transaction() failed.");         \
+				"H5AC_begin_transaction() failed.");         \
 	}
 
 /*
@@ -1908,11 +1908,11 @@ static herr_t		H5_INTERFACE_INIT_FUNC(void);
 /* Use this macro to match the FUNC_ENTER_API_META macro */
 
 #define FUNC_LEAVE_API_META(ret_value)                                        \
-       if ( H5AC2_end_transaction(do_transaction, &id_oloc,                   \
+       if ( H5AC_end_transaction(do_transaction, &id_oloc,                   \
 			          id_oloc_open, transaction_begun,            \
 			          trans_dxpl_id, trans_num, FUNC) < 0 ) {     \
 	    HDONE_ERROR(H5E_CACHE, H5E_CANTJOURNAL, FAIL,                     \
-			"H5AC2_end_transaction() failed.");                   \
+			"H5AC_end_transaction() failed.");                   \
         }                                                                     \
         FINISH_MPE_LOG;                                                       \
         H5TRACE_RETURN(ret_value);					      \
@@ -1959,7 +1959,7 @@ H5_DLL void H5_term_library(void);
 /* Functions to terminate interfaces */
 H5_DLL int H5A_term_interface(void);
 H5_DLL int H5AC1_term_interface(void);
-H5_DLL int H5AC2_term_interface(void);
+H5_DLL int H5AC_term_interface(void);
 H5_DLL int H5D_term_interface(void);
 H5_DLL int H5E_term_interface(void);
 H5_DLL int H5F_term_interface(void);
diff --git a/src/Makefile.am b/src/Makefile.am
index f615e8a..1e8f936 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,9 +43,9 @@ DISTCLEANFILES=H5pubconf.h
 # library sources
 libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
         H5A.c H5Abtree2.c H5Adense.c H5Adeprec.c H5Aint.c H5Atest.c \
-        H5AC1.c H5AC2.c H5B.c H5Bcache.c \
+        H5AC1.c H5AC.c H5B.c H5Bcache.c \
         H5B2.c H5B2cache.c H5B2dbg.c H5B2int.c H5B2stat.c H5B2test.c \
-        H5C1.c H5C2.c H5C2journal.c H5CS.c \
+        H5C1.c H5C.c H5Cjournal.c H5CS.c \
         H5D.c H5Dchunk.c H5Dcompact.c H5Dcontig.c H5Ddbg.c \
         H5Ddeprec.c H5Defl.c H5Dfill.c H5Dint.c \
         H5Dio.c \
@@ -99,8 +99,8 @@ libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
 
 # Public headers
 include_HEADERS = hdf5.h H5api_adpt.h H5pubconf.h H5public.h H5version.h \
-        H5Apublic.h H5AC1public.h H5AC2public.h \
-        H5C1public.h H5C2public.h H5Dpublic.h \
+        H5Apublic.h H5AC1public.h H5ACpublic.h \
+        H5C1public.h H5Cpublic.h H5Dpublic.h \
         H5Epubgen.h H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDcore.h H5FDdirect.h \
 	H5FDfamily.h H5FDlog.h H5FDmpi.h H5FDmpio.h H5FDmpiposix.h              \
         H5FDmulti.h H5FDsec2.h  H5FDstdio.h \
diff --git a/src/Makefile.in b/src/Makefile.in
index 501972b..85e76b2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -97,9 +97,9 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
 libhdf5_la_LIBADD =
 am_libhdf5_la_OBJECTS = H5.lo H5checksum.lo H5dbg.lo H5system.lo \
 	H5timer.lo H5trace.lo H5A.lo H5Abtree2.lo H5Adense.lo \
-	H5Adeprec.lo H5Aint.lo H5Atest.lo H5AC1.lo H5AC2.lo H5B.lo \
+	H5Adeprec.lo H5Aint.lo H5Atest.lo H5AC1.lo H5AC.lo H5B.lo \
 	H5Bcache.lo H5B2.lo H5B2cache.lo H5B2dbg.lo H5B2int.lo \
-	H5B2stat.lo H5B2test.lo H5C1.lo H5C2.lo H5C2journal.lo H5CS.lo \
+	H5B2stat.lo H5B2test.lo H5C1.lo H5C.lo H5Cjournal.lo H5CS.lo \
 	H5D.lo H5Dchunk.lo H5Dcompact.lo H5Dcontig.lo H5Ddbg.lo \
 	H5Ddeprec.lo H5Defl.lo H5Dfill.lo H5Dint.lo H5Dio.lo \
 	H5Distore.lo H5Dmpio.lo H5Doh.lo H5Dscatgath.lo H5Dselect.lo \
@@ -447,9 +447,9 @@ DISTCLEANFILES = H5pubconf.h
 # library sources
 libhdf5_la_SOURCES = H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
         H5A.c H5Abtree2.c H5Adense.c H5Adeprec.c H5Aint.c H5Atest.c \
-        H5AC1.c H5AC2.c H5B.c H5Bcache.c \
+        H5AC1.c H5AC.c H5B.c H5Bcache.c \
         H5B2.c H5B2cache.c H5B2dbg.c H5B2int.c H5B2stat.c H5B2test.c \
-        H5C1.c H5C2.c H5C2journal.c H5CS.c \
+        H5C1.c H5C.c H5Cjournal.c H5CS.c \
         H5D.c H5Dchunk.c H5Dcompact.c H5Dcontig.c H5Ddbg.c \
         H5Ddeprec.c H5Defl.c H5Dfill.c H5Dint.c \
         H5Dio.c \
@@ -503,8 +503,8 @@ libhdf5_la_SOURCES = H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
 
 # Public headers
 include_HEADERS = hdf5.h H5api_adpt.h H5pubconf.h H5public.h H5version.h \
-        H5Apublic.h H5AC1public.h H5AC2public.h \
-        H5C1public.h H5C2public.h H5Dpublic.h \
+        H5Apublic.h H5AC1public.h H5ACpublic.h \
+        H5C1public.h H5Cpublic.h H5Dpublic.h \
         H5Epubgen.h H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDcore.h H5FDdirect.h \
 	H5FDfamily.h H5FDlog.h H5FDmpi.h H5FDmpio.h H5FDmpiposix.h              \
         H5FDmulti.h H5FDsec2.h  H5FDstdio.h \
@@ -640,8 +640,8 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5A.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5AC.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5AC1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5AC2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Abtree2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Adense.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Adeprec.Plo@am__quote@
@@ -655,10 +655,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2stat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2test.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Bcache.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5C.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5C1.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5C2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5C2journal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5CS.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Cjournal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5D.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dchunk.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dcompact.Plo@am__quote@
diff --git a/src/hdf5.h b/src/hdf5.h
index f537141..ed1bc20 100644
--- a/src/hdf5.h
+++ b/src/hdf5.h
@@ -24,7 +24,7 @@
 #include "H5public.h"
 #include "H5Apublic.h"		/* Attributes				*/
 #include "H5AC1public.h"	/* Metadata cache			*/
-#include "H5AC2public.h"	/* New Metadata cache			*/
+#include "H5ACpublic.h"		/* Metadata cache			*/
 #include "H5Dpublic.h"		/* Datasets				*/
 #include "H5Epublic.h"		/* Errors				*/
 #include "H5Fpublic.h"		/* Files				*/