[svn-r18426] Description:

	Rename "old" cache code and routines from H5AC to H5AC1.

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

4 files changed, 281 insertions, 243 deletions

diff --git a/testpar/Makefile.am b/testpar/Makefile.am
index df3a168..765e504 100644
--- a/testpar/Makefile.am
+++ b/testpar/Makefile.am
@@ -25,7 +25,7 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test
 
 # Test programs and scripts.  These are our main targets.
 #
-TEST_PROG_PARA=t_mpi t_posix_compliant testphdf5 t_cache t_cache2 \
+TEST_PROG_PARA=t_mpi t_posix_compliant testphdf5 t_cache1 t_cache2 \
 		t_pflush1 t_pflush2
 TEST_SCRIPT_PARA=testph5.sh
 
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index b074dad..b12831b 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -32,8 +33,9 @@
 #
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -61,13 +63,14 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/src/H5config.h
 CONFIG_CLEAN_FILES = testph5.sh
+CONFIG_CLEAN_VPATH_FILES =
 am__EXEEXT_1 = t_mpi$(EXEEXT) t_posix_compliant$(EXEEXT) \
-	testphdf5$(EXEEXT) t_cache$(EXEEXT) t_cache2$(EXEEXT) \
+	testphdf5$(EXEEXT) t_cache1$(EXEEXT) t_cache2$(EXEEXT) \
 	t_pflush1$(EXEEXT) t_pflush2$(EXEEXT)
-t_cache_SOURCES = t_cache.c
-t_cache_OBJECTS = t_cache.$(OBJEXT)
-t_cache_LDADD = $(LDADD)
-t_cache_DEPENDENCIES = $(LIBH5TEST) $(LIBHDF5)
+t_cache1_SOURCES = t_cache1.c
+t_cache1_OBJECTS = t_cache1.$(OBJEXT)
+t_cache1_LDADD = $(LDADD)
+t_cache1_DEPENDENCIES = $(LIBH5TEST) $(LIBHDF5)
 t_cache2_SOURCES = t_cache2.c
 t_cache2_OBJECTS = t_cache2.$(OBJEXT)
 t_cache2_LDADD = $(LDADD)
@@ -98,6 +101,7 @@ testphdf5_DEPENDENCIES = $(LIBH5TEST) $(LIBHDF5)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -107,12 +111,14 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = t_cache.c t_cache2.c t_mpi.c t_pflush1.c t_pflush2.c \
+SOURCES = t_cache1.c t_cache2.c t_mpi.c t_pflush1.c t_pflush2.c \
 	t_posix_compliant.c $(testphdf5_SOURCES)
-DIST_SOURCES = t_cache.c t_cache2.c t_mpi.c t_pflush1.c t_pflush2.c \
+DIST_SOURCES = t_cache1.c t_cache2.c t_mpi.c t_pflush1.c t_pflush2.c \
 	t_posix_compliant.c $(testphdf5_SOURCES)
 ETAGS = etags
 CTAGS = ctags
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
 am__EXEEXT_2 =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = /home1/packages/automake/automake-1.9.6/bin/aclocal-1.9 -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
@@ -206,6 +212,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LINUX_LFS = @LINUX_LFS@
+LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_STATIC_EXEC = @LT_STATIC_EXEC@
@@ -216,13 +223,17 @@ MPE = @MPE@
 MPI_GET_SIZE = @MPI_GET_SIZE@
 NM = @NM@
 NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PARALLEL = @PARALLEL@
 PATH_SEPARATOR = @PATH_SEPARATOR@
@@ -318,6 +329,7 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 
@@ -370,7 +382,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test
 
 # Test programs and scripts.  These are our main targets.
 #
-TEST_PROG_PARA = t_mpi t_posix_compliant testphdf5 t_cache t_cache2 \
+TEST_PROG_PARA = t_mpi t_posix_compliant testphdf5 t_cache1 t_cache2 \
 		t_pflush1 t_pflush2
 
 TEST_SCRIPT_PARA = testph5.sh
@@ -406,14 +418,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  testpar/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  testpar/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign testpar/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign testpar/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -431,18 +443,21 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 testph5.sh: $(top_builddir)/config.status $(srcdir)/testph5.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-t_cache$(EXEEXT): $(t_cache_OBJECTS) $(t_cache_DEPENDENCIES) 
-	@rm -f t_cache$(EXEEXT)
-	$(LINK) $(t_cache_OBJECTS) $(t_cache_LDADD) $(LIBS)
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+t_cache1$(EXEEXT): $(t_cache1_OBJECTS) $(t_cache1_DEPENDENCIES) 
+	@rm -f t_cache1$(EXEEXT)
+	$(LINK) $(t_cache1_OBJECTS) $(t_cache1_LDADD) $(LIBS)
 t_cache2$(EXEEXT): $(t_cache2_OBJECTS) $(t_cache2_DEPENDENCIES) 
 	@rm -f t_cache2$(EXEEXT)
 	$(LINK) $(t_cache2_OBJECTS) $(t_cache2_LDADD) $(LIBS)
@@ -468,7 +483,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_cache.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_cache1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_cache2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_chunk_alloc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_coll_chunk.Po@am__quote@
@@ -486,21 +501,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -516,14 +531,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -531,29 +546,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -574,13 +594,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -610,6 +634,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -632,6 +657,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -640,18 +667,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -674,7 +711,7 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: install-am install-strip
+.MAKE: check-am install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
 	clean clean-checkPROGRAMS clean-generic clean-libtool ctags \
@@ -896,6 +933,7 @@ check-vfd: $(LIB) $(PROGS) $(TESTS)
 	        HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check || exit 1;    \
 	    fi;                                                               \
 	done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/testpar/t_cache.c b/testpar/t_cache1.c
index 215761b..add720a 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache1.c
@@ -21,15 +21,15 @@
 #include "h5test.h"
 #include "testpar.h"
 #include "H5Iprivate.h"
-#include "H5ACprivate.h"
+#include "H5AC1private.h"
 
-#define H5C_PACKAGE             /*suppress error about including H5Cpkg   */
+#define H5C1_PACKAGE             /*suppress error about including H5Cpkg   */
 
-#include "H5Cpkg.h"
+#include "H5C1pkg.h"
 
-#define H5AC_PACKAGE            /*suppress error about including H5Cpkg   */
+#define H5AC1_PACKAGE            /*suppress error about including H5Cpkg   */
 
-#include "H5ACpkg.h"
+#include "H5AC1pkg.h"
 
 #define H5F_PACKAGE             /*suppress error about including H5Fpkg   */
 
@@ -84,7 +84,7 @@ long local_pins		   = 0;
  *	that may be loaded into the cache.  The individual fields are
  *	discussed below:
  *
- *	header:	Instance of H5C_cache_entry_t used by the for its data.
+ *	header:	Instance of H5C1_cache_entry_t used by the for its data.
  *		This field is only used on the file processes, not on the
  *		server process.
  *
@@ -136,7 +136,7 @@ long local_pins		   = 0;
 
 struct datum
 {
-    H5C_cache_entry_t	header;
+    H5C1_cache_entry_t	header;
     haddr_t		base_addr;
     size_t		len;
     size_t		local_len;
@@ -315,63 +315,63 @@ void * load_datum(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t addr,
                   const void UNUSED *udata1, void UNUSED *udata2);
 herr_t size_datum(H5F_t UNUSED * f, void * thing, size_t * size_ptr);
 
-#define DATUM_ENTRY_TYPE	H5AC_TEST_ID
+#define DATUM_ENTRY_TYPE	H5AC1_TEST_ID
 
 #define NUMBER_OF_ENTRY_TYPES	1
 
-const H5C_class_t types[NUMBER_OF_ENTRY_TYPES] =
+const H5C1_class_t types[NUMBER_OF_ENTRY_TYPES] =
 {
   {
     DATUM_ENTRY_TYPE,
-    (H5C_load_func_t)load_datum,
-    (H5C_flush_func_t)flush_datum,
-    (H5C_dest_func_t)destroy_datum,
-    (H5C_clear_func_t)clear_datum,
-    (H5C_size_func_t)size_datum
+    (H5C1_load_func_t)load_datum,
+    (H5C1_flush_func_t)flush_datum,
+    (H5C1_dest_func_t)destroy_datum,
+    (H5C1_clear_func_t)clear_datum,
+    (H5C1_size_func_t)size_datum
   }
 };
 
 
 /* test utility functions */
 
-void expunge_entry(H5C_t * cache_ptr, H5F_t * file_ptr, int32_t idx);
-void insert_entry(H5C_t * cache_ptr, H5F_t * file_ptr,
+void expunge_entry(H5C1_t * cache_ptr, H5F_t * file_ptr, int32_t idx);
+void insert_entry(H5C1_t * cache_ptr, H5F_t * file_ptr,
                   int32_t idx, unsigned int flags);
-void local_pin_and_unpin_random_entries(H5C_t * cache_ptr, H5F_t * file_ptr,
+void local_pin_and_unpin_random_entries(H5C1_t * cache_ptr, H5F_t * file_ptr,
                                         int min_idx, int max_idx,
 				        int min_count, int max_count);
-void local_pin_random_entry(H5C_t * cache_ptr, H5F_t * file_ptr,
+void local_pin_random_entry(H5C1_t * cache_ptr, H5F_t * file_ptr,
                             int min_idx, int max_idx);
-void local_unpin_all_entries(H5C_t * cache_ptr, H5F_t * file_ptr,
+void local_unpin_all_entries(H5C1_t * cache_ptr, H5F_t * file_ptr,
 			     hbool_t via_unprotect);
-int local_unpin_next_pinned_entry(H5C_t * cache_ptr, H5F_t * file_ptr,
+int local_unpin_next_pinned_entry(H5C1_t * cache_ptr, H5F_t * file_ptr,
                                   int start_idx, hbool_t via_unprotect);
-void lock_and_unlock_random_entries(H5C_t * cache_ptr, H5F_t * file_ptr,
+void lock_and_unlock_random_entries(H5C1_t * cache_ptr, H5F_t * file_ptr,
                                     int min_idx, int max_idx,
                                     int min_count, int max_count);
-void lock_and_unlock_random_entry(H5C_t * cache_ptr, H5F_t * file_ptr,
+void lock_and_unlock_random_entry(H5C1_t * cache_ptr, H5F_t * file_ptr,
                                   int min_idx, int max_idx);
-void lock_entry(H5C_t * cache_ptr, H5F_t * file_ptr, int32_t idx);
-void mark_pinned_entry_dirty(H5C_t * cache_ptr, H5F_t * file_ptr,
+void lock_entry(H5C1_t * cache_ptr, H5F_t * file_ptr, int32_t idx);
+void mark_pinned_entry_dirty(H5C1_t * cache_ptr, H5F_t * file_ptr,
                 int32_t idx, hbool_t size_changed, size_t new_size);
-void mark_pinned_or_protected_entry_dirty(H5C_t * cache_ptr,
+void mark_pinned_or_protected_entry_dirty(H5C1_t * cache_ptr,
                                           H5F_t * file_ptr,
                                           int32_t idx);
-void pin_entry(H5C_t * cache_ptr, H5F_t * file_ptr, int32_t idx,
+void pin_entry(H5C1_t * cache_ptr, H5F_t * file_ptr, int32_t idx,
 	       hbool_t global, hbool_t dirty);
-void pin_protected_entry(H5C_t * cache_ptr, H5F_t * file_ptr,
+void pin_protected_entry(H5C1_t * cache_ptr, H5F_t * file_ptr,
                          int32_t idx, hbool_t global);
-void rename_entry(H5C_t * cache_ptr, H5F_t * file_ptr,
+void rename_entry(H5C1_t * cache_ptr, H5F_t * file_ptr,
                   int32_t old_idx, int32_t new_idx);
-void resize_entry(H5C_t * cache_ptr, H5F_t * file_ptr,
+void resize_entry(H5C1_t * cache_ptr, H5F_t * file_ptr,
 		  int32_t idx, size_t  new_size);
 hbool_t setup_cache_for_test(hid_t * fid_ptr, H5F_t ** file_ptr_ptr,
-                             H5C_t ** cache_ptr_ptr);
+                             H5C1_t ** cache_ptr_ptr);
 void setup_rand(void);
 hbool_t take_down_cache(hid_t fid);
-void unlock_entry(H5C_t * cache_ptr, H5F_t * file_ptr,
+void unlock_entry(H5C1_t * cache_ptr, H5F_t * file_ptr,
                   int32_t type, unsigned int flags);
-void unpin_entry(H5C_t * cache_ptr, H5F_t * file_ptr, int32_t idx,
+void unpin_entry(H5C1_t * cache_ptr, H5F_t * file_ptr, int32_t idx,
 	         hbool_t global, hbool_t dirty, hbool_t via_unprotect);
 
 
@@ -2155,7 +2155,7 @@ size_datum(H5F_t UNUSED *  f,
  *****************************************************************************/
 
 void
-expunge_entry(H5C_t * cache_ptr,
+expunge_entry(H5C1_t * cache_ptr,
               H5F_t * file_ptr,
               int32_t idx)
 {
@@ -2179,14 +2179,14 @@ expunge_entry(H5C_t * cache_ptr,
 
     if ( nerrors == 0 ) {
 
-        result = H5AC_expunge_entry(file_ptr, -1, &(types[0]),
+        result = H5AC1_expunge_entry(file_ptr, -1, &(types[0]),
 			            entry_ptr->header.addr);
 
         if ( result < 0 ) {
 
             nerrors++;
             if ( verbose ) {
-	        HDfprintf(stdout, "%d:%s: Error in H5AC_expunge_entry().\n",
+	        HDfprintf(stdout, "%d:%s: Error in H5AC1_expunge_entry().\n",
 	                  world_mpi_rank, fcn_name);
             }
         }
@@ -2194,14 +2194,14 @@ expunge_entry(H5C_t * cache_ptr,
         HDassert( ((entry_ptr->header).type)->id == DATUM_ENTRY_TYPE );
 	HDassert( ! ((entry_ptr->header).is_dirty) );
 
-	result = H5C_get_entry_status(cache_ptr, entry_ptr->base_addr,
+	result = H5C1_get_entry_status(cache_ptr, entry_ptr->base_addr,
 				      NULL, &in_cache, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
 
             nerrors++;
             if ( verbose ) {
-	        HDfprintf(stdout, "%d:%s: Error in H5C_get_entry_status().\n",
+	        HDfprintf(stdout, "%d:%s: Error in H5C1_get_entry_status().\n",
 	                  world_mpi_rank, fcn_name);
             }
         } else if ( in_cache ) {
@@ -2242,7 +2242,7 @@ expunge_entry(H5C_t * cache_ptr,
  *****************************************************************************/
 
 void
-insert_entry(H5C_t * cache_ptr,
+insert_entry(H5C1_t * cache_ptr,
              H5F_t * file_ptr,
              int32_t idx,
              unsigned int flags)
@@ -2261,14 +2261,14 @@ insert_entry(H5C_t * cache_ptr,
 
     HDassert( !(entry_ptr->locked) );
 
-    insert_pinned = ((flags & H5C__PIN_ENTRY_FLAG) != 0 );
+    insert_pinned = ((flags & H5C1__PIN_ENTRY_FLAG) != 0 );
 
     if ( nerrors == 0 ) {
 
         (entry_ptr->ver)++;
         entry_ptr->dirty = TRUE;
 
-        result = H5AC_set(file_ptr, -1, &(types[0]), entry_ptr->base_addr,
+        result = H5AC1_set(file_ptr, -1, &(types[0]), entry_ptr->base_addr,
                           (void *)(&(entry_ptr->header)), flags);
 
         if ( ( result < 0 ) ||
@@ -2278,7 +2278,7 @@ insert_entry(H5C_t * cache_ptr,
 
             nerrors++;
             if ( verbose ) {
-	        HDfprintf(stdout, "%d:%s: Error in H5AC_set().\n",
+	        HDfprintf(stdout, "%d:%s: Error in H5AC1_set().\n",
 	                  world_mpi_rank, fcn_name);
             }
         }
@@ -2291,12 +2291,12 @@ insert_entry(H5C_t * cache_ptr,
 	     * is not the case.
 	     */
 
-	    struct H5AC_aux_t * aux_ptr;
+	    struct H5AC1_aux_t * aux_ptr;
 
-	    aux_ptr = ((H5AC_aux_t *)(cache_ptr->aux_ptr));
+	    aux_ptr = ((H5AC1_aux_t *)(cache_ptr->aux_ptr));
 
 	    if ( ! ( ( aux_ptr != NULL ) &&
-		     ( aux_ptr->magic == H5AC__H5AC_AUX_T_MAGIC ) &&
+		     ( aux_ptr->magic == H5AC1__H5AC1_AUX_T_MAGIC ) &&
 		     ( aux_ptr->dirty_bytes == 0 ) ) ) {
 
                 nerrors++;
@@ -2348,7 +2348,7 @@ insert_entry(H5C_t * cache_ptr,
  *****************************************************************************/
 
 void
-local_pin_and_unpin_random_entries(H5C_t * cache_ptr,
+local_pin_and_unpin_random_entries(H5C1_t * cache_ptr,
                                    H5F_t * file_ptr,
                                    int min_idx,
                                    int max_idx,
@@ -2425,7 +2425,7 @@ local_pin_and_unpin_random_entries(H5C_t * cache_ptr,
  *****************************************************************************/
 
 void
-local_pin_random_entry(H5C_t * cache_ptr,
+local_pin_random_entry(H5C1_t * cache_ptr,
                        H5F_t * file_ptr,
                        int min_idx,
                        int max_idx)
@@ -2475,7 +2475,7 @@ local_pin_random_entry(H5C_t * cache_ptr,
  *****************************************************************************/
 
 void
-local_unpin_all_entries(H5C_t * cache_ptr,
+local_unpin_all_entries(H5C1_t * cache_ptr,
                         H5F_t * file_ptr,
 			hbool_t via_unprotect)
 {
@@ -2522,7 +2522,7 @@ local_unpin_all_entries(H5C_t * cache_ptr,
  *****************************************************************************/
 
 int
-local_unpin_next_pinned_entry(H5C_t * cache_ptr,
+local_unpin_next_pinned_entry(H5C1_t * cache_ptr,
                               H5F_t * file_ptr,
                               int start_idx,
 			      hbool_t via_unprotect)
@@ -2585,7 +2585,7 @@ local_unpin_next_pinned_entry(H5C_t * cache_ptr,
  *****************************************************************************/
 
 void
-lock_and_unlock_random_entries(H5C_t * cache_ptr,
+lock_and_unlock_random_entries(H5C1_t * cache_ptr,
                                H5F_t * file_ptr,
                                int min_idx,
                                int max_idx,
@@ -2637,7 +2637,7 @@ lock_and_unlock_random_entries(H5C_t * cache_ptr,
  *****************************************************************************/
 
 void
-lock_and_unlock_random_entry(H5C_t * cache_ptr,
+lock_and_unlock_random_entry(H5C1_t * cache_ptr,
                              H5F_t * file_ptr,
                              int min_idx,
                              int max_idx)
@@ -2660,7 +2660,7 @@ lock_and_unlock_random_entry(H5C_t * cache_ptr,
         HDassert( idx <= max_idx );
 
 	lock_entry(cache_ptr, file_ptr, idx);
-	unlock_entry(cache_ptr, file_ptr, idx, H5AC__NO_FLAGS_SET);
+	unlock_entry(cache_ptr, file_ptr, idx, H5AC1__NO_FLAGS_SET);
     }
 
     return;
@@ -2689,13 +2689,13 @@ lock_and_unlock_random_entry(H5C_t * cache_ptr,
  *****************************************************************************/
 
 void
-lock_entry(H5C_t * cache_ptr,
+lock_entry(H5C1_t * cache_ptr,
            H5F_t * file_ptr,
            int32_t idx)
 {
     const char * fcn_name = "lock_entry()";
     struct datum * entry_ptr;
-    H5C_cache_entry_t * cache_entry_ptr;
+    H5C1_cache_entry_t * cache_entry_ptr;
 
     if ( nerrors == 0 ) {
 
@@ -2707,9 +2707,9 @@ lock_entry(H5C_t * cache_ptr,
 
 	HDassert( ! (entry_ptr->locked) );
 
-        cache_entry_ptr = H5AC_protect(file_ptr, -1, &(types[0]),
+        cache_entry_ptr = H5AC1_protect(file_ptr, -1, &(types[0]),
                                        entry_ptr->base_addr,
-                                       NULL, NULL, H5AC_WRITE);
+                                       NULL, NULL, H5AC1_WRITE);
 
         if ( ( cache_entry_ptr != (void *)(&(entry_ptr->header)) ) ||
              ( entry_ptr->header.type != &(types[0]) ) ||
@@ -2719,7 +2719,7 @@ lock_entry(H5C_t * cache_ptr,
 
             nerrors++;
             if ( verbose ) {
-		HDfprintf(stdout, "%d:%s: error in H5AC_protect().\n",
+		HDfprintf(stdout, "%d:%s: error in H5AC1_protect().\n",
 	                  world_mpi_rank, fcn_name);
             }
         } else {
@@ -2753,7 +2753,7 @@ lock_entry(H5C_t * cache_ptr,
  *****************************************************************************/
 
 void
-mark_pinned_entry_dirty(H5C_t * cache_ptr,
+mark_pinned_entry_dirty(H5C1_t * cache_ptr,
                         H5F_t * file_ptr,
                         int32_t idx,
 	                hbool_t size_changed,
@@ -2778,7 +2778,7 @@ mark_pinned_entry_dirty(H5C_t * cache_ptr,
         (entry_ptr->ver)++;
         entry_ptr->dirty = TRUE;
 
-	result = H5AC_mark_pinned_entry_dirty(file_ptr,
+	result = H5AC1_mark_pinned_entry_dirty(file_ptr,
 	                                      (void *)entry_ptr,
                                               size_changed,
                                               new_size);
@@ -2788,7 +2788,7 @@ mark_pinned_entry_dirty(H5C_t * cache_ptr,
             nerrors++;
             if ( verbose ) {
 	        HDfprintf(stdout,
-                          "%d:%s: error in H5AC_mark_pinned_entry_dirty().\n",
+                          "%d:%s: error in H5AC1_mark_pinned_entry_dirty().\n",
                           world_mpi_rank, fcn_name);
             }
         }
@@ -2806,7 +2806,7 @@ mark_pinned_entry_dirty(H5C_t * cache_ptr,
 /*****************************************************************************
  * Function:    mark_pinned_or_protected_entry_dirty()
  *
- * Purpose:     Use the H5AC_mark_pinned_or_protected_entry_dirty() call to
+ * Purpose:     Use the H5AC1_mark_pinned_or_protected_entry_dirty() call to
  * 		mark dirty the entry indicated by the index,
  *
  *              Do nothing if nerrors is non-zero on entry.
@@ -2821,7 +2821,7 @@ mark_pinned_entry_dirty(H5C_t * cache_ptr,
  *****************************************************************************/
 
 void
-mark_pinned_or_protected_entry_dirty(H5C_t * cache_ptr,
+mark_pinned_or_protected_entry_dirty(H5C1_t * cache_ptr,
                                      H5F_t * file_ptr,
                                      int32_t idx)
 {
@@ -2843,7 +2843,7 @@ mark_pinned_or_protected_entry_dirty(H5C_t * cache_ptr,
         (entry_ptr->ver)++;
         entry_ptr->dirty = TRUE;
 
-	result = H5AC_mark_pinned_or_protected_entry_dirty(file_ptr,
+	result = H5AC1_mark_pinned_or_protected_entry_dirty(file_ptr,
 	                                                   (void *)entry_ptr);
 
         if ( result < 0 ) {
@@ -2852,7 +2852,7 @@ mark_pinned_or_protected_entry_dirty(H5C_t * cache_ptr,
             if ( verbose ) {
 	        HDfprintf(stdout, "%d:%s: error in %s.\n",
                           world_mpi_rank, fcn_name,
-			  "H5AC_mark_pinned_or_protected_entry_dirty()");
+			  "H5AC1_mark_pinned_or_protected_entry_dirty()");
             }
         }
 	else if ( ! ( entry_ptr->locked ) )
@@ -2883,14 +2883,14 @@ mark_pinned_or_protected_entry_dirty(H5C_t * cache_ptr,
  *****************************************************************************/
 
 void
-pin_entry(H5C_t * cache_ptr,
+pin_entry(H5C1_t * cache_ptr,
           H5F_t * file_ptr,
           int32_t idx,
 	  hbool_t global,
 	  hbool_t dirty)
 {
     /* const char * fcn_name = "pin_entry()"; */
-    unsigned int flags = H5AC__PIN_ENTRY_FLAG;
+    unsigned int flags = H5AC1__PIN_ENTRY_FLAG;
     struct datum * entry_ptr;
 
     if ( nerrors == 0 ) {
@@ -2910,7 +2910,7 @@ pin_entry(H5C_t * cache_ptr,
 
 	if ( dirty ) {
 
-	    flags |= H5AC__DIRTIED_FLAG;
+	    flags |= H5AC1__DIRTIED_FLAG;
 	}
 
 	unlock_entry(cache_ptr, file_ptr, idx, flags);
@@ -2958,7 +2958,7 @@ pin_entry(H5C_t * cache_ptr,
  *****************************************************************************/
 
 void
-pin_protected_entry(H5C_t * cache_ptr,
+pin_protected_entry(H5C1_t * cache_ptr,
                     H5F_t * file_ptr,
                     int32_t idx,
 		    hbool_t global)
@@ -2978,7 +2978,7 @@ pin_protected_entry(H5C_t * cache_ptr,
 
     if ( nerrors == 0 ) {
 
-	result = H5AC_pin_protected_entry(file_ptr, (void *)entry_ptr);
+	result = H5AC1_pin_protected_entry(file_ptr, (void *)entry_ptr);
 
         if ( ( result < 0 ) ||
              ( entry_ptr->header.type != &(types[0]) ) ||
@@ -2990,7 +2990,7 @@ pin_protected_entry(H5C_t * cache_ptr,
             nerrors++;
             if ( verbose ) {
 	        HDfprintf(stdout,
-			  "%d:%s: Error in H5AC_pin_protected entry().\n",
+			  "%d:%s: Error in H5AC1_pin_protected entry().\n",
 	                  world_mpi_rank, fcn_name);
             }
         }
@@ -3040,7 +3040,7 @@ pin_protected_entry(H5C_t * cache_ptr,
  *****************************************************************************/
 
 void
-rename_entry(H5C_t * cache_ptr,
+rename_entry(H5C1_t * cache_ptr,
              H5F_t * file_ptr,
              int32_t old_idx,
              int32_t new_idx)
@@ -3074,13 +3074,13 @@ rename_entry(H5C_t * cache_ptr,
         old_addr = old_entry_ptr->base_addr;
         new_addr = new_entry_ptr->base_addr;
 
-        result = H5AC_rename(file_ptr,  &(types[0]), old_addr, new_addr);
+        result = H5AC1_rename(file_ptr,  &(types[0]), old_addr, new_addr);
 
         if ( ( result < 0 ) || ( old_entry_ptr->header.addr != new_addr ) ) {
 
             nerrors++;
             if ( verbose ) {
-		HDfprintf(stdout, "%d:%s: H5AC_rename() failed.\n",
+		HDfprintf(stdout, "%d:%s: H5AC1_rename() failed.\n",
 	                  world_mpi_rank, fcn_name);
             }
 
@@ -3147,7 +3147,7 @@ rename_entry(H5C_t * cache_ptr,
  *****************************************************************************/
 
 void
-resize_entry(H5C_t * cache_ptr,
+resize_entry(H5C1_t * cache_ptr,
              H5F_t * file_ptr,
              int32_t idx,
 	     size_t  new_size)
@@ -3175,14 +3175,14 @@ resize_entry(H5C_t * cache_ptr,
 	HDassert( new_size > 0 );
 	HDassert( new_size <= entry_ptr->len );
 
-	result = H5AC_resize_pinned_entry(file_ptr, (void *)entry_ptr,
+	result = H5AC1_resize_pinned_entry(file_ptr, (void *)entry_ptr,
 			                  new_size);
 
         if ( result < 0 ) {
 
             nerrors++;
             if ( verbose ) {
-		HDfprintf(stdout, "%d:%s: H5AC_rename() failed.\n",
+		HDfprintf(stdout, "%d:%s: H5AC1_rename() failed.\n",
 	                  world_mpi_rank, fcn_name);
             }
 
@@ -3233,15 +3233,15 @@ resize_entry(H5C_t * cache_ptr,
 hbool_t
 setup_cache_for_test(hid_t * fid_ptr,
                      H5F_t ** file_ptr_ptr,
-                     H5C_t ** cache_ptr_ptr)
+                     H5C1_t ** cache_ptr_ptr)
 {
     const char * fcn_name = "setup_cache_for_test()";
     hbool_t success = FALSE; /* will set to TRUE if appropriate. */
     hbool_t enable_rpt_fcn = FALSE;
     hid_t fid = -1;
-    H5AC_cache_config_t config;
+    H5AC1_cache_config_t config;
     H5F_t * file_ptr = NULL;
-    H5C_t * cache_ptr = NULL;
+    H5C1_t * cache_ptr = NULL;
 
     HDassert ( fid_ptr != NULL );
     HDassert ( file_ptr_ptr != NULL );
@@ -3281,7 +3281,7 @@ setup_cache_for_test(hid_t * fid_ptr,
 	    HDfprintf(stdout, "%d:%s: Can't get cache_ptr.\n",
                       world_mpi_rank, fcn_name);
         }
-    } else if ( cache_ptr->magic != H5C__H5C_T_MAGIC ) {
+    } else if ( cache_ptr->magic != H5C1__H5C1_T_MAGIC ) {
         nerrors++;
         if ( verbose ) {
 	    HDfprintf(stdout, "%d:%s: Bad cache_ptr magic.\n",
@@ -3291,31 +3291,31 @@ setup_cache_for_test(hid_t * fid_ptr,
         *fid_ptr = fid;
         *file_ptr_ptr = file_ptr;
         *cache_ptr_ptr = cache_ptr;
-        H5C_set_skip_flags(cache_ptr, TRUE, TRUE);
-        H5C_stats__reset(cache_ptr);
+        H5C1_set_skip_flags(cache_ptr, TRUE, TRUE);
+        H5C1_stats__reset(cache_ptr);
         success = TRUE;
     }
 
     if ( ( success ) && ( enable_rpt_fcn ) ) {
 
-        config.version = H5AC__CURR_CACHE_CONFIG_VERSION;
+        config.version = H5AC1__CURR_CACHE_CONFIG_VERSION;
 
-        if ( H5AC_get_cache_auto_resize_config(cache_ptr, &config)
+        if ( H5AC1_get_cache_auto_resize_config(cache_ptr, &config)
              != SUCCEED ) {
 
 	    HDfprintf(stdout,
-                      "%d:%s: H5AC_get_cache_auto_resize_config() failed.\n",
+                      "%d:%s: H5AC1_get_cache_auto_resize_config() failed.\n",
                       world_mpi_rank, fcn_name);
 
         } else {
 
             config.rpt_fcn_enabled = TRUE;
 
-            if ( H5AC_set_cache_auto_resize_config(cache_ptr, &config)
+            if ( H5AC1_set_cache_auto_resize_config(cache_ptr, &config)
                  != SUCCEED ) {
 
 	        HDfprintf(stdout,
-                         "%d:%s: H5AC_set_cache_auto_resize_config() failed.\n",
+                         "%d:%s: H5AC1_set_cache_auto_resize_config() failed.\n",
                           world_mpi_rank, fcn_name);
             } else {
 
@@ -3329,12 +3329,12 @@ setup_cache_for_test(hid_t * fid_ptr,
 
     if ( success ) {
 
-	if ( H5AC_set_write_done_callback(cache_ptr, do_sync) != SUCCEED ) {
+	if ( H5AC1_set_write_done_callback(cache_ptr, do_sync) != SUCCEED ) {
 
             nerrors++;
             if ( verbose ) {
 	        HDfprintf(stdout,
-			  "%d:%s: H5C_set_write_done_callback failed.\n",
+			  "%d:%s: H5C1_set_write_done_callback failed.\n",
                           world_mpi_rank, fcn_name);
             }
 	}
@@ -3409,7 +3409,7 @@ setup_noblock_dxpl_id(void)
 
     /* Get the property list object */
     if ( ( nerrors == 0 ) &&
-         ( NULL == (xfer_plist = H5I_object(H5AC_noblock_dxpl_id)) ) ) {
+         ( NULL == (xfer_plist = H5I_object(H5AC1_noblock_dxpl_id)) ) ) {
 
         nerrors++;
         if ( verbose ) {
@@ -3421,8 +3421,8 @@ setup_noblock_dxpl_id(void)
     /* Insert 'block before metadata write' property */
     block_before_meta_write=0;
     if ( ( nerrors == 0 ) &&
-         ( H5P_insert(xfer_plist, H5AC_BLOCK_BEFORE_META_WRITE_NAME,
-                      H5AC_BLOCK_BEFORE_META_WRITE_SIZE,
+         ( H5P_insert(xfer_plist, H5AC1_BLOCK_BEFORE_META_WRITE_NAME,
+                      H5AC1_BLOCK_BEFORE_META_WRITE_SIZE,
                       &block_before_meta_write,
                       NULL, NULL, NULL, NULL, NULL, NULL) < 0 ) ) {
 
@@ -3436,8 +3436,8 @@ setup_noblock_dxpl_id(void)
 
     /* Insert 'library internal' property */
     if ( ( nerrors == 0 ) &&
-         ( H5P_insert(xfer_plist, H5AC_LIBRARY_INTERNAL_NAME,
-                      H5AC_LIBRARY_INTERNAL_SIZE, &library_internal,
+         ( H5P_insert(xfer_plist, H5AC1_LIBRARY_INTERNAL_NAME,
+                      H5AC1_LIBRARY_INTERNAL_SIZE, &library_internal,
                       NULL, NULL, NULL, NULL, NULL, NULL ) < 0 ) ) {
 
         nerrors++;
@@ -3613,7 +3613,7 @@ take_down_cache(hid_t fid)
  *****************************************************************************/
 
 void
-unlock_entry(H5C_t * cache_ptr,
+unlock_entry(H5C1_t * cache_ptr,
              H5F_t * file_ptr,
              int32_t idx,
              unsigned int flags)
@@ -3634,7 +3634,7 @@ unlock_entry(H5C_t * cache_ptr,
 
 	HDassert( entry_ptr->locked );
 
-        dirtied = ((flags & H5AC__DIRTIED_FLAG) == H5AC__DIRTIED_FLAG );
+        dirtied = ((flags & H5AC1__DIRTIED_FLAG) == H5AC1__DIRTIED_FLAG );
 
         if ( dirtied ) {
 
@@ -3642,7 +3642,7 @@ unlock_entry(H5C_t * cache_ptr,
             entry_ptr->dirty = TRUE;
         }
 
-        result = H5AC_unprotect(file_ptr, -1, &(types[0]),
+        result = H5AC1_unprotect(file_ptr, -1, &(types[0]),
 			        entry_ptr->base_addr,
                                 (void *)(&(entry_ptr->header)), flags);
 
@@ -3654,7 +3654,7 @@ unlock_entry(H5C_t * cache_ptr,
 
             nerrors++;
             if ( verbose ) {
-                HDfprintf(stdout, "%d:%s: error in H5C_unprotect().\n",
+                HDfprintf(stdout, "%d:%s: error in H5C1_unprotect().\n",
                           world_mpi_rank, fcn_name);
             }
         } else {
@@ -3665,8 +3665,8 @@ unlock_entry(H5C_t * cache_ptr,
 
         HDassert( ((entry_ptr->header).type)->id == DATUM_ENTRY_TYPE );
 
-        if ( ( flags & H5AC__DIRTIED_FLAG ) != 0
-                && ( (flags & H5C__DELETED_FLAG) == 0 ) ) {
+        if ( ( flags & H5AC1__DIRTIED_FLAG ) != 0
+                && ( (flags & H5C1__DELETED_FLAG) == 0 ) ) {
 
             HDassert( entry_ptr->header.is_dirty );
             HDassert( entry_ptr->dirty );
@@ -3698,7 +3698,7 @@ unlock_entry(H5C_t * cache_ptr,
  *****************************************************************************/
 
 void
-unpin_entry(H5C_t * cache_ptr,
+unpin_entry(H5C1_t * cache_ptr,
             H5F_t * file_ptr,
             int32_t idx,
             hbool_t global,
@@ -3707,7 +3707,7 @@ unpin_entry(H5C_t * cache_ptr,
 {
     const char * fcn_name = "unpin_entry()";
     herr_t result;
-    unsigned int flags = H5AC__UNPIN_ENTRY_FLAG;
+    unsigned int flags = H5AC1__UNPIN_ENTRY_FLAG;
     struct datum * entry_ptr;
 
     if ( nerrors == 0 ) {
@@ -3731,7 +3731,7 @@ unpin_entry(H5C_t * cache_ptr,
 
 	    if ( dirty ) {
 
-	        flags |= H5AC__DIRTIED_FLAG;
+	        flags |= H5AC1__DIRTIED_FLAG;
 	    }
 
 	    unlock_entry(cache_ptr, file_ptr, idx, flags);
@@ -3745,13 +3745,13 @@ unpin_entry(H5C_t * cache_ptr,
 
 	    }
 
-	    result = H5AC_unpin_entry(file_ptr, (void *)entry_ptr);
+	    result = H5AC1_unpin_entry(file_ptr, (void *)entry_ptr);
 
 	    if ( result < 0 ) {
 
                 nerrors++;
                 if ( verbose ) {
-                    HDfprintf(stdout, "%d:%s: error in H5AC_unpin_entry().\n",
+                    HDfprintf(stdout, "%d:%s: error in H5AC1_unpin_entry().\n",
 	                      world_mpi_rank, fcn_name);
                 }
 	    }
@@ -4029,7 +4029,7 @@ smoke_check_1(void)
     int max_nerrors;
     hid_t fid = -1;
     H5F_t * file_ptr = NULL;
-    H5C_t * cache_ptr = NULL;
+    H5C1_t * cache_ptr = NULL;
     struct mssg_t mssg;
 
     if ( world_mpi_rank == 0 ) {
@@ -4068,20 +4068,20 @@ smoke_check_1(void)
 
         for ( i = 0; i < (virt_num_data_entries / 2); i++ )
         {
-            insert_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+            insert_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
         }
 
         for ( i = (virt_num_data_entries / 2) - 1; i >= 0; i-- )
         {
 	    lock_entry(cache_ptr, file_ptr, i);
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
         }
 
         /* rename the first half of the entries... */
         for ( i = 0; i < (virt_num_data_entries / 2); i++ )
         {
 	    lock_entry(cache_ptr, file_ptr, i);
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
 	    rename_entry(cache_ptr, file_ptr, i,
 			 (i + (virt_num_data_entries / 2)));
         }
@@ -4090,7 +4090,7 @@ smoke_check_1(void)
         for ( i = (virt_num_data_entries / 2) - 1; i >= 0; i-- )
         {
 	    lock_entry(cache_ptr, file_ptr, i);
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
 	    rename_entry(cache_ptr, file_ptr, i,
 			 (i + (virt_num_data_entries / 2)));
         }
@@ -4198,7 +4198,7 @@ smoke_check_2(void)
     int max_nerrors;
     hid_t fid = -1;
     H5F_t * file_ptr = NULL;
-    H5C_t * cache_ptr = NULL;
+    H5C1_t * cache_ptr = NULL;
     struct mssg_t mssg;
 
     if ( world_mpi_rank == 0 ) {
@@ -4237,7 +4237,7 @@ smoke_check_2(void)
 
         for ( i = 0; i < (virt_num_data_entries / 2); i++ )
         {
-            insert_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+            insert_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
 
             if ( i > 100 ) {
 
@@ -4259,7 +4259,7 @@ smoke_check_2(void)
         for ( i = (virt_num_data_entries / 2) - 1; i >= 0; i-=2 )
         {
 	    lock_entry(cache_ptr, file_ptr, i);
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
 	    lock_and_unlock_random_entries(cache_ptr, file_ptr, 0,
 			                   (virt_num_data_entries / 20),
 					   0, 100);
@@ -4271,7 +4271,7 @@ smoke_check_2(void)
         for ( i = 0; i < (virt_num_data_entries / 2); i+=2 )
         {
 	    lock_entry(cache_ptr, file_ptr, i);
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__DIRTIED_FLAG);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__DIRTIED_FLAG);
 	    lock_and_unlock_random_entries(cache_ptr, file_ptr, 0,
 			                   (virt_num_data_entries / 10),
 					   0, 100);
@@ -4284,7 +4284,7 @@ smoke_check_2(void)
         for ( i = 0; i < (virt_num_data_entries / 2); i++ )
         {
 	    lock_entry(cache_ptr, file_ptr, i);
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
 	    rename_entry(cache_ptr, file_ptr, i,
 			 (i + (virt_num_data_entries / 2)));
 	    lock_and_unlock_random_entries(cache_ptr, file_ptr, 0,
@@ -4296,7 +4296,7 @@ smoke_check_2(void)
         for ( i = (virt_num_data_entries / 2) - 1; i >= 0; i-- )
         {
 	    lock_entry(cache_ptr, file_ptr, i);
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__DIRTIED_FLAG);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__DIRTIED_FLAG);
 	    rename_entry(cache_ptr, file_ptr, i,
 			 (i + (virt_num_data_entries / 2)));
 	    lock_and_unlock_random_entries(cache_ptr, file_ptr, 0,
@@ -4422,7 +4422,7 @@ smoke_check_3(void)
     int max_idx;
     hid_t fid = -1;
     H5F_t * file_ptr = NULL;
-    H5C_t * cache_ptr = NULL;
+    H5C1_t * cache_ptr = NULL;
     struct mssg_t mssg;
 
     if ( world_mpi_rank == 0 ) {
@@ -4464,7 +4464,7 @@ smoke_check_3(void)
 
         for ( i = 0; i < (virt_num_data_entries / 4); i++ )
         {
-            insert_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+            insert_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
 
             if ( i > 100 ) {
 
@@ -4483,7 +4483,7 @@ smoke_check_3(void)
 	      i++ )
         {
 
-            insert_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+            insert_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
 
 	    if ( i % 59 == 0 ) {
 
@@ -4551,7 +4551,7 @@ smoke_check_3(void)
 	    if ( i % 2 == 0 ) {
 
 	        lock_entry(cache_ptr, file_ptr, i);
-	        unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+	        unlock_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
 	        local_pin_and_unpin_random_entries(cache_ptr, file_ptr, 0,
 				                   virt_num_data_entries / 2,
 						   0, 2);
@@ -4571,7 +4571,7 @@ smoke_check_3(void)
         for ( i = 0; i < (virt_num_data_entries / 2); i+=2 )
         {
 	    lock_entry(cache_ptr, file_ptr, i);
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__DIRTIED_FLAG);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__DIRTIED_FLAG);
 	    lock_and_unlock_random_entries(cache_ptr, file_ptr,
                                            min_idx, max_idx, 0, 100);
         }
@@ -4586,7 +4586,7 @@ smoke_check_3(void)
         for ( i = 0; i < (virt_num_data_entries / 2); i++ )
         {
 	    lock_entry(cache_ptr, file_ptr, i);
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
 	    rename_entry(cache_ptr, file_ptr, i,
 			 (i + (virt_num_data_entries / 2)));
 	    lock_and_unlock_random_entries(cache_ptr, file_ptr, 0,
@@ -4598,7 +4598,7 @@ smoke_check_3(void)
         for ( i = (virt_num_data_entries / 2) - 1; i >= 0; i-- )
         {
 	    lock_entry(cache_ptr, file_ptr, i);
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__DIRTIED_FLAG);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__DIRTIED_FLAG);
 	    rename_entry(cache_ptr, file_ptr, i,
 			 (i + (virt_num_data_entries / 2)));
 	    lock_and_unlock_random_entries(cache_ptr, file_ptr, 0,
@@ -4619,7 +4619,7 @@ smoke_check_3(void)
 					       0, 5);
 
 	    lock_entry(cache_ptr, file_ptr, i);
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__DIRTIED_FLAG);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__DIRTIED_FLAG);
 
             if ( i > 100 ) {
 
@@ -4745,7 +4745,7 @@ smoke_check_4(void)
     int max_idx;
     hid_t fid = -1;
     H5F_t * file_ptr = NULL;
-    H5C_t * cache_ptr = NULL;
+    H5C1_t * cache_ptr = NULL;
     struct mssg_t mssg;
 
     if ( world_mpi_rank == 0 ) {
@@ -4788,7 +4788,7 @@ smoke_check_4(void)
 
         for ( i = 0; i < (virt_num_data_entries / 4); i++ )
         {
-            insert_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+            insert_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
 
             if ( i > 100 ) {
 
@@ -4807,7 +4807,7 @@ smoke_check_4(void)
         {
 	    if ( i % 2 == 0 ) {
 
-                insert_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+                insert_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
 
 	    } else {
 
@@ -4816,7 +4816,7 @@ smoke_check_4(void)
 		 * so it should be sufficient to verify that the
 		 * entries are in fact pinned (which unpin_entry() should do).
 		 */
-                insert_entry(cache_ptr, file_ptr, i, H5C__PIN_ENTRY_FLAG);
+                insert_entry(cache_ptr, file_ptr, i, H5C1__PIN_ENTRY_FLAG);
                 unpin_entry(cache_ptr, file_ptr, i, TRUE, FALSE, FALSE);
 	    }
 
@@ -4881,7 +4881,7 @@ smoke_check_4(void)
 	    if ( i % 2 == 0 ) {
 
 	        lock_entry(cache_ptr, file_ptr, i);
-	        unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+	        unlock_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
 	        lock_and_unlock_random_entries(cache_ptr, file_ptr,
                                                min_idx, max_idx, 0, 100);
 	    }
@@ -4894,7 +4894,7 @@ smoke_check_4(void)
         for ( i = 0; i < (virt_num_data_entries / 2); i+=2 )
         {
 	    lock_entry(cache_ptr, file_ptr, i);
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__DIRTIED_FLAG);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__DIRTIED_FLAG);
 	    lock_and_unlock_random_entries(cache_ptr, file_ptr,
                                            min_idx, max_idx, 0, 100);
         }
@@ -4909,7 +4909,7 @@ smoke_check_4(void)
         for ( i = 0; i < (virt_num_data_entries / 2); i++ )
         {
 	    lock_entry(cache_ptr, file_ptr, i);
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
 	    rename_entry(cache_ptr, file_ptr, i,
 			 (i + (virt_num_data_entries / 2)));
 	    lock_and_unlock_random_entries(cache_ptr, file_ptr, 0,
@@ -4921,7 +4921,7 @@ smoke_check_4(void)
         for ( i = (virt_num_data_entries / 2) - 1; i >= 0; i-- )
         {
 	    lock_entry(cache_ptr, file_ptr, i);
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__DIRTIED_FLAG);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__DIRTIED_FLAG);
 	    rename_entry(cache_ptr, file_ptr, i,
 			 (i + (virt_num_data_entries / 2)));
 	    lock_and_unlock_random_entries(cache_ptr, file_ptr, 0,
@@ -4938,7 +4938,7 @@ smoke_check_4(void)
         for ( i = 0; i < (virt_num_data_entries / 2); i+=2 )
         {
 	    lock_entry(cache_ptr, file_ptr, i);
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__DIRTIED_FLAG);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__DIRTIED_FLAG);
 
             if ( i > 100 ) {
 
@@ -5023,7 +5023,7 @@ smoke_check_4(void)
  * Function:	smoke_check_5()
  *
  * Purpose:	Similar to smoke check 1, but modified to verify that
- * 		H5AC_mark_pinned_or_protected_entry_dirty() works in
+ * 		H5AC1_mark_pinned_or_protected_entry_dirty() works in
  * 		the parallel case.
  *
  * Return:	Success:	TRUE
@@ -5035,8 +5035,8 @@ smoke_check_4(void)
  * Modifications:
  *
  *		JRM -- 7/12/06
- *		Added test code for H5AC_expunge_entry() and
- *		H5AC_resize_pinned_entry().
+ *		Added test code for H5AC1_expunge_entry() and
+ *		H5AC1_resize_pinned_entry().
  *
  *****************************************************************************/
 
@@ -5049,7 +5049,7 @@ smoke_check_5(void)
     int max_nerrors;
     hid_t fid = -1;
     H5F_t * file_ptr = NULL;
-    H5C_t * cache_ptr = NULL;
+    H5C1_t * cache_ptr = NULL;
     struct mssg_t mssg;
 
     if ( world_mpi_rank == 0 ) {
@@ -5088,7 +5088,7 @@ smoke_check_5(void)
 
         for ( i = 0; i < (virt_num_data_entries / 2); i++ )
         {
-            insert_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+            insert_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
         }
 
 	/* flush the file so we can lock known clean entries. */
@@ -5109,14 +5109,14 @@ smoke_check_5(void)
 		mark_pinned_or_protected_entry_dirty(cache_ptr, file_ptr, i);
 	    }
 
-	    unlock_entry(cache_ptr, file_ptr, i, H5AC__NO_FLAGS_SET);
+	    unlock_entry(cache_ptr, file_ptr, i, H5AC1__NO_FLAGS_SET);
 
 	    if ( i % 2 == 1 )
 	    {
 		if ( i % 4 == 1 ) {
 
 	            lock_entry(cache_ptr, file_ptr, i);
-	            unlock_entry(cache_ptr, file_ptr, i, H5AC__DIRTIED_FLAG);
+	            unlock_entry(cache_ptr, file_ptr, i, H5AC1__DIRTIED_FLAG);
 		}
 
 		expunge_entry(cache_ptr, file_ptr, i);
@@ -5243,18 +5243,18 @@ smoke_check_5(void)
  *              The function must test trace file output in the following
  *              functions:
  *
- *                    - H5AC_flush()
- *                    - H5AC_set()
- *                    - H5AC_mark_pinned_entry_dirty()
- *                    - H5AC_mark_pinned_or_protected_entry_dirty()
- *                      H5AC_rename()
- *                    - H5AC_pin_protected_entry()
- *                    - H5AC_protect()
- *                    - H5AC_unpin_entry()
- *                    - H5AC_unprotect()
- *                    - H5AC_set_cache_auto_resize_config()
- *                    - H5AC_expunge_entry()
- *                    - H5AC_resize_pinned_entry()
+ *                    - H5AC1_flush()
+ *                    - H5AC1_set()
+ *                    - H5AC1_mark_pinned_entry_dirty()
+ *                    - H5AC1_mark_pinned_or_protected_entry_dirty()
+ *                      H5AC1_rename()
+ *                    - H5AC1_pin_protected_entry()
+ *                    - H5AC1_protect()
+ *                    - H5AC1_unpin_entry()
+ *                    - H5AC1_unprotect()
+ *                    - H5AC1_set_cache_auto_resize_config()
+ *                    - H5AC1_expunge_entry()
+ *                    - H5AC1_resize_pinned_entry()
  *
  *              This test is skipped if H5_METADATA_TRACE_FILE is undefined.
  *
@@ -5267,8 +5267,8 @@ smoke_check_5(void)
  * Modifications:
  *
  *		JRM -- 7/11/06
- *		Updated fro H5AC_expunge_entry() and
- *		H5AC_resize_pinned_entry().
+ *		Updated fro H5AC1_expunge_entry() and
+ *		H5AC1_resize_pinned_entry().
  *
  *****************************************************************************/
 
@@ -5283,29 +5283,29 @@ trace_file_check(void)
     const char * expected_output[] =
     {
       "### HDF5 metadata cache trace file version 1 ###\n",
-      "H5AC_set_cache_auto_resize_config 1 0 1 0 \"t_cache_trace.txt\" 1 0 1048576 0.500000 16777216 1048576 50000 1 0.900000 2.000000 1 1.000000 0.250000 1 4194304 3 0.999000 0.900000 1 1048576 3 1 0.100000 262144 0\n",
-      "H5AC_set 0x0 15 0x0 2 0\n",
-      "H5AC_set 0x2 15 0x0 2 0\n",
-      "H5AC_set 0x4 15 0x0 4 0\n",
-      "H5AC_set 0x8 15 0x0 6 0\n",
-      "H5AC_protect 0 15 H5AC_WRITE 2 1\n",
-      "H5AC_mark_pinned_or_protected_entry_dirty 0 0\n",
-      "H5AC_unprotect 0 15 0 0 0\n",
-      "H5AC_protect 2 15 H5AC_WRITE 2 1\n",
-      "H5AC_pin_protected_entry 2 0\n",
-      "H5AC_unprotect 2 15 0 0 0\n",
-      "H5AC_unpin_entry 2 0\n",
-      "H5AC_expunge_entry 2 15 0\n",
-      "H5AC_protect 4 15 H5AC_WRITE 4 1\n",
-      "H5AC_pin_protected_entry 4 0\n",
-      "H5AC_unprotect 4 15 0 0 0\n",
-      "H5AC_mark_pinned_entry_dirty 0x4 0 0 0\n",
-      "H5AC_resize_pinned_entry 0x4 2 0\n",
-      "H5AC_resize_pinned_entry 0x4 4 0\n",
-      "H5AC_unpin_entry 4 0\n",
-      "H5AC_rename 0 8a65 15 0\n",
-      "H5AC_rename 8a65 0 15 0\n",
-      "H5AC_flush 0x0 0\n",
+      "H5AC1_set_cache_auto_resize_config 1 0 1 0 \"t_cache_trace.txt\" 1 0 1048576 0.500000 16777216 1048576 50000 1 0.900000 2.000000 1 1.000000 0.250000 1 4194304 3 0.999000 0.900000 1 1048576 3 1 0.100000 262144 0\n",
+      "H5AC1_set 0x0 15 0x0 2 0\n",
+      "H5AC1_set 0x2 15 0x0 2 0\n",
+      "H5AC1_set 0x4 15 0x0 4 0\n",
+      "H5AC1_set 0x8 15 0x0 6 0\n",
+      "H5AC1_protect 0 15 H5AC1_WRITE 2 1\n",
+      "H5AC1_mark_pinned_or_protected_entry_dirty 0 0\n",
+      "H5AC1_unprotect 0 15 0 0 0\n",
+      "H5AC1_protect 2 15 H5AC1_WRITE 2 1\n",
+      "H5AC1_pin_protected_entry 2 0\n",
+      "H5AC1_unprotect 2 15 0 0 0\n",
+      "H5AC1_unpin_entry 2 0\n",
+      "H5AC1_expunge_entry 2 15 0\n",
+      "H5AC1_protect 4 15 H5AC1_WRITE 4 1\n",
+      "H5AC1_pin_protected_entry 4 0\n",
+      "H5AC1_unprotect 4 15 0 0 0\n",
+      "H5AC1_mark_pinned_entry_dirty 0x4 0 0 0\n",
+      "H5AC1_resize_pinned_entry 0x4 2 0\n",
+      "H5AC1_resize_pinned_entry 0x4 4 0\n",
+      "H5AC1_unpin_entry 4 0\n",
+      "H5AC1_rename 0 8a65 15 0\n",
+      "H5AC1_rename 8a65 0 15 0\n",
+      "H5AC1_flush 0x0 0\n",
       NULL
     };
     char buffer[256];
@@ -5317,9 +5317,9 @@ trace_file_check(void)
     int actual_line_len;
     hid_t fid = -1;
     H5F_t * file_ptr = NULL;
-    H5C_t * cache_ptr = NULL;
+    H5C1_t * cache_ptr = NULL;
     FILE * trace_file_ptr = NULL;
-    H5AC_cache_config_t config;
+    H5AC1_cache_config_t config;
     struct mssg_t mssg;
 
 #endif /* H5_METADATA_TRACE_FILE */
@@ -5363,14 +5363,14 @@ trace_file_check(void)
 
         if ( nerrors == 0 ) {
 
-            config.version = H5AC__CURR_CACHE_CONFIG_VERSION;
+            config.version = H5AC1__CURR_CACHE_CONFIG_VERSION;
 
-            if ( H5AC_get_cache_auto_resize_config(cache_ptr, &config)
+            if ( H5AC1_get_cache_auto_resize_config(cache_ptr, &config)
                  != SUCCEED ) {
 
 		nerrors++;
 	        HDfprintf(stdout,
-                        "%d:%s: H5AC_get_cache_auto_resize_config() failed.\n",
+                        "%d:%s: H5AC1_get_cache_auto_resize_config() failed.\n",
                         world_mpi_rank, fcn_name);
 
             } else {
@@ -5378,36 +5378,36 @@ trace_file_check(void)
                 config.open_trace_file = TRUE;
 		strcpy(config.trace_file_name, "t_cache_trace.txt");
 
-                if ( H5AC_set_cache_auto_resize_config(cache_ptr, &config)
+                if ( H5AC1_set_cache_auto_resize_config(cache_ptr, &config)
                      != SUCCEED ) {
 
 		    nerrors++;
 	            HDfprintf(stdout,
-                         "%d:%s: H5AC_set_cache_auto_resize_config() failed.\n",
+                         "%d:%s: H5AC1_set_cache_auto_resize_config() failed.\n",
                           world_mpi_rank, fcn_name);
                 }
             }
         }
 
-	insert_entry(cache_ptr, file_ptr, 0, H5AC__NO_FLAGS_SET);
-	insert_entry(cache_ptr, file_ptr, 1, H5AC__NO_FLAGS_SET);
-	insert_entry(cache_ptr, file_ptr, 2, H5AC__NO_FLAGS_SET);
-	insert_entry(cache_ptr, file_ptr, 3, H5AC__NO_FLAGS_SET);
+	insert_entry(cache_ptr, file_ptr, 0, H5AC1__NO_FLAGS_SET);
+	insert_entry(cache_ptr, file_ptr, 1, H5AC1__NO_FLAGS_SET);
+	insert_entry(cache_ptr, file_ptr, 2, H5AC1__NO_FLAGS_SET);
+	insert_entry(cache_ptr, file_ptr, 3, H5AC1__NO_FLAGS_SET);
 
 	lock_entry(cache_ptr, file_ptr, 0);
 	mark_pinned_or_protected_entry_dirty(cache_ptr, file_ptr, 0);
-	unlock_entry(cache_ptr, file_ptr, 0, H5AC__NO_FLAGS_SET);
+	unlock_entry(cache_ptr, file_ptr, 0, H5AC1__NO_FLAGS_SET);
 
 	lock_entry(cache_ptr, file_ptr, 1);
         pin_protected_entry(cache_ptr, file_ptr, 1, TRUE);
-	unlock_entry(cache_ptr, file_ptr, 1, H5AC__NO_FLAGS_SET);
+	unlock_entry(cache_ptr, file_ptr, 1, H5AC1__NO_FLAGS_SET);
         unpin_entry(cache_ptr, file_ptr, 1, TRUE, FALSE, FALSE);
 
         expunge_entry(cache_ptr,file_ptr, 1);
 
 	lock_entry(cache_ptr, file_ptr, 2);
         pin_protected_entry(cache_ptr, file_ptr, 2, TRUE);
-	unlock_entry(cache_ptr, file_ptr, 2, H5AC__NO_FLAGS_SET);
+	unlock_entry(cache_ptr, file_ptr, 2, H5AC1__NO_FLAGS_SET);
 	mark_pinned_entry_dirty(cache_ptr, file_ptr, 2, FALSE, 0);
         resize_entry(cache_ptr, file_ptr, 2, data[2].len / 2);
         resize_entry(cache_ptr, file_ptr, 2, data[2].len);
@@ -5426,14 +5426,14 @@ trace_file_check(void)
 
         if ( nerrors == 0 ) {
 
-            config.version = H5AC__CURR_CACHE_CONFIG_VERSION;
+            config.version = H5AC1__CURR_CACHE_CONFIG_VERSION;
 
-            if ( H5AC_get_cache_auto_resize_config(cache_ptr, &config)
+            if ( H5AC1_get_cache_auto_resize_config(cache_ptr, &config)
                  != SUCCEED ) {
 
 		nerrors++;
 	        HDfprintf(stdout,
-                        "%d:%s: H5AC_get_cache_auto_resize_config() failed.\n",
+                        "%d:%s: H5AC1_get_cache_auto_resize_config() failed.\n",
                         world_mpi_rank, fcn_name);
 
             } else {
@@ -5442,12 +5442,12 @@ trace_file_check(void)
                 config.close_trace_file = TRUE;
 		config.trace_file_name[0] = '\0';
 
-                if ( H5AC_set_cache_auto_resize_config(cache_ptr, &config)
+                if ( H5AC1_set_cache_auto_resize_config(cache_ptr, &config)
                      != SUCCEED ) {
 
 		    nerrors++;
 	            HDfprintf(stdout,
-                         "%d:%s: H5AC_set_cache_auto_resize_config() failed.\n",
+                         "%d:%s: H5AC1_set_cache_auto_resize_config() failed.\n",
                           world_mpi_rank, fcn_name);
                 }
             }
diff --git a/testpar/t_mpi.c b/testpar/t_mpi.c
index 14ba6c6..e64dbd9 100644
--- a/testpar/t_mpi.c
+++ b/testpar/t_mpi.c
@@ -847,7 +847,7 @@ static int test_mpio_derived_dtype(char *filename) {
 	    printf("Complicated derived datatype is NOT working at this platform\n");
 	    printf("Go back to hdf5/config and find the corresponding\n");
 	    printf("configure-specific file (for example, powerpc-ibm-aix5.x) and add\n");
-	    printf("hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype-works='no'}\n");
+	    printf("hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype-works='no'}\n");
 	    printf(" at the end of the file.\n");
 	    printf(" Please report to hdfhelp@ncsa.uiuc.edu about this problem.\n");
 	}
@@ -860,7 +860,7 @@ static int test_mpio_derived_dtype(char *filename) {
 	    printf("Complicated derived datatype is WORKING at this platform\n");
 	    printf(" Go back to hdf5/config and find the corresponding \n");
 	    printf(" configure-specific file (for example, powerpc-ibm-aix5.x) and delete the line\n");
-	    printf("hdf5_mpi_complex_derived_datatype_works=${hdf5_mpi_complex_derived_datatype-works='no'}\n");
+	    printf("hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype-works='no'}\n");
 	    printf(" at the end of the file.\n");
 	    printf("Please report to hdfhelp@ncsa.uiuc.edu about this problem.\n");
 	}
@@ -1018,7 +1018,7 @@ static int test_mpio_special_collective(char *filename) {
 	    printf("special collective IO is NOT working at this platform\n");
 	    printf("Go back to hdf5/config and find the corresponding\n");
 	    printf("configure-specific file (for example, powerpc-ibm-aix5.x) and add\n");
-	    printf("hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'}\n");
+	    printf("hdf5_cv_mpi_special_collective_io_works=${hdf5_cv_mpi_special_collective_io_works='no'}\n");
 	    printf(" at the end of the file.\n");
 	    printf(" Please report to hdfhelp@ncsa.uiuc.edu about this problem.\n");
 	}
@@ -1031,7 +1031,7 @@ static int test_mpio_special_collective(char *filename) {
 	    printf("special collective IO is WORKING at this platform\n");
 	    printf(" Go back to hdf5/config and find the corresponding \n");
 	    printf(" configure-specific file (for example, powerpc-ibm-aix5.x) and delete the line\n");
-	    printf("hdf5_mpi_special_collective_io_works=${hdf5_mpi_special_collective_io_works='no'}\n");
+	    printf("hdf5_cv_mpi_special_collective_io_works=${hdf5_cv_mpi_special_collective_io_works='no'}\n");
 	    printf(" at the end of the file.\n");
 	    printf("Please report to hdfhelp@ncsa.uiuc.edu about this problem.\n");
 	}