60 files changed, 6 insertions, 6 deletions

diff --git a/test/testfiles/cache2_journal_bsc00_000.jnl.gz b/test/testfiles/cache_journal_bsc00_000.jnl.gz
index f6e9612..f6e9612 100755
--- a/test/testfiles/cache2_journal_bsc00_000.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_000.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_001.jnl.gz b/test/testfiles/cache_journal_bsc00_001.jnl.gz
index 36f79e0..36f79e0 100755
--- a/test/testfiles/cache2_journal_bsc00_001.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_001.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_002.jnl.gz b/test/testfiles/cache_journal_bsc00_002.jnl.gz
index f044a69..f044a69 100755
--- a/test/testfiles/cache2_journal_bsc00_002.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_002.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_003.jnl.gz b/test/testfiles/cache_journal_bsc00_003.jnl.gz
index 4305745..4305745 100755
--- a/test/testfiles/cache2_journal_bsc00_003.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_003.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_004.jnl.gz b/test/testfiles/cache_journal_bsc00_004.jnl.gz
index fc99d59..fc99d59 100755
--- a/test/testfiles/cache2_journal_bsc00_004.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_004.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_005.jnl.gz b/test/testfiles/cache_journal_bsc00_005.jnl.gz
index 16e7eb1..16e7eb1 100755
--- a/test/testfiles/cache2_journal_bsc00_005.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_005.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_006.jnl.gz b/test/testfiles/cache_journal_bsc00_006.jnl.gz
index 7744ea0..7744ea0 100755
--- a/test/testfiles/cache2_journal_bsc00_006.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_006.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_007.jnl.gz b/test/testfiles/cache_journal_bsc00_007.jnl.gz
index e1be66b..e1be66b 100755
--- a/test/testfiles/cache2_journal_bsc00_007.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_007.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_008.jnl.gz b/test/testfiles/cache_journal_bsc00_008.jnl.gz
index d852aad..d852aad 100755
--- a/test/testfiles/cache2_journal_bsc00_008.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_008.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_009.jnl.gz b/test/testfiles/cache_journal_bsc00_009.jnl.gz
index 2429b98..2429b98 100755
--- a/test/testfiles/cache2_journal_bsc00_009.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_009.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_010.jnl.gz b/test/testfiles/cache_journal_bsc00_010.jnl.gz
index b36ba56..b36ba56 100755
--- a/test/testfiles/cache2_journal_bsc00_010.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_010.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_011.jnl.gz b/test/testfiles/cache_journal_bsc00_011.jnl.gz
index 3727caa..3727caa 100755
--- a/test/testfiles/cache2_journal_bsc00_011.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_011.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_012.jnl.gz b/test/testfiles/cache_journal_bsc00_012.jnl.gz
index 801d55b..801d55b 100755
--- a/test/testfiles/cache2_journal_bsc00_012.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_012.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_013.jnl.gz b/test/testfiles/cache_journal_bsc00_013.jnl.gz
index e9212bd..e9212bd 100755
--- a/test/testfiles/cache2_journal_bsc00_013.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_013.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_014.jnl.gz b/test/testfiles/cache_journal_bsc00_014.jnl.gz
index e19f714..e19f714 100755
--- a/test/testfiles/cache2_journal_bsc00_014.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_014.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_015.jnl.gz b/test/testfiles/cache_journal_bsc00_015.jnl.gz
index 3a06706..3a06706 100755
--- a/test/testfiles/cache2_journal_bsc00_015.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_015.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_016.jnl.gz b/test/testfiles/cache_journal_bsc00_016.jnl.gz
index 67ed629..67ed629 100755
--- a/test/testfiles/cache2_journal_bsc00_016.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_016.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_017.jnl.gz b/test/testfiles/cache_journal_bsc00_017.jnl.gz
index 2cbe6d6..2cbe6d6 100755
--- a/test/testfiles/cache2_journal_bsc00_017.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_017.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc00_018.jnl.gz b/test/testfiles/cache_journal_bsc00_018.jnl.gz
index b5aec5c..b5aec5c 100755
--- a/test/testfiles/cache2_journal_bsc00_018.jnl.gz
+++ b/test/testfiles/cache_journal_bsc00_018.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc01_000.jnl.gz b/test/testfiles/cache_journal_bsc01_000.jnl.gz
index 956e8d9..956e8d9 100755
--- a/test/testfiles/cache2_journal_bsc01_000.jnl.gz
+++ b/test/testfiles/cache_journal_bsc01_000.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc01_001.jnl.gz b/test/testfiles/cache_journal_bsc01_001.jnl.gz
index 0ed6e7f..0ed6e7f 100755
--- a/test/testfiles/cache2_journal_bsc01_001.jnl.gz
+++ b/test/testfiles/cache_journal_bsc01_001.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc01_002.jnl.gz b/test/testfiles/cache_journal_bsc01_002.jnl.gz
index 0491c9a..0491c9a 100755
--- a/test/testfiles/cache2_journal_bsc01_002.jnl.gz
+++ b/test/testfiles/cache_journal_bsc01_002.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc01_003.jnl.gz b/test/testfiles/cache_journal_bsc01_003.jnl.gz
index 74fe661..74fe661 100755
--- a/test/testfiles/cache2_journal_bsc01_003.jnl.gz
+++ b/test/testfiles/cache_journal_bsc01_003.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc01_004.jnl.gz b/test/testfiles/cache_journal_bsc01_004.jnl.gz
index 8a70e66..8a70e66 100755
--- a/test/testfiles/cache2_journal_bsc01_004.jnl.gz
+++ b/test/testfiles/cache_journal_bsc01_004.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc02_000.jnl.gz b/test/testfiles/cache_journal_bsc02_000.jnl.gz
index 3cb36c0..3cb36c0 100755
--- a/test/testfiles/cache2_journal_bsc02_000.jnl.gz
+++ b/test/testfiles/cache_journal_bsc02_000.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc02_001.jnl.gz b/test/testfiles/cache_journal_bsc02_001.jnl.gz
index 63e166f..63e166f 100755
--- a/test/testfiles/cache2_journal_bsc02_001.jnl.gz
+++ b/test/testfiles/cache_journal_bsc02_001.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc02_002.jnl.gz b/test/testfiles/cache_journal_bsc02_002.jnl.gz
index 6d993f5..6d993f5 100755
--- a/test/testfiles/cache2_journal_bsc02_002.jnl.gz
+++ b/test/testfiles/cache_journal_bsc02_002.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc02_003.jnl.gz b/test/testfiles/cache_journal_bsc02_003.jnl.gz
index 6b13820..6b13820 100755
--- a/test/testfiles/cache2_journal_bsc02_003.jnl.gz
+++ b/test/testfiles/cache_journal_bsc02_003.jnl.gz
diff --git a/test/testfiles/cache2_journal_bsc02_004.jnl.gz b/test/testfiles/cache_journal_bsc02_004.jnl.gz
index cece9d6..cece9d6 100755
--- a/test/testfiles/cache2_journal_bsc02_004.jnl.gz
+++ b/test/testfiles/cache_journal_bsc02_004.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_000.jnl.gz b/test/testfiles/cache_journal_sc00_000.jnl.gz
index ce4ca79..ce4ca79 100755
--- a/test/testfiles/cache2_journal_sc00_000.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_000.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_001.jnl.gz b/test/testfiles/cache_journal_sc00_001.jnl.gz
index 0cdb583..0cdb583 100755
--- a/test/testfiles/cache2_journal_sc00_001.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_001.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_002.jnl.gz b/test/testfiles/cache_journal_sc00_002.jnl.gz
index 7681eef..7681eef 100755
--- a/test/testfiles/cache2_journal_sc00_002.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_002.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_003.jnl.gz b/test/testfiles/cache_journal_sc00_003.jnl.gz
index c3f043b..c3f043b 100755
--- a/test/testfiles/cache2_journal_sc00_003.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_003.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_004.jnl.gz b/test/testfiles/cache_journal_sc00_004.jnl.gz
index 2863ec4..2863ec4 100755
--- a/test/testfiles/cache2_journal_sc00_004.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_004.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_005.jnl.gz b/test/testfiles/cache_journal_sc00_005.jnl.gz
index 964b907..964b907 100755
--- a/test/testfiles/cache2_journal_sc00_005.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_005.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_006.jnl.gz b/test/testfiles/cache_journal_sc00_006.jnl.gz
index 30e2d59..30e2d59 100755
--- a/test/testfiles/cache2_journal_sc00_006.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_006.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_007.jnl.gz b/test/testfiles/cache_journal_sc00_007.jnl.gz
index 6cba834..6cba834 100755
--- a/test/testfiles/cache2_journal_sc00_007.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_007.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_008.jnl.gz b/test/testfiles/cache_journal_sc00_008.jnl.gz
index 890d489..890d489 100755
--- a/test/testfiles/cache2_journal_sc00_008.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_008.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_009.jnl.gz b/test/testfiles/cache_journal_sc00_009.jnl.gz
index 001032e..001032e 100755
--- a/test/testfiles/cache2_journal_sc00_009.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_009.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_010.jnl.gz b/test/testfiles/cache_journal_sc00_010.jnl.gz
index 2852c7c..2852c7c 100755
--- a/test/testfiles/cache2_journal_sc00_010.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_010.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_011.jnl.gz b/test/testfiles/cache_journal_sc00_011.jnl.gz
index ef78f31..ef78f31 100755
--- a/test/testfiles/cache2_journal_sc00_011.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_011.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_012.jnl.gz b/test/testfiles/cache_journal_sc00_012.jnl.gz
index 2e46ac9..2e46ac9 100755
--- a/test/testfiles/cache2_journal_sc00_012.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_012.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_013.jnl.gz b/test/testfiles/cache_journal_sc00_013.jnl.gz
index ccae1b1..ccae1b1 100755
--- a/test/testfiles/cache2_journal_sc00_013.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_013.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_014.jnl.gz b/test/testfiles/cache_journal_sc00_014.jnl.gz
index 5bb8595..5bb8595 100755
--- a/test/testfiles/cache2_journal_sc00_014.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_014.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_015.jnl.gz b/test/testfiles/cache_journal_sc00_015.jnl.gz
index cc81a9f..cc81a9f 100755
--- a/test/testfiles/cache2_journal_sc00_015.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_015.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_016.jnl.gz b/test/testfiles/cache_journal_sc00_016.jnl.gz
index b610096..b610096 100755
--- a/test/testfiles/cache2_journal_sc00_016.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_016.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_017.jnl.gz b/test/testfiles/cache_journal_sc00_017.jnl.gz
index 09ad5cd..09ad5cd 100755
--- a/test/testfiles/cache2_journal_sc00_017.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_017.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc00_018.jnl.gz b/test/testfiles/cache_journal_sc00_018.jnl.gz
index 8dbedc3..8dbedc3 100755
--- a/test/testfiles/cache2_journal_sc00_018.jnl.gz
+++ b/test/testfiles/cache_journal_sc00_018.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc01_000.jnl.gz b/test/testfiles/cache_journal_sc01_000.jnl.gz
index 4ee061a..4ee061a 100755
--- a/test/testfiles/cache2_journal_sc01_000.jnl.gz
+++ b/test/testfiles/cache_journal_sc01_000.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc01_001.jnl.gz b/test/testfiles/cache_journal_sc01_001.jnl.gz
index ef9e210..ef9e210 100755
--- a/test/testfiles/cache2_journal_sc01_001.jnl.gz
+++ b/test/testfiles/cache_journal_sc01_001.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc01_002.jnl.gz b/test/testfiles/cache_journal_sc01_002.jnl.gz
index 81f0090..81f0090 100755
--- a/test/testfiles/cache2_journal_sc01_002.jnl.gz
+++ b/test/testfiles/cache_journal_sc01_002.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc01_003.jnl.gz b/test/testfiles/cache_journal_sc01_003.jnl.gz
index 0b448d5..0b448d5 100755
--- a/test/testfiles/cache2_journal_sc01_003.jnl.gz
+++ b/test/testfiles/cache_journal_sc01_003.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc01_004.jnl.gz b/test/testfiles/cache_journal_sc01_004.jnl.gz
index 43d26ba..43d26ba 100755
--- a/test/testfiles/cache2_journal_sc01_004.jnl.gz
+++ b/test/testfiles/cache_journal_sc01_004.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc02_000.jnl.gz b/test/testfiles/cache_journal_sc02_000.jnl.gz
index 9eae67d..9eae67d 100755
--- a/test/testfiles/cache2_journal_sc02_000.jnl.gz
+++ b/test/testfiles/cache_journal_sc02_000.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc02_001.jnl.gz b/test/testfiles/cache_journal_sc02_001.jnl.gz
index b2f1ea4..b2f1ea4 100755
--- a/test/testfiles/cache2_journal_sc02_001.jnl.gz
+++ b/test/testfiles/cache_journal_sc02_001.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc02_002.jnl.gz b/test/testfiles/cache_journal_sc02_002.jnl.gz
index df42bd7..df42bd7 100755
--- a/test/testfiles/cache2_journal_sc02_002.jnl.gz
+++ b/test/testfiles/cache_journal_sc02_002.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc02_003.jnl.gz b/test/testfiles/cache_journal_sc02_003.jnl.gz
index 1fb5496..1fb5496 100755
--- a/test/testfiles/cache2_journal_sc02_003.jnl.gz
+++ b/test/testfiles/cache_journal_sc02_003.jnl.gz
diff --git a/test/testfiles/cache2_journal_sc02_004.jnl.gz b/test/testfiles/cache_journal_sc02_004.jnl.gz
index a537d91..a537d91 100755
--- a/test/testfiles/cache2_journal_sc02_004.jnl.gz
+++ b/test/testfiles/cache_journal_sc02_004.jnl.gz
diff --git a/test/testfiles/err_compat_1 b/test/testfiles/err_compat_1
index f5215ed..b92cf4a 100644
--- a/test/testfiles/err_compat_1
+++ b/test/testfiles/err_compat_1
@@ -21,9 +21,9 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #001: (file name) line (number) in test_error(): H5Dwrite shouldn't succeed
     major: Error API
     minor: Write failed
-  #002: (file name) line (number) in H5Dwrite(): H5AC2_begin_transaction() failed.
+  #002: (file name) line (number) in H5Dwrite(): H5AC_begin_transaction() failed.
     major: Object cache
     minor: Unable to write to journal file
-  #003: (file name) line (number) in H5AC2_begin_transaction(): H5I_get_type() reports bad id
+  #003: (file name) line (number) in H5AC_begin_transaction(): H5I_get_type() reports bad id
     major: Invalid arguments to routine
     minor: Inappropriate type
diff --git a/test/testfiles/error_test_1 b/test/testfiles/error_test_1
index 767340e..42bdfbf 100644
--- a/test/testfiles/error_test_1
+++ b/test/testfiles/error_test_1
@@ -15,10 +15,10 @@ Error Test-DIAG: Error detected in Error Program (1.0) thread (IDs):
         major: Error in API
         minor: Error in H5Eget_num
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Dwrite(): H5AC2_begin_transaction() failed.
+  #000: (file name) line (number) in H5Dwrite(): H5AC_begin_transaction() failed.
     major: Object cache
     minor: Unable to write to journal file
-  #001: (file name) line (number) in H5AC2_begin_transaction(): H5I_get_type() reports bad id
+  #001: (file name) line (number) in H5AC_begin_transaction(): H5I_get_type() reports bad id
     major: Invalid arguments to routine
     minor: Inappropriate type
 Error Test-DIAG: Error detected in Error Program (1.0) thread (IDs):
@@ -29,9 +29,9 @@ Error Test-DIAG: Error detected in Error Program (1.0) thread (IDs):
     major: Error in IO
     minor: Error in H5Dwrite
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #002: (file name) line (number) in H5Dwrite(): H5AC2_begin_transaction() failed.
+  #002: (file name) line (number) in H5Dwrite(): H5AC_begin_transaction() failed.
     major: Object cache
     minor: Unable to write to journal file
-  #003: (file name) line (number) in H5AC2_begin_transaction(): H5I_get_type() reports bad id
+  #003: (file name) line (number) in H5AC_begin_transaction(): H5I_get_type() reports bad id
     major: Invalid arguments to routine
     minor: Inappropriate type