Updated code in H5Xtest.c files and associated tests.

Reverted overlong-strings warning that gives jam issues.

20 files changed, 740 insertions, 737 deletions

diff --git a/test/accum.c b/test/accum.c
index 3c308b7..fb07580 100644
--- a/test/accum.c
+++ b/test/accum.c
@@ -73,12 +73,12 @@ void accum_printf(const H5F_t *f);
 
 /*-------------------------------------------------------------------------
  * Function:    main
- * 
+ *
  * Purpose:     Test the metadata accumulator code
- * 
+ *
  * Return:      Success: SUCCEED
  *              Failure: FAIL
- * 
+ *
  * Programmer:  Mike McGreevy
  *              October 7, 2010
  *
@@ -145,7 +145,7 @@ main(void)
 
     return 0;
 
-error: 
+error:
     if(api_ctx_pushed) H5CX_pop();
 
     HDputs("*** TESTS FAILED ***");
@@ -159,12 +159,12 @@ error:
 
 /*-------------------------------------------------------------------------
  * Function:    test_write_read
- * 
+ *
  * Purpose:     Simple test to write to then read from metadata accumulator.
- * 
+ *
  * Return:      Success: SUCCEED
  *              Failure: FAIL
- * 
+ *
  * Programmer:  Mike McGreevy
  *              October 7, 2010
  *
@@ -210,17 +210,17 @@ error:
     HDfree(read_buf);
 
     return 1;
-} /* test_write_read */ 
+} /* test_write_read */
 
 
 /*-------------------------------------------------------------------------
  * Function:    test_write_read_nonacc_front
- * 
+ *
  * Purpose:     Simple test to write to then read from before metadata accumulator.
- * 
+ *
  * Return:      Success: SUCCEED
  *              Failure: FAIL
- * 
+ *
  * Programmer:  Allen Byrne
  *              October 8, 2010
  *
@@ -269,17 +269,17 @@ error:
     HDfree(read_buf);
 
     return 1;
-} /* test_write_read */ 
+} /* test_write_read */
 
 
 /*-------------------------------------------------------------------------
  * Function:    test_write_read_nonacc_end
- * 
+ *
  * Purpose:     Simple test to write to then read from after metadata accumulator.
- * 
+ *
  * Return:      Success: SUCCEED
  *              Failure: FAIL
- * 
+ *
  * Programmer:  Allen Byrne
  *              October 8, 2010
  *
@@ -328,17 +328,17 @@ error:
     HDfree(read_buf);
 
     return 1;
-} /* test_write_read */ 
+} /* test_write_read */
 
 
 /*-------------------------------------------------------------------------
  * Function:    test_free
  *
  * Purpose:     Simple test to free metadata accumulator.
- * 
+ *
  * Return:      Success: SUCCEED
  *              Failure: FAIL
- * 
+ *
  * Programmer:  Raymond Lu
  *              October 8, 2010
  *
@@ -354,7 +354,7 @@ test_free(H5F_t *f)
 
     TESTING("simple freeing metadata accumulator");
 
-    /* Write and free the whole accumulator. */ 
+    /* Write and free the whole accumulator. */
     wbuf = (int32_t *)HDmalloc(256 * sizeof(int32_t));
     HDassert(wbuf);
     rbuf = (int32_t *)HDmalloc(256 * sizeof(int32_t));
@@ -376,12 +376,12 @@ test_free(H5F_t *f)
     /* Write second quarter of the accumulator */
     if(accum_write(64 * sizeof(int32_t), 64 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR;
 
-    /* Free the second quarter of the accumulator, the requested area 
+    /* Free the second quarter of the accumulator, the requested area
      * is bigger than the data region on the right side. */
     if(accum_free(f, 64 * sizeof(int32_t), 65 * sizeof(int32_t)) < 0) FAIL_STACK_ERROR;
 
 
-    /* Write half of the accumulator. */ 
+    /* Write half of the accumulator. */
     if(accum_write(0, 128 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR;
 
     /* Free the first block of 4B */
@@ -513,19 +513,19 @@ error:
         HDfree(expect);
 
     return 1;
-} /* test_free */ 
+} /* test_free */
 
 
 /*-------------------------------------------------------------------------
  * Function:    test_accum_overlap
- * 
+ *
  * Purpose:     This test will write a series of pieces of data
  *              to the accumulator with the goal of overlapping
  *              the writes in various different ways.
- * 
+ *
  * Return:      Success: SUCCEED
  *              Failure: FAIL
- * 
+ *
  * Programmer:  Mike McGreevy
  *              October 7, 2010
  *
@@ -617,9 +617,9 @@ test_accum_overlap(H5F_t *f)
     if(accum_write(96, 3 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR;
     if(accum_read(96, 3 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR;
     if(HDmemcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) TEST_ERROR;
- 
+
     /* Set up expected data buffer and verify contents of
-        accumulator as constructed by cases 1-8, above */    
+        accumulator as constructed by cases 1-8, above */
     for(i = 0; i < 5; i++)
         wbuf[i] = 4;
     for(i = 5; i < 6; i++)
@@ -869,14 +869,14 @@ error:
 
 /*-------------------------------------------------------------------------
  * Function:    test_accum_non_overlap_size
- * 
+ *
  * Purpose:     This test will write a series of pieces of data
  *              to the accumulator with the goal of not overlapping
  *              the writes with a data size larger then the accum size.
- * 
+ *
  * Return:      Success: SUCCEED
  *              Failure: FAIL
- * 
+ *
  * Programmer:  Allen Byrne
  *              October 8, 2010
  *
@@ -938,7 +938,7 @@ error:
  *
  * Purpose:     This test will write a series of pieces of data
  *              to the accumulator with the goal of overlapping
- *              the writes with a data size completely overlapping 
+ *              the writes with a data size completely overlapping
  *              the accumulator at both ends.
  *
  * Return:      Success: SUCCEED
@@ -1003,25 +1003,25 @@ error:
 
 /*-------------------------------------------------------------------------
  * Function:    test_accum_adjust
- * 
+ *
  * Purpose:     This test examines the various ways the accumulator might
  *              adjust itself as a result of data appending or prepending
  *              to it.
  *
- *              This test program covers all the code in H5F_accum_adjust, 
+ *              This test program covers all the code in H5F_accum_adjust,
  *              but NOT all possible paths through said code. It only covers
  *              six potential paths through the function. (Again, though, each
  *              piece of code within an if/else statement in H5F_accum_adjust is
- *              covered by one of the paths in this test function). Since there 
- *              are a ridiculous number of total possible paths through this 
+ *              covered by one of the paths in this test function). Since there
+ *              are a ridiculous number of total possible paths through this
  *              function due to its large number of embedded if/else statements,
- *              that's certainly a lot of different test cases to write by hand. 
- *              (Though if someone comes across this code and has some free 
+ *              that's certainly a lot of different test cases to write by hand.
+ *              (Though if someone comes across this code and has some free
  *              time, go for it).
- * 
+ *
  * Return:      Success: SUCCEED
  *              Failure: FAIL
- * 
+ *
  * Programmer:  Mike McGreevy
  *              October 11, 2010
  *
@@ -1056,7 +1056,7 @@ test_accum_adjust(H5F_t *f)
      * an increase in size because it's already at it's maximum size */
     if(accum_write((1024 * 1024), (1024 * 1024) - 1, wbuf) < 0) FAIL_STACK_ERROR;
 
-    /* Write a small (1KB) block that prepends to the front of the accumulator. */ 
+    /* Write a small (1KB) block that prepends to the front of the accumulator. */
     /* ==> Accumulator will need more buffer space */
     /* ==> Accumulator will try to resize, but see that it's getting too big */
     /* ==> Size of new block is less than half maximum size of accumulator */
@@ -1072,7 +1072,7 @@ test_accum_adjust(H5F_t *f)
     /* Read back and verify second write */
     if(accum_read((1024 * 1024) - 1024, 1024, rbuf) < 0) FAIL_STACK_ERROR;
     if(HDmemcmp(wbuf, rbuf, (size_t)1024) != 0) TEST_ERROR;
-    
+
     /* Reset accumulator for next case */
     if(accum_reset(f) < 0) FAIL_STACK_ERROR;
 
@@ -1132,7 +1132,7 @@ test_accum_adjust(H5F_t *f)
         to disk */
     if(accum_write(0, 1, wbuf) < 0) FAIL_STACK_ERROR;
 
-    /* Read in the piece we wrote to disk above, and then verify that 
+    /* Read in the piece we wrote to disk above, and then verify that
         the data is as expected */
     if(accum_read((1024 * 1024) - 1, 1024, rbuf) < 0) FAIL_STACK_ERROR;
     if(HDmemcmp(wbuf, rbuf, (size_t)1024) != 0) TEST_ERROR;
@@ -1163,7 +1163,7 @@ test_accum_adjust(H5F_t *f)
     /* ==> Size of new block is less than than half maximum size of accumulator */
     /* ==> New block being appended to accumulator */
     /* ==> We can slide the dirty region down, to accomodate the request */
-    /* ==> Max Buffer Size - (dirty offset + adjust size) >= 2 * size) */ 
+    /* ==> Max Buffer Size - (dirty offset + adjust size) >= 2 * size) */
     /* ==> Need to adjust location of accumulator while appending */
     /* ==> Accumulator will need to be reallocated */
     if(accum_write(1048571, 349523, wbuf) < 0) FAIL_STACK_ERROR;
@@ -1172,7 +1172,7 @@ test_accum_adjust(H5F_t *f)
         to disk */
     if(accum_write(1398900, 1, wbuf) < 0) FAIL_STACK_ERROR;
 
-    /* Read in the piece we wrote to disk above, and then verify that 
+    /* Read in the piece we wrote to disk above, and then verify that
         the data is as expected */
     if(accum_read(1048571, 349523, rbuf) < 0) FAIL_STACK_ERROR;
     if(HDmemcmp(wbuf, rbuf, (size_t)349523) != 0) TEST_ERROR;
@@ -1201,7 +1201,7 @@ test_accum_adjust(H5F_t *f)
     /* ==> Size of new block is less than than half maximum size of accumulator */
     /* ==> New block being appended to accumulator */
     /* ==> We can slide the dirty region down, to accomodate the request */
-    /* ==> Max Buffer Size - (dirty offset + adjust size) < 2 * size) */ 
+    /* ==> Max Buffer Size - (dirty offset + adjust size) < 2 * size) */
     /* ==> Need to adjust location of accumulator while appending */
     if(accum_write((1024 * 1024) - 5, 10, wbuf) < 0) FAIL_STACK_ERROR;
 
@@ -1209,7 +1209,7 @@ test_accum_adjust(H5F_t *f)
         to disk */
     if(accum_write(0, 1, wbuf) < 0) FAIL_STACK_ERROR;
 
-    /* Read in the piece we wrote to disk above, and then verify that 
+    /* Read in the piece we wrote to disk above, and then verify that
         the data is as expected */
     if(accum_read((1024 * 1024) - 5, 10, rbuf) < 0) FAIL_STACK_ERROR;
     if(HDmemcmp(wbuf, rbuf, (size_t)10) != 0) TEST_ERROR;
@@ -1241,7 +1241,7 @@ test_accum_adjust(H5F_t *f)
         to disk */
     if(accum_write(1398900, 1, wbuf) < 0) FAIL_STACK_ERROR;
 
-    /* Read in the piece we wrote to disk above, and then verify that 
+    /* Read in the piece we wrote to disk above, and then verify that
         the data is as expected */
     if(accum_read(1048571, 349523, rbuf) < 0) FAIL_STACK_ERROR;
     if(HDmemcmp(wbuf, rbuf, (size_t)349523) != 0) TEST_ERROR;
@@ -1267,23 +1267,23 @@ error:
 
 /*-------------------------------------------------------------------------
  * Function:    test_read_after
- * 
- * Purpose:     This test will verify the case when metadata is read partly 
- *              from the accumulator and partly from disk.  The test will 
+ *
+ * Purpose:     This test will verify the case when metadata is read partly
+ *              from the accumulator and partly from disk.  The test will
  *              write a block of data at address 512, force the data to be
- *              written to disk, write new data partially overlapping the 
- *              original block from below, then read data at address 512.  
- *              The data read should be partly new and partly original. 
- * 
+ *              written to disk, write new data partially overlapping the
+ *              original block from below, then read data at address 512.
+ *              The data read should be partly new and partly original.
+ *
  * Return:      Success: SUCCEED
  *              Failure: FAIL
- * 
+ *
  * Programmer:  Larry Knox
  *              October 8, 2010
  *
  *-------------------------------------------------------------------------
  */
-unsigned 
+unsigned
 test_read_after(H5F_t *f)
 {
     int i = 0;
@@ -1317,14 +1317,14 @@ test_read_after(H5F_t *f)
         of the original block */
     if(accum_write(256, 512, wbuf) < 0) FAIL_STACK_ERROR;
 
-    /* Read 128 bytes at the original address, and then  */ 
+    /* Read 128 bytes at the original address, and then  */
     if(accum_read(512, 512, rbuf) < 0) FAIL_STACK_ERROR;
 
-    /* Set the second half of wbuf back to 1s */ 
+    /* Set the second half of wbuf back to 1s */
     for(i = 64; i < s; i++)
         wbuf[i] = 1;
 
-    /* Read in the piece we wrote to disk above, and then verify that 
+    /* Read in the piece we wrote to disk above, and then verify that
         the data is as expected */
     if(accum_read(512, 512, rbuf) < 0) FAIL_STACK_ERROR;
     if(HDmemcmp(wbuf, rbuf, (size_t)128) != 0) TEST_ERROR;
@@ -1350,19 +1350,19 @@ error:
 
 /*-------------------------------------------------------------------------
  * Function:    test_big
- * 
+ *
  * Purpose:     This test exercises writing large pieces of metadata to the
  *		file.
- * 
+ *
  * Return:      Success: SUCCEED
  *              Failure: FAIL
- * 
+ *
  * Programmer:  Quincey Koziol
  *              October 12, 2010
  *
  *-------------------------------------------------------------------------
  */
-unsigned 
+unsigned
 test_big(H5F_t *f)
 {
     uint8_t *wbuf, *wbuf2, *rbuf, *zbuf;        /* Buffers for reading & writing, etc */
@@ -1658,19 +1658,19 @@ error:
 
 /*-------------------------------------------------------------------------
  * Function:    test_random_write
- * 
+ *
  * Purpose:     This test writes random pieces of data to the file and
  *		then reads it all back.
- * 
+ *
  * Return:      Success: SUCCEED
  *              Failure: FAIL
- * 
+ *
  * Programmer:  Quincey Koziol
  *              October 11, 2010
  *
  *-------------------------------------------------------------------------
  */
-unsigned 
+unsigned
 test_random_write(H5F_t *f)
 {
     uint8_t *wbuf, *rbuf;       /* Buffers for reading & writing */
@@ -1796,23 +1796,23 @@ error:
 
 /*-------------------------------------------------------------------------
  * Function:    test_swmr_write_big
- * 
+ *
  * Purpose:    	A SWMR test: verifies that writing "large" metadata to a file
- *		opened with SWMR_WRITE will flush the existing metadata in the 
+ *		opened with SWMR_WRITE will flush the existing metadata in the
  *		accumulator to disk first before writing the "large" metadata
- *	 	to disk.  
+ *	 	to disk.
  *		This test will fork and exec a reader "accum_swmr_reader" which
  *		opens the same file with SWMR_READ and verifies that the correct
  *		metadata is read from disk.
- * 
+ *
  * Return:      Success: 0
  *              Failure: 1
- * 
+ *
  * Programmer:  Vailin Choi; April 2013
  *
  *-------------------------------------------------------------------------
  */
-unsigned 
+unsigned
 test_swmr_write_big(hbool_t newest_format)
 {
     hid_t fid = -1;			    /* File ID */
@@ -1846,7 +1846,7 @@ test_swmr_write_big(hbool_t newest_format)
      * by the environment variable.
      */
     driver = HDgetenv("HDF5_DRIVER");
-    if(!H5FD_supports_swmr_test(driver)) {
+    if(!H5FD__supports_swmr_test(driver)) {
         SKIPPED();
         HDputs("    Test skipped due to VFD not supporting SWMR I/O.");
         return 0;
@@ -1970,11 +1970,11 @@ test_swmr_write_big(hbool_t newest_format)
             FAIL_STACK_ERROR;
 
         /* Close and remove the file */
-        if(H5Fclose(fid) < 0) 
+        if(H5Fclose(fid) < 0)
             FAIL_STACK_ERROR;
 
         /* Close the property list */
-        if(H5Pclose(fapl) < 0) 
+        if(H5Pclose(fapl) < 0)
             FAIL_STACK_ERROR;
 
         /* Pop API context */
@@ -2016,12 +2016,12 @@ error:
 
 /*-------------------------------------------------------------------------
  * Function:    accum_printf
- * 
+ *
  * Purpose:     Debug function to print some stats about the accumulator
- * 
+ *
  * Return:      Success: SUCCEED
  *              Failure: FAIL
- * 
+ *
  * Programmer:  Mike McGreevy
  *              October 7, 2010
  *
diff --git a/test/accum_swmr_reader.c b/test/accum_swmr_reader.c
index 157712f..3fe9ebe 100644
--- a/test/accum_swmr_reader.c
+++ b/test/accum_swmr_reader.c
@@ -27,15 +27,15 @@
 
 /*-------------------------------------------------------------------------
  * Function:    main
- * 
- * Purpose:     This is the reader forked/execved by "test_swmr_write_big()" 
+ *
+ * Purpose:     This is the reader forked/execved by "test_swmr_write_big()"
  *		        test in accum.c.  The reader reads at address 1024 from the file
  *		        and verifies that the metadata in the accumulator at address
  * 		        1024 does get written to disk.
- * 
+ *
  * Return:      Success: EXIT_SUCCESS
  *              Failure: EXIT_FAILURE
- * 
+ *
  * Programmer:  Vailin Choi; June 2013
  *
  *-------------------------------------------------------------------------
@@ -56,7 +56,7 @@ main(void)
      * by the environment variable.
      */
     driver = HDgetenv("HDF5_DRIVER");
-    if(!H5FD_supports_swmr_test(driver))
+    if(!H5FD__supports_swmr_test(driver))
         return EXIT_SUCCESS;
 
     /* Initialize buffers */
@@ -77,7 +77,7 @@ main(void)
     api_ctx_pushed = TRUE;
 
     /* Get H5F_t * to internal file structure */
-    if(NULL == (f = (H5F_t *)H5I_object(fid))) 
+    if(NULL == (f = (H5F_t *)H5I_object(fid)))
         FAIL_STACK_ERROR
 
     /* Should read in [1024, 2024] with buf data */
@@ -85,7 +85,7 @@ main(void)
         FAIL_STACK_ERROR;
 
     /* Verify the data read is correct */
-    if(HDmemcmp(buf, rbuf, (size_t)1024) != 0) 
+    if(HDmemcmp(buf, rbuf, (size_t)1024) != 0)
         TEST_ERROR;
 
     /* CLose the file */
diff --git a/test/cache_tagging.c b/test/cache_tagging.c
index 77554fd..57b5d5c 100644
--- a/test/cache_tagging.c
+++ b/test/cache_tagging.c
@@ -407,7 +407,7 @@ static int
 get_sbe_tag(hid_t fid, haddr_t *tag)
 {
     /* Retrieve the superblock extension's object header address for the file */
-    if(H5F_get_sbe_addr_test(fid, tag) < 0)
+    if(H5F__get_sbe_addr_test(fid, tag) < 0)
         TEST_ERROR;
 
     return 0;
@@ -3599,7 +3599,7 @@ check_external_link_open_tags(void)
     /* =========================== */
     /* Close open objects and file */
     /* =========================== */
-    if ( (H5Gclose(xid)) < 0 ) TEST_ERROR;
+    if ( H5Gclose(xid) < 0 ) TEST_ERROR;
     if ( H5Fclose(fid) < 0 ) TEST_ERROR;
     if ( H5Fclose(fid2) < 0 ) TEST_ERROR;
 
@@ -3672,7 +3672,7 @@ check_invalid_tag_application(void)
     /* This should fail as no tag is set up during the protect call */
     if (( lheap = H5HL_protect(f, addr, H5AC__NO_FLAGS_SET)) != NULL ) TEST_ERROR;
 
-    /* Again, set up a valid tag in the DXPL */
+    /* Again, set up a valid tag in the API context */
     H5AC_tag((haddr_t)25, NULL);
 
     /* Call H5HL_protect again to protect the local heap. This should succeed. */
diff --git a/test/dsets.c b/test/dsets.c
index 04deb5b..6c91ba9 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -8335,7 +8335,7 @@ test_chunk_fast(const char *env_h5_driver, hid_t fapl)
         /* Skip this iteration if SWMR I/O is not supported for the VFD specified
          * by the environment variable.
          */
-        if(swmr && !H5FD_supports_swmr_test(env_h5_driver))
+        if(swmr && !H5FD__supports_swmr_test(env_h5_driver))
             continue;
 
 #ifdef H5_HAVE_FILTER_DEFLATE
@@ -10438,7 +10438,7 @@ test_swmr_non_latest(const char *env_h5_driver, hid_t fapl)
     /* Skip this test if SWMR I/O is not supported for the VFD specified
      * by the environment variable.
      */
-    if(!H5FD_supports_swmr_test(env_h5_driver)) {
+    if(!H5FD__supports_swmr_test(env_h5_driver)) {
         SKIPPED();
         HDputs("    Test skipped due to VFD not supporting SWMR I/O.");
         return SUCCEED;
@@ -10688,7 +10688,7 @@ test_earray_hdr_fd(const char *env_h5_driver, hid_t fapl)
     /* Skip this test if SWMR I/O is not supported for the VFD specified
      * by the environment variable.
      */
-    if(!H5FD_supports_swmr_test(env_h5_driver)) {
+    if(!H5FD__supports_swmr_test(env_h5_driver)) {
         SKIPPED();
         HDputs("    Test skipped due to VFD not supporting SWMR I/O.");
         return SUCCEED;
@@ -10808,7 +10808,7 @@ test_farray_hdr_fd(const char *env_h5_driver, hid_t fapl)
     /* Skip this test if SWMR I/O is not supported for the VFD specified
      * by the environment variable.
      */
-    if(!H5FD_supports_swmr_test(env_h5_driver)) {
+    if(!H5FD__supports_swmr_test(env_h5_driver)) {
         SKIPPED();
         HDputs("    Test skipped due to VFD not supporting SWMR I/O.");
         return SUCCEED;
@@ -10928,7 +10928,7 @@ test_bt2_hdr_fd(const char *env_h5_driver, hid_t fapl)
     /* Skip this test if SWMR I/O is not supported for the VFD specified
      * by the environment variable.
      */
-    if(!H5FD_supports_swmr_test(env_h5_driver)) {
+    if(!H5FD__supports_swmr_test(env_h5_driver)) {
         SKIPPED();
         HDputs("    Test skipped due to VFD not supporting SWMR I/O.");
         return SUCCEED;
@@ -12694,20 +12694,23 @@ error:
 } /* end dls_01_write_data() */
 
 static herr_t
-dls_01_read_stuff( hid_t fid )
+dls_01_read_stuff(hid_t fid)
 {
     int status = 0;
     hid_t did = 0;
     H5O_info_t info;
 
-    did = H5Dopen2( fid, DLS_01_DATASET, H5P_DEFAULT );
-    if ( did <= 0 ) TEST_ERROR
+    did = H5Dopen2(fid, DLS_01_DATASET, H5P_DEFAULT);
+    if(did <= 0)
+        TEST_ERROR
 
-    status = H5Oget_info2( did, &info, H5O_INFO_BASIC );
-    if ( status != 0 ) TEST_ERROR
+    status = H5Oget_info2(did, &info, H5O_INFO_BASIC);
+    if(status != 0)
+        TEST_ERROR
 
-    status = H5Dclose( did );
-    if ( status != 0 ) TEST_ERROR
+    status = H5Dclose(did);
+    if(status != 0)
+        TEST_ERROR
 
     return SUCCEED;
 
diff --git a/test/earray.c b/test/earray.c
index acb4f76..aef7e58 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -521,11 +521,11 @@ verify_cparam(const H5EA_t *ea, const H5EA_create_t *cparam)
 
     /* Retrieve creation parameters */
     HDmemset(&test_cparam, 0, sizeof(H5EA_create_t));
-    if(H5EA_get_cparam_test(ea, &test_cparam) < 0)
+    if(H5EA__get_cparam_test(ea, &test_cparam) < 0)
         FAIL_STACK_ERROR
 
     /* Verify creation parameters */
-    if(H5EA_cmp_cparam_test(cparam, &test_cparam))
+    if(H5EA__cmp_cparam_test(cparam, &test_cparam))
         TEST_ERROR
 
     /* Success */
diff --git a/test/farray.c b/test/farray.c
index 7b316a8..750e8eb 100644
--- a/test/farray.c
+++ b/test/farray.c
@@ -365,11 +365,11 @@ verify_cparam(const H5FA_t *fa, const H5FA_create_t *cparam)
 
     /* Retrieve creation parameters */
     HDmemset(&test_cparam, 0, sizeof(H5FA_create_t));
-    if (H5FA_get_cparam_test(fa, &test_cparam) < 0)
+    if (H5FA__get_cparam_test(fa, &test_cparam) < 0)
         FAIL_STACK_ERROR
 
     /* Verify creation parameters */
-    if (H5FA_cmp_cparam_test(cparam, &test_cparam))
+    if (H5FA__cmp_cparam_test(cparam, &test_cparam))
         TEST_ERROR
 
     /* Success */
diff --git a/test/flush1.c b/test/flush1.c
index a831b46..04f24f7 100644
--- a/test/flush1.c
+++ b/test/flush1.c
@@ -209,7 +209,7 @@ main(void)
 
     /* Check if the current VFD supports SWMR */
     driver = HDgetenv("HDF5_DRIVER");
-    vfd_supports_swmr = H5FD_supports_swmr_test(driver);
+    vfd_supports_swmr = H5FD__supports_swmr_test(driver);
 
     /*************************************************/
     /* NOTE: Not closing the file ID is intentional! */
diff --git a/test/flush2.c b/test/flush2.c
index d58eefd..5fc716b 100644
--- a/test/flush2.c
+++ b/test/flush2.c
@@ -258,7 +258,7 @@ main(void)
 
     /* Check if the current VFD supports SWMR */
     driver = HDgetenv("HDF5_DRIVER");
-    vfd_supports_swmr = H5FD_supports_swmr_test(driver);
+    vfd_supports_swmr = H5FD__supports_swmr_test(driver);
 
     /* TEST 1 */
     /* Check the case where the file was flushed */
diff --git a/test/flushrefresh.c b/test/flushrefresh.c
index c933349..f13032d 100644
--- a/test/flushrefresh.c
+++ b/test/flushrefresh.c
@@ -15,10 +15,10 @@
  * Programmer: Mike McGreevy
  *             June 30, 2010
  *
- * Purpose: This test file contains routines used to test flushing and 
- *          refreshing individual objects' metadata from the cache. 
- *          
- *          Note: This file should NOT be run manually. Instead, invoke it 
+ * Purpose: This test file contains routines used to test flushing and
+ *          refreshing individual objects' metadata from the cache.
+ *
+ *          Note: This file should NOT be run manually. Instead, invoke it
  *          via its associated test script, testflushrefresh.sh
  *
  */
@@ -119,12 +119,12 @@ herr_t end_verification(void);
  * Function:    main
  *
  * Purpose:     This function coordinates the test of flush/refresh
- *              functionality verification. It accepts either one, two or 
+ *              functionality verification. It accepts either one, two or
  *              no command line parameters. The main test routine runs
  *              with no command line parameters specified, while verification
  *              routines run with one or two command line parameters.
- * 
- *              Note: This program should not be run manually, as the 
+ *
+ *              Note: This program should not be run manually, as the
  *              test is controlled by the testflushrefresh.sh script. Running
  *              the flushrefresh program manually will result in failure, as
  *              it will time out waiting for a signal from the test script
@@ -137,7 +137,7 @@ herr_t end_verification(void);
  *
  *-------------------------------------------------------------------------
  */
-int main(int argc, const char *argv[]) 
+int main(int argc, const char *argv[])
 {
     /* Variables */
     const char *envval = NULL;
@@ -148,20 +148,20 @@ int main(int argc, const char *argv[])
 
     /* Parse command line options */
     if(argc == 1) {
-        /* No arguments supplied. Run main test routines if 
-         * using sec2 or stdio driver, otherwise don't run 
+        /* No arguments supplied. Run main test routines if
+         * using sec2 or stdio driver, otherwise don't run
          * anything. */
 
         /* Determine driver being used */
         envval = HDgetenv("HDF5_DRIVER");
 
-        if(envval == NULL || H5FD_supports_swmr_test(envval)) {
+        if(envval == NULL || H5FD__supports_swmr_test(envval)) {
             if(test_flush() != SUCCEED) TEST_ERROR;
             if(test_refresh() != SUCCEED) TEST_ERROR;
         } /* end if */
         else {
             HDfprintf(stdout, "Skipping all flush/refresh tests (only run with SWMR-enabled file drivers).\n");
-            
+
             /* Test script is expecting some signals, so send them out to end it. */
             if(end_verification() < 0) TEST_ERROR;
             if(end_verification() < 0) TEST_ERROR;
@@ -202,29 +202,29 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-herr_t test_flush(void) 
+herr_t test_flush(void)
 {
     /**************************************************************************
      *
      * Test Description:
      *
-     * This test will build an HDF5 file with several objects in a varying 
+     * This test will build an HDF5 file with several objects in a varying
      * hierarchical layout. It will then attempt to flush the objects
      * in the file one by one, individually, using the four H5*flush
-     * routines (D,G,T, and O). After each call to either create or flush an 
+     * routines (D,G,T, and O). After each call to either create or flush an
      * object, a series of verifications will occur on each object in the file.
      *
      * Each verification consists of spawning off a new process and determining
-     * if the object can be opened and its information retreived in said 
-     * alternate process. It reports the results, which are compared to an 
+     * if the object can be opened and its information retreived in said
+     * alternate process. It reports the results, which are compared to an
      * expected value (either that the object can be found on disk, or that it
      * cannot).
      *
      * Note that to spawn a verification, this program sends a signal (by creating
-     * a file on disk) to the test script controlling it, indicating how to 
+     * a file on disk) to the test script controlling it, indicating how to
      * run the verification.
-     * 
-     * Implementation is funky, but basically, an example: 
+     *
+     * Implementation is funky, but basically, an example:
      *
      * Step 1. Dataset is created.
      * Step 2. Verify that dataset can't be opened by separate process, as
@@ -233,14 +233,14 @@ herr_t test_flush(void)
      * Step 4. Verify that group can't be opened by separate process.
      * Step 5. H5Gflush is called on the group.
      * Step 6. Verify that group CAN be opened, but dataset still has
-     *         yet to hit disk, and CANNOT be opened. Success! Only the group 
+     *         yet to hit disk, and CANNOT be opened. Success! Only the group
      *         was flushed.
      *
      **************************************************************************/
 
     /**************************************************************************
       * Generated Test File will look like this:
-      * 
+      *
       * GROUP "/"
       *   DATASET "Dataset1"
       *   GROUP "Group1" {
@@ -265,14 +265,14 @@ herr_t test_flush(void)
 
     /* Cleanup any old error or signal files */
     CLEANUP_FILES;
-    
+
     /* ================ */
     /* CREATE TEST FILE */
     /* ================ */
 
     /* Create file, open root group - have to use latest file format for SWMR */
     if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) TEST_ERROR;
-    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR; 
+    if(H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0) TEST_ERROR;
     if((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC|H5F_ACC_SWMR_WRITE, H5P_DEFAULT, fapl)) < 0) TEST_ERROR;
     if((rid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) TEST_ERROR;
 
@@ -341,7 +341,7 @@ herr_t test_flush(void)
     if(run_flush_verification_process(T2, NOT_FLUSHED) != 0) TEST_ERROR;
     if(run_flush_verification_process(T3, NOT_FLUSHED) != 0) TEST_ERROR;
 
-    /* Flush Group1 and Verify it is recently flushed, and nothing 
+    /* Flush Group1 and Verify it is recently flushed, and nothing
      * else has changed. */
     if((status = H5Gflush(gid)) < 0) TEST_ERROR;
     if(run_flush_verification_process(RG, FLUSHED) != 0) TEST_ERROR;
@@ -355,7 +355,7 @@ herr_t test_flush(void)
     if(run_flush_verification_process(T2, NOT_FLUSHED) != 0) TEST_ERROR;
     if(run_flush_verification_process(T3, NOT_FLUSHED) != 0) TEST_ERROR;
 
-    /* Flush Group2 and Verify it is recently flushed, and nothing 
+    /* Flush Group2 and Verify it is recently flushed, and nothing
      * else has changed. */
     if((status = H5Gflush(gid2)) < 0) TEST_ERROR;
     if(run_flush_verification_process(RG, FLUSHED) != 0) TEST_ERROR;
@@ -440,7 +440,7 @@ herr_t test_flush(void)
     if(run_flush_verification_process(T3, NOT_FLUSHED) != 0) TEST_ERROR;
 
     PASSED();
-    
+
     /* ============= */
     /* FLUSH OBJECTS */
     /* ============= */
@@ -490,7 +490,7 @@ herr_t test_flush(void)
     PASSED();
 
     /* ================== */
-    /* Cleanup and Return */  
+    /* Cleanup and Return */
     /* ================== */
     if(H5Pclose(fapl) < 0) TEST_ERROR;
     if(H5Gclose(gid) < 0) TEST_ERROR;
@@ -515,7 +515,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:    test_refresh
  *
- * Purpose:     This function tests refresh (evict/reload) of individual 
+ * Purpose:     This function tests refresh (evict/reload) of individual
  *              objects' metadata from the metadata cache.
  *
  * Return:      0 on Success, 1 on Failure
@@ -525,27 +525,27 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-herr_t test_refresh(void) 
+herr_t test_refresh(void)
 {
     /**************************************************************************
      *
      * Test Description:
      *
-     * This test will build an HDF5 file with several objects in a varying 
+     * This test will build an HDF5 file with several objects in a varying
      * hierarchical layout. It will then flush the entire file to disk. Then,
      * an attribute will be added to each object in the file.
-     * 
+     *
      * One by one, this process will flush each object to disk, individually.
      * It will also be coordinating with another process, which will open
      * the object before it is flushed by this process, and then refresh the
      * object after it's been flushed, comparing the before and after object
      * information to ensure that they are as expected. (i.e., most notably,
-     * that an attribute has been added, and is only visible after a 
+     * that an attribute has been added, and is only visible after a
      * successful call to a H5*refresh function).
-     * 
-     * As with the flush case, the implemention is a bit tricky as it's 
+     *
+     * As with the flush case, the implemention is a bit tricky as it's
      * dealing with signals going back and forth between the two processes
-     * to ensure the timing is correct, but basically, an example: 
+     * to ensure the timing is correct, but basically, an example:
      *
      * Step 1. Dataset is created.
      * Step 2. Dataset is flushed.
@@ -555,7 +555,7 @@ herr_t test_refresh(void)
      * Step 5. This process flushes the dataset again (with Attribute attached).
      * Step 6. The other process calls H5Drefresh, which should evict/reload
      *         the object's metadata, and thus pick up the attribute that's
-     *         attached to it. Most other before/after object information is 
+     *         attached to it. Most other before/after object information is
      *         compared for sanity as well.
      * Step 7. Rinse and Repeat for each object in the file.
      *
@@ -563,7 +563,7 @@ herr_t test_refresh(void)
 
     /**************************************************************************
       * Generated Test File will look like this:
-      * 
+      *
       * GROUP "/"
       *   DATASET "Dataset1"
       *   GROUP "Group1" {
@@ -755,7 +755,7 @@ herr_t test_refresh(void)
     PASSED();
 
     /* ================== */
-    /* Cleanup and Return */  
+    /* Cleanup and Return */
     /* ================== */
 
     /* Close Stuff */
@@ -791,8 +791,8 @@ error:
  *
  * Purpose:     This function is used to communicate with the test script
  *              in order to spawn off a process to verify that a flush
- *              of an individual object was successful. 
- * 
+ *              of an individual object was successful.
+ *
  * Return:      0 on Success, 1 on Failure
  *
  * Programmer:  Mike McGreevy
@@ -800,7 +800,7 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-herr_t run_flush_verification_process(const char * obj_pathname, const char * expected) 
+herr_t run_flush_verification_process(const char * obj_pathname, const char * expected)
 {
     HDremove(SIGNAL_FROM_SCRIPT);
 
@@ -825,10 +825,10 @@ error:
  * Function:    flush_verification
  *
  * Purpose:     This function tries to open target object in the test file.
- *              It compares the success of the open function to the expected 
+ *              It compares the success of the open function to the expected
  *              value, and succeeds if they are equal and fails if they differ.
  *
- *              Note that full path to the object must be provided as the 
+ *              Note that full path to the object must be provided as the
  *              obj_pathname argument.
  *
  * Return:      0 on Success, 1 on Failure
@@ -838,7 +838,7 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-herr_t flush_verification(const char * obj_pathname, const char * expected) 
+herr_t flush_verification(const char * obj_pathname, const char * expected)
 {
     /* Variables */
     hid_t oid = -1, fid = -1;
@@ -887,7 +887,7 @@ error:
  * Purpose:     This function is used to communicate with the test script
  *              in order to spawn off a process which will test the
  *              H5*refresh routine.
- * 
+ *
  * Return:      0 on Success, 1 on Failure
  *
  * Programmer:  Mike McGreevy
@@ -895,14 +895,14 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-herr_t start_refresh_verification_process(const char * obj_pathname) 
+herr_t start_refresh_verification_process(const char * obj_pathname)
 {
     HDremove(SIGNAL_BETWEEN_PROCESSES_1);
 
-    /* Send Signal to SCRIPT indicating that it should kick off a refresh 
+    /* Send Signal to SCRIPT indicating that it should kick off a refresh
        verification process */
     h5_send_message(SIGNAL_TO_SCRIPT, obj_pathname, NULL);
-    
+
     /* Wait for Signal from VERIFICATION PROCESS indicating that it's opened the
        target object and ready for MAIN PROCESS to modify it */
     if(h5_wait_message(SIGNAL_BETWEEN_PROCESSES_1) < 0) TEST_ERROR;
@@ -922,10 +922,10 @@ error:
  * Function:    end_refresh_verification_process
  *
  * Purpose:     This function is used to communicate with the verification
- *              process spawned by the start_refresh_verification_process 
+ *              process spawned by the start_refresh_verification_process
  *              function. It gives it the go-ahead to call H5*refresh
  *              on an object and conlcude the refresh verification.
- * 
+ *
  * Return:      0 on Success, 1 on Failure
  *
  * Programmer:  Mike McGreevy
@@ -933,8 +933,8 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-herr_t end_refresh_verification_process(void) 
-{ 
+herr_t end_refresh_verification_process(void)
+{
     HDremove(SIGNAL_FROM_SCRIPT);
 
     /* Send Signal to REFRESH VERIFICATION PROCESS indicating that the object
@@ -974,7 +974,7 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-herr_t refresh_verification(const char * obj_pathname) 
+herr_t refresh_verification(const char * obj_pathname)
 {
     /* Variables */
     hid_t oid,fid,status = 0;
@@ -982,7 +982,7 @@ herr_t refresh_verification(const char * obj_pathname)
     H5O_info_t refreshed_oinfo;
     int tries = 800, sleep_tries = 400;
     hbool_t ok = FALSE;
-    
+
     HDremove(SIGNAL_BETWEEN_PROCESSES_2);
 
     /* Open Object */
@@ -991,23 +991,23 @@ herr_t refresh_verification(const char * obj_pathname)
 
     /* Get Object info */
     if((status = H5Oget_info2(oid, &flushed_oinfo, H5O_INFO_BASIC|H5O_INFO_NUM_ATTRS|H5O_INFO_HDR)) < 0) PROCESS_ERROR;
-    
+
     /* Make sure there are no attributes on the object. This is just a sanity
         check to ensure we didn't erroneously flush the attribute before
         starting the verification. */
     if(flushed_oinfo.num_attrs != 0)
         PROCESS_ERROR;
 
-    /* Send Signal to MAIN PROCESS indicating that it can go ahead and modify the 
+    /* Send Signal to MAIN PROCESS indicating that it can go ahead and modify the
         object. */
     h5_send_message(SIGNAL_BETWEEN_PROCESSES_1, obj_pathname, NULL);
 
-    /* Wait for Signal from MAIN PROCESS indicating that it's modified the 
+    /* Wait for Signal from MAIN PROCESS indicating that it's modified the
         object and we can run verification now. */
     if(h5_wait_message(SIGNAL_BETWEEN_PROCESSES_2) < 0) PROCESS_ERROR;
 
-    /* Get object info again. This will NOT reflect what's on disk, only what's 
-       in the cache. Thus, all values will be unchanged from above, despite 
+    /* Get object info again. This will NOT reflect what's on disk, only what's
+       in the cache. Thus, all values will be unchanged from above, despite
        newer information being on disk. */
     if((status = H5Oget_info2(oid, &refreshed_oinfo, H5O_INFO_BASIC|H5O_INFO_NUM_ATTRS|H5O_INFO_HDR)) < 0) PROCESS_ERROR;
 
@@ -1098,7 +1098,7 @@ error:
  *              processes to see if they've succeeded. It checks for the
  *              existance of flushrefresh_ERROR file. If present, that indicates
  *              an external verification process has failed, and this function
- *              thus fails as well. If not present, then nothing else has 
+ *              thus fails as well. If not present, then nothing else has
  *              failed, and this function succeeds.
  *
  * Return:      0 on Success, 1 on Failure
@@ -1108,7 +1108,7 @@ error:
  *
  *-------------------------------------------------------------------------
  */
-herr_t check_for_errors(void) 
+herr_t check_for_errors(void)
 {
     FILE * file;
 
@@ -1124,24 +1124,24 @@ herr_t check_for_errors(void)
 
 /*-------------------------------------------------------------------------
  * Function:    end_verification
- * 
- * Purpose:     Tells test script that verification routines are completed and 
- *              that the test can wrap up. 
+ *
+ * Purpose:     Tells test script that verification routines are completed and
+ *              that the test can wrap up.
  *
  * Return:      void
  *
  * Programmer:  Mike McGreevy
  *              July 16, 2010
- * 
+ *
  *-------------------------------------------------------------------------
  */
-herr_t end_verification(void) 
+herr_t end_verification(void)
 {
     HDremove(SIGNAL_FROM_SCRIPT);
 
     /* Send Signal to SCRIPT to indicate that we're done with verification. */
     h5_send_message(SIGNAL_TO_SCRIPT, "VERIFICATION_DONE", "VERIFICATION_DONE");
-    
+
     /* Wait for Signal from SCRIPT indicating that we can continue. */
     if(h5_wait_message(SIGNAL_FROM_SCRIPT) < 0) TEST_ERROR;
 
diff --git a/test/freespace.c b/test/freespace.c
index 9156061..2a27c3d 100644
--- a/test/freespace.c
+++ b/test/freespace.c
@@ -504,9 +504,9 @@ test_fs_create(hid_t fapl)
         TEST_ERROR
 
     HDmemset(&test_cparam, 0, sizeof(H5FS_create_t));
-    if(H5FS_get_cparam_test(frsp, &test_cparam) < 0)
+    if(H5FS__get_cparam_test(frsp, &test_cparam) < 0)
         FAIL_STACK_ERROR
-    if (H5FS_cmp_cparam_test(&cparam, &test_cparam))
+    if(H5FS__cmp_cparam_test(&cparam, &test_cparam))
         FAIL_STACK_ERROR
 
     /* Close the free space manager */
diff --git a/test/links.c b/test/links.c
index db894af..b9d23aa 100644
--- a/test/links.c
+++ b/test/links.c
@@ -3777,7 +3777,7 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
     if(H5Fclose(file1) < 0) TEST_ERROR
 
     /* Only run this part with VFDs that support SWMR */
-    if(H5FD_supports_swmr_test(env_h5_drvr)) {
+    if(H5FD__supports_swmr_test(env_h5_drvr)) {
 
         /* Reopen file1, with read-write and SWMR-write access */
         /* Only supported under the latest file format */
diff --git a/test/mf.c b/test/mf.c
index f71a2e3..d10b788 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -903,7 +903,7 @@ test_mf_tmp(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
             FAIL_STACK_ERROR
 
         /* Retrieve the file's maxaddr */
-        if(H5F_get_maxaddr_test(file, &maxaddr) < 0)
+        if(H5F__get_maxaddr_test(file, &maxaddr) < 0)
             FAIL_STACK_ERROR
 
         /* Allocate some temporary address space */
diff --git a/test/ohdr.c b/test/ohdr.c
index 1dd038c..8deec10 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -127,7 +127,7 @@ test_cont(char *filename, hid_t fapl)
         FAIL_STACK_ERROR
     if(H5AC_flush(f) < 0)
         FAIL_STACK_ERROR
-    if(H5O_expunge_chunks_test(&oh_locA) < 0)
+    if(H5O__expunge_chunks_test(&oh_locA) < 0)
         FAIL_STACK_ERROR
 
     if(H5O_get_hdr_info(&oh_locA, &hdr_info) < 0)
@@ -228,7 +228,7 @@ test_ohdr_cache(char *filename, hid_t fapl)
 
     /* Query object header information */
     rc = 0;
-    if(H5O_get_rc(&oh_loc, &rc) < 0)
+    if(H5O__get_rc_test(&oh_loc, &rc) < 0)
         FAIL_STACK_ERROR
     if(0 != rc)
         TEST_ERROR
@@ -269,7 +269,7 @@ test_ohdr_cache(char *filename, hid_t fapl)
      *  a non-invasive way -QAK)
      */
     rc = 0;
-    if(H5O_get_rc(&oh_loc, &rc) < 0)
+    if(H5O__get_rc_test(&oh_loc, &rc) < 0)
         FAIL_STACK_ERROR
     if(0 != rc)
         TEST_ERROR
@@ -585,7 +585,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
         FAIL_STACK_ERROR
 
     /* Check that the "unknown" message was _NOT_ marked */
-    if(H5O_check_msg_marked_test(did, FALSE) < 0)
+    if(H5O__check_msg_marked_test(did, FALSE) < 0)
         FAIL_STACK_ERROR
 
     /* Close the dataset */
@@ -665,7 +665,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
         FAIL_STACK_ERROR
 
     /* Check that the "unknown" message was marked */
-    if(H5O_check_msg_marked_test(did, TRUE) < 0)
+    if(H5O__check_msg_marked_test(did, TRUE) < 0)
         FAIL_STACK_ERROR
 
     /* Close the dataset */
diff --git a/test/swmr.c b/test/swmr.c
index e03d0c5..700a68c 100644
--- a/test/swmr.c
+++ b/test/swmr.c
@@ -3015,7 +3015,7 @@ test_start_swmr_write_stress_ohdr(hid_t in_fapl)
 
     /* Retrieve the chunk # for the dataspace message */
     chunk_num = UINT_MAX;
-    if(H5O_msg_get_chunkno_test(did, H5O_SDSPACE_ID, &chunk_num) < 0)
+    if(H5O__msg_get_chunkno_test(did, H5O_SDSPACE_ID, &chunk_num) < 0)
         FAIL_STACK_ERROR;
     /* Should be in chunk #0 for now */
     if(0 != chunk_num)
@@ -3072,7 +3072,7 @@ test_start_swmr_write_stress_ohdr(hid_t in_fapl)
 
     /* Retrieve the chunk # for the dataspace message */
     chunk_num = UINT_MAX;
-    if(H5O_msg_get_chunkno_test(did, H5O_SDSPACE_ID, &chunk_num) < 0)
+    if(H5O__msg_get_chunkno_test(did, H5O_SDSPACE_ID, &chunk_num) < 0)
         FAIL_STACK_ERROR;
     /* Should be in chunk #0 for now */
     if(1 != chunk_num)
@@ -7040,7 +7040,7 @@ main(void)
      * by the environment variable.
      */
     driver = HDgetenv("HDF5_DRIVER");
-    if(!H5FD_supports_swmr_test(driver)) {
+    if(!H5FD__supports_swmr_test(driver)) {
         HDprintf("This VFD does not support SWMR I/O\n");
         return EXIT_SUCCESS;
     } /* end if */
diff --git a/test/swmr_check_compat_vfd.c b/test/swmr_check_compat_vfd.c
index 03dd1b7..9b4fbb5 100644
--- a/test/swmr_check_compat_vfd.c
+++ b/test/swmr_check_compat_vfd.c
@@ -46,7 +46,7 @@ main(void)
 
     driver = HDgetenv("HDF5_DRIVER");
 
-    if(H5FD_supports_swmr_test(driver))
+    if(H5FD__supports_swmr_test(driver))
         return EXIT_SUCCESS;
     else
         return EXIT_FAILURE;
diff --git a/test/swmr_generator.c b/test/swmr_generator.c
index c3b01fa..f6a4fe2 100644
--- a/test/swmr_generator.c
+++ b/test/swmr_generator.c
@@ -230,12 +230,12 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write,
                 unsigned chunk_num;        /* Object header chunk # for dataspace message */
 
                 /* Move the dataspace message to a new object header chunk */
-                if(H5O_msg_move_to_new_chunk_test(dsid, H5O_SDSPACE_ID) < 0)
+                if(H5O__msg_move_to_new_chunk_test(dsid, H5O_SDSPACE_ID) < 0)
                     return -1;
 
                 /* Retrieve the chunk # for the dataspace message */
                 chunk_num = UINT_MAX;
-                if(H5O_msg_get_chunkno_test(dsid, H5O_SDSPACE_ID, &chunk_num) < 0)
+                if(H5O__msg_get_chunkno_test(dsid, H5O_SDSPACE_ID, &chunk_num) < 0)
                     return -1;
                 /* Should not be in chunk #0 for now */
                 if(0 == chunk_num)
diff --git a/test/tattr.c b/test/tattr.c
index 4521c96..b11fd0d 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -2198,8 +2198,8 @@ test_attr_dense_create(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Pclose");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
     /* Add attributes, until just before converting to dense storage */
     for(u = 0; u < max_compact; u++) {
@@ -2218,8 +2218,8 @@ test_attr_dense_create(hid_t fcpl, hid_t fapl)
     } /* end for */
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
     /* Add one more attribute, to push into "dense" storage */
     /* Create attribute */
@@ -2228,8 +2228,8 @@ test_attr_dense_create(hid_t fcpl, hid_t fapl)
     CHECK(attr, FAIL, "H5Acreate2");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
     /* Write data into the attribute */
     ret = H5Awrite(attr, H5T_NATIVE_UINT, &u);
@@ -2338,8 +2338,8 @@ test_attr_dense_open(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Pclose");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
     /* Add attributes, until just before converting to dense storage */
     for(u = 0; u < max_compact; u++) {
@@ -2362,8 +2362,8 @@ test_attr_dense_open(hid_t fcpl, hid_t fapl)
     } /* end for */
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
     /* Add one more attribute, to push into "dense" storage */
     /* Create attribute */
@@ -2372,8 +2372,8 @@ test_attr_dense_open(hid_t fcpl, hid_t fapl)
     CHECK(attr, FAIL, "H5Acreate2");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
     /* Write data into the attribute */
     ret = H5Awrite(attr, H5T_NATIVE_UINT, &u);
@@ -2494,8 +2494,8 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Pclose");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
     /* Add attributes, until well into dense storage */
     for(u = 0; u < (max_compact * 2); u++) {
@@ -2519,8 +2519,8 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl)
     } /* end for */
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
     /* Close dataspace */
     ret = H5Sclose(sid);
@@ -2556,8 +2556,8 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl)
     } /* end for */
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
     /* Delete one more attribute, which should cause reversion to compact storage */
     HDsprintf(attrname, "attr %02u", u);
@@ -2565,8 +2565,8 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Adelete");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
     /* Verify attributes still left */
     ret = test_attr_dense_verify(dataset, (u - 1));
@@ -2578,8 +2578,8 @@ test_attr_dense_delete(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Adelete");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
     /* Verify attributes still left */
     ret = test_attr_dense_verify(dataset, (u - 2));
@@ -2690,7 +2690,7 @@ test_attr_dense_rename(hid_t fcpl, hid_t fapl)
         CHECK(dataset, H5I_INVALID_HID, "H5Dcreate2");
 
         /* Check on dataset's attribute storage status */
-        is_dense = H5O_is_attr_dense_test(dataset);
+        is_dense = H5O__is_attr_dense_test(dataset);
         VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
         /* Add attributes, until well into dense storage */
@@ -2722,7 +2722,7 @@ test_attr_dense_rename(hid_t fcpl, hid_t fapl)
         } /* end for */
 
         /* Check on dataset's attribute storage status */
-        is_dense = H5O_is_attr_dense_test(dataset);
+        is_dense = H5O__is_attr_dense_test(dataset);
         VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
         /* Close Dataset */
@@ -2875,8 +2875,8 @@ test_attr_dense_unlink(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Pclose");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
     /* Add attributes, until well into dense storage */
     for(u = 0; u < (max_compact * 2); u++) {
@@ -2900,8 +2900,8 @@ test_attr_dense_unlink(hid_t fcpl, hid_t fapl)
     } /* end for */
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
     /* Close dataspace */
     ret = H5Sclose(sid);
@@ -2925,9 +2925,9 @@ test_attr_dense_unlink(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Ldelete");
 
     /* Check on dataset's attribute storage status */
-    ret = H5F_get_sohm_mesg_count_test(fid, H5O_ATTR_ID, &mesg_count);
-    CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-    VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+    ret = H5F__get_sohm_mesg_count_test(fid, H5O_ATTR_ID, &mesg_count);
+    CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+    VERIFY(mesg_count, 0, "H5F__get_sohm_mesg_count_test");
 
     /* Close file */
     ret = H5Fclose(fid);
@@ -3017,8 +3017,8 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl)
 
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
 
     /* Add first attribute, which should be immediately in dense storage */
@@ -3038,8 +3038,8 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Aclose");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
 
     /* Add second attribute, to allow deletions to be checked easily */
@@ -3059,8 +3059,8 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Aclose");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
 
     /* Delete second attribute, attributes should still be stored densely */
@@ -3070,8 +3070,8 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Adelete");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
 
     /* Delete first attribute, attributes should not be stored densely */
@@ -3083,8 +3083,8 @@ test_attr_dense_limits(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Adelete");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
 
     /* Close dataspace */
@@ -3180,8 +3180,8 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Pclose");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
     /* Add attributes, until just before converting to dense storage */
     for(u = 0; u < max_compact; u++) {
@@ -3200,8 +3200,8 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     } /* end for */
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
     /* Add one more attribute, to push into "dense" storage */
     /* Create dataspace for attribute */
@@ -3214,8 +3214,8 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     CHECK(attr, FAIL, "H5Acreate2");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
     /* Open the attribute just created and get a second ID */
     attr2 = H5Aopen(dataset, attrname, H5P_DEFAULT);
@@ -3249,8 +3249,8 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     CHECK(dataset, FAIL, "H5Dopen2");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
     /* Open first attribute for the dataset */
     attr = H5Aopen(dataset, attrname, H5P_DEFAULT);
@@ -3302,8 +3302,8 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     CHECK(dataset, FAIL, "H5Dopen2");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
     /* Open first attribute for the dataset */
     attr = H5Aopen(dataset, attrname, H5P_DEFAULT);
@@ -3363,8 +3363,8 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     CHECK(dataset, FAIL, "H5Dopen2");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
     /* Open first attribute for the dataset */
     attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)4,
@@ -3419,8 +3419,8 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     CHECK(dataset, FAIL, "H5Dopen2");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
     /* Open attribute of the dataset for the first time */
     attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)2,
@@ -3435,8 +3435,8 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     }
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
     /* Open attribute for the second time */
     attr2 = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)2,
@@ -3486,8 +3486,8 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     CHECK(dataset, FAIL, "H5Dopen2");
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
     /* Open attribute of the dataset for the first time */
     attr = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)3,
@@ -3511,8 +3511,8 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     }
 
     /* Check on dataset's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
     /* Open attribute for the second time */
     attr2 = H5Aopen_by_idx(dataset, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)3,
@@ -3585,8 +3585,8 @@ test_attr_dense_dup_ids(hid_t fcpl, hid_t fapl)
     CHECK(attr, FAIL, "H5Acreate2");
 
     /* Check on group's attribute storage status */
-    is_dense = H5O_is_attr_dense_test(gid1);
-    VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+    is_dense = H5O__is_attr_dense_test(gid1);
+    VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
     /* Open the hard link just created */
     gid2 = H5Gopen2(fid, GROUP2_NAME, H5P_DEFAULT);
@@ -3724,10 +3724,10 @@ test_attr_big(hid_t fcpl, hid_t fapl)
 
 
     /* Check on dataset's attribute storage status */
-    is_empty = H5O_is_attr_empty_test(dataset);
-    VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_empty = H5O__is_attr_empty_test(dataset);
+    VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
 
     /* Add first "small" attribute, which should be in compact storage */
@@ -3743,10 +3743,10 @@ test_attr_big(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Aclose");
 
     /* Check on dataset's attribute storage status */
-    is_empty = H5O_is_attr_empty_test(dataset);
-    VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_empty = H5O__is_attr_empty_test(dataset);
+    VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
 
     /* Add second "small" attribute, which should stay in compact storage */
@@ -3762,10 +3762,10 @@ test_attr_big(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Aclose");
 
     /* Check on dataset's attribute storage status */
-    is_empty = H5O_is_attr_empty_test(dataset);
-    VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_empty = H5O__is_attr_empty_test(dataset);
+    VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
 
     /* Add first "big" attribute, which should push storage into dense form */
@@ -3786,10 +3786,10 @@ test_attr_big(hid_t fcpl, hid_t fapl)
          *  message heap instead of forcing the attribute storage into the dense
          *  form - QAK)
          */
-        is_empty = H5O_is_attr_empty_test(dataset);
-        VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(dataset);
-        VERIFY(is_dense, (nshared_indices ? FALSE : TRUE), "H5O_is_attr_dense_test");
+        is_empty = H5O__is_attr_empty_test(dataset);
+        VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(dataset);
+        VERIFY(is_dense, (nshared_indices ? FALSE : TRUE), "H5O__is_attr_dense_test");
 
 
         /* Add second "big" attribute, which should leave storage in dense form */
@@ -3809,10 +3809,10 @@ test_attr_big(hid_t fcpl, hid_t fapl)
          *  message heap instead of forcing the attribute storage into the dense
          *  form - QAK)
          */
-        is_empty = H5O_is_attr_empty_test(dataset);
-        VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(dataset);
-        VERIFY(is_dense, (nshared_indices ? FALSE : TRUE), "H5O_is_attr_dense_test");
+        is_empty = H5O__is_attr_empty_test(dataset);
+        VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(dataset);
+        VERIFY(is_dense, (nshared_indices ? FALSE : TRUE), "H5O__is_attr_dense_test");
 
 
         /* Delete second "small" attribute, attributes should still be stored densely */
@@ -3824,10 +3824,10 @@ test_attr_big(hid_t fcpl, hid_t fapl)
         CHECK(ret, FAIL, "H5Adelete");
 
         /* Check on dataset's attribute storage status */
-        is_empty = H5O_is_attr_empty_test(dataset);
-        VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(dataset);
-        VERIFY(is_dense, (nshared_indices ? FALSE : TRUE), "H5O_is_attr_dense_test");
+        is_empty = H5O__is_attr_empty_test(dataset);
+        VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(dataset);
+        VERIFY(is_dense, (nshared_indices ? FALSE : TRUE), "H5O__is_attr_dense_test");
 
 
         /* Delete second "big" attribute, attributes should still be stored densely */
@@ -3839,10 +3839,10 @@ test_attr_big(hid_t fcpl, hid_t fapl)
         CHECK(ret, FAIL, "H5Adelete");
 
         /* Check on dataset's attribute storage status */
-        is_empty = H5O_is_attr_empty_test(dataset);
-        VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(dataset);
-        VERIFY(is_dense, (nshared_indices ? FALSE : TRUE), "H5O_is_attr_dense_test");
+        is_empty = H5O__is_attr_empty_test(dataset);
+        VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(dataset);
+        VERIFY(is_dense, (nshared_indices ? FALSE : TRUE), "H5O__is_attr_dense_test");
 
 
         /* Delete first "big" attribute, attributes should _not_ be stored densely */
@@ -3854,10 +3854,10 @@ test_attr_big(hid_t fcpl, hid_t fapl)
         CHECK(ret, FAIL, "H5Adelete");
 
         /* Check on dataset's attribute storage status */
-        is_empty = H5O_is_attr_empty_test(dataset);
-        VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(dataset);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+        is_empty = H5O__is_attr_empty_test(dataset);
+        VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(dataset);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
 
         /* Delete first "small" attribute, should be no attributes now */
@@ -3869,8 +3869,8 @@ test_attr_big(hid_t fcpl, hid_t fapl)
         CHECK(ret, FAIL, "H5Adelete");
 
         /* Check on dataset's attribute storage status */
-        is_empty = H5O_is_attr_empty_test(dataset);
-        VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
+        is_empty = H5O__is_attr_empty_test(dataset);
+        VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
     } /* end if */
     else {
         /* Shouldn't be able to create "big" attributes with older version of format */
@@ -3881,10 +3881,10 @@ test_attr_big(hid_t fcpl, hid_t fapl)
          *  message heap instead of forcing the attribute storage into the dense
          *  form - QAK)
          */
-        is_empty = H5O_is_attr_empty_test(dataset);
-        VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(dataset);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+        is_empty = H5O__is_attr_empty_test(dataset);
+        VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(dataset);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
     } /* end else */
 
 
@@ -4433,10 +4433,10 @@ test_attr_corder_create_basic(hid_t fcpl, hid_t fapl)
     CHECK(ret, FAIL, "H5Sclose");
 
     /* Check on dataset's attribute storage status */
-    is_empty = H5O_is_attr_empty_test(dataset);
-    VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_empty = H5O__is_attr_empty_test(dataset);
+    VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -4460,10 +4460,10 @@ test_attr_corder_create_basic(hid_t fcpl, hid_t fapl)
     CHECK(dataset, FAIL, "H5Dopen2");
 
     /* Check on dataset's attribute storage status */
-    is_empty = H5O_is_attr_empty_test(dataset);
-    VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
-    is_dense = H5O_is_attr_dense_test(dataset);
-    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+    is_empty = H5O__is_attr_empty_test(dataset);
+    VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
+    is_dense = H5O__is_attr_dense_test(dataset);
+    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
     /* Retrieve dataset creation property list for group */
     dcpl = H5Dget_create_plist(dataset);
@@ -4569,10 +4569,10 @@ test_attr_corder_create_compact(hid_t fcpl, hid_t fapl)
         } /* end switch */
 
         /* Check on dataset's attribute storage status */
-        is_empty = H5O_is_attr_empty_test(my_dataset);
-        VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(my_dataset);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+        is_empty = H5O__is_attr_empty_test(my_dataset);
+        VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(my_dataset);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
         /* Create several attributes, but keep storage in compact form */
         for(u = 0; u < max_compact; u++) {
@@ -4590,13 +4590,13 @@ test_attr_corder_create_compact(hid_t fcpl, hid_t fapl)
             CHECK(ret, FAIL, "H5Aclose");
 
             /* Verify state of object */
-            ret = H5O_num_attrs_test(my_dataset, &nattrs);
-            CHECK(ret, FAIL, "H5O_num_attrs_test");
-            VERIFY(nattrs, (u + 1), "H5O_num_attrs_test");
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+            ret = H5O__num_attrs_test(my_dataset, &nattrs);
+            CHECK(ret, FAIL, "H5O__num_attrs_test");
+            VERIFY(nattrs, (u + 1), "H5O__num_attrs_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
         } /* end for */
     } /* end for */
 
@@ -4653,13 +4653,13 @@ test_attr_corder_create_compact(hid_t fcpl, hid_t fapl)
         } /* end switch */
 
         /* Check on dataset's attribute storage status */
-        ret = H5O_num_attrs_test(my_dataset, &nattrs);
-        CHECK(ret, FAIL, "H5O_num_attrs_test");
-        VERIFY(nattrs, max_compact, "H5O_num_attrs_test");
-        is_empty = H5O_is_attr_empty_test(my_dataset);
-        VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(my_dataset);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+        ret = H5O__num_attrs_test(my_dataset, &nattrs);
+        CHECK(ret, FAIL, "H5O__num_attrs_test");
+        VERIFY(nattrs, max_compact, "H5O__num_attrs_test");
+        is_empty = H5O__is_attr_empty_test(my_dataset);
+        VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(my_dataset);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
         /* Loop through attributes, checking their creation order values */
         /* (the name index is used, but the creation order value is in the same order) */
@@ -4774,10 +4774,10 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl)
         } /* end switch */
 
         /* Check on dataset's attribute storage status */
-        is_empty = H5O_is_attr_empty_test(my_dataset);
-        VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(my_dataset);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+        is_empty = H5O__is_attr_empty_test(my_dataset);
+        VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(my_dataset);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
         /* Create several attributes, but keep storage in compact form */
         for(u = 0; u < max_compact; u++) {
@@ -4795,13 +4795,13 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl)
             CHECK(ret, FAIL, "H5Aclose");
 
             /* Verify state of object */
-            ret = H5O_num_attrs_test(my_dataset, &nattrs);
-            CHECK(ret, FAIL, "H5O_num_attrs_test");
-            VERIFY(nattrs, (u + 1), "H5O_num_attrs_test");
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+            ret = H5O__num_attrs_test(my_dataset, &nattrs);
+            CHECK(ret, FAIL, "H5O__num_attrs_test");
+            VERIFY(nattrs, (u + 1), "H5O__num_attrs_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
         } /* end for */
 
         /* Create another attribute, to push into dense storage */
@@ -4818,18 +4818,18 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl)
         CHECK(ret, FAIL, "H5Aclose");
 
         /* Verify state of object */
-        ret = H5O_num_attrs_test(my_dataset, &nattrs);
-        CHECK(ret, FAIL, "H5O_num_attrs_test");
-        VERIFY(nattrs, (max_compact + 1), "H5O_num_attrs_test");
-        is_empty = H5O_is_attr_empty_test(my_dataset);
-        VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(my_dataset);
-        VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+        ret = H5O__num_attrs_test(my_dataset, &nattrs);
+        CHECK(ret, FAIL, "H5O__num_attrs_test");
+        VERIFY(nattrs, (max_compact + 1), "H5O__num_attrs_test");
+        is_empty = H5O__is_attr_empty_test(my_dataset);
+        VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(my_dataset);
+        VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
         /* Retrieve & verify # of records in the name & creation order indices */
-        ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
-        CHECK(ret, FAIL, "H5O_attr_dense_info_test");
-        VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
+        ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count);
+        CHECK(ret, FAIL, "H5O__attr_dense_info_test");
+        VERIFY(name_count, corder_count, "H5O__attr_dense_info_test");
     } /* end for */
 
     /* Close Datasets */
@@ -4885,13 +4885,13 @@ test_attr_corder_create_dense(hid_t fcpl, hid_t fapl)
         } /* end switch */
 
         /* Check on dataset's attribute storage status */
-        ret = H5O_num_attrs_test(my_dataset, &nattrs);
-        CHECK(ret, FAIL, "H5O_num_attrs_test");
-        VERIFY(nattrs, (max_compact + 1), "H5O_num_attrs_test");
-        is_empty = H5O_is_attr_empty_test(my_dataset);
-        VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(my_dataset);
-        VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+        ret = H5O__num_attrs_test(my_dataset, &nattrs);
+        CHECK(ret, FAIL, "H5O__num_attrs_test");
+        VERIFY(nattrs, (max_compact + 1), "H5O__num_attrs_test");
+        is_empty = H5O__is_attr_empty_test(my_dataset);
+        VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(my_dataset);
+        VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
         /* Loop through attributes, checking their creation order values */
         /* (the name index is used, but the creation order value is in the same order) */
@@ -5118,10 +5118,10 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
         } /* end switch */
 
         /* Check on dataset's attribute storage status */
-        is_empty = H5O_is_attr_empty_test(my_dataset);
-        VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(my_dataset);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+        is_empty = H5O__is_attr_empty_test(my_dataset);
+        VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(my_dataset);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
     } /* end for */
 
     /* Close Datasets */
@@ -5188,13 +5188,13 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
             CHECK(ret, FAIL, "H5Aclose");
 
             /* Verify state of object */
-            ret = H5O_num_attrs_test(my_dataset, &nattrs);
-            CHECK(ret, FAIL, "H5O_num_attrs_test");
-            VERIFY(nattrs, (u + 1), "H5O_num_attrs_test");
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+            ret = H5O__num_attrs_test(my_dataset, &nattrs);
+            CHECK(ret, FAIL, "H5O__num_attrs_test");
+            VERIFY(nattrs, (u + 1), "H5O__num_attrs_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
         } /* end for */
 
         /* Create another attribute, to push into dense storage */
@@ -5211,18 +5211,18 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
         CHECK(ret, FAIL, "H5Aclose");
 
         /* Verify state of object */
-        ret = H5O_num_attrs_test(my_dataset, &nattrs);
-        CHECK(ret, FAIL, "H5O_num_attrs_test");
-        VERIFY(nattrs, (max_compact + 1), "H5O_num_attrs_test");
-        is_empty = H5O_is_attr_empty_test(my_dataset);
-        VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(my_dataset);
-        VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+        ret = H5O__num_attrs_test(my_dataset, &nattrs);
+        CHECK(ret, FAIL, "H5O__num_attrs_test");
+        VERIFY(nattrs, (max_compact + 1), "H5O__num_attrs_test");
+        is_empty = H5O__is_attr_empty_test(my_dataset);
+        VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(my_dataset);
+        VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
         /* Retrieve & verify # of records in the name & creation order indices */
-        ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
-        CHECK(ret, FAIL, "H5O_attr_dense_info_test");
-        VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
+        ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count);
+        CHECK(ret, FAIL, "H5O__attr_dense_info_test");
+        VERIFY(name_count, corder_count, "H5O__attr_dense_info_test");
 
         /* Delete several attributes from object, until attribute storage resumes compact form */
         for(u = max_compact; u >= min_dense; u--) {
@@ -5231,18 +5231,18 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
             CHECK(ret, FAIL, "H5Adelete");
 
             /* Verify state of object */
-            ret = H5O_num_attrs_test(my_dataset, &nattrs);
-            CHECK(ret, FAIL, "H5O_num_attrs_test");
-            VERIFY(nattrs, u, "H5O_num_attrs_test");
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+            ret = H5O__num_attrs_test(my_dataset, &nattrs);
+            CHECK(ret, FAIL, "H5O__num_attrs_test");
+            VERIFY(nattrs, u, "H5O__num_attrs_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
             /* Retrieve & verify # of records in the name & creation order indices */
-            ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
-            CHECK(ret, FAIL, "H5O_attr_dense_info_test");
-            VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
+            ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count);
+            CHECK(ret, FAIL, "H5O__attr_dense_info_test");
+            VERIFY(name_count, corder_count, "H5O__attr_dense_info_test");
         } /* end for */
 
         /* Delete another attribute, to push attribute storage into compact form */
@@ -5251,13 +5251,13 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
         CHECK(ret, FAIL, "H5Adelete");
 
         /* Verify state of object */
-        ret = H5O_num_attrs_test(my_dataset, &nattrs);
-        CHECK(ret, FAIL, "H5O_num_attrs_test");
-        VERIFY(nattrs, (min_dense - 1), "H5O_num_attrs_test");
-        is_empty = H5O_is_attr_empty_test(my_dataset);
-        VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(my_dataset);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+        ret = H5O__num_attrs_test(my_dataset, &nattrs);
+        CHECK(ret, FAIL, "H5O__num_attrs_test");
+        VERIFY(nattrs, (min_dense - 1), "H5O__num_attrs_test");
+        is_empty = H5O__is_attr_empty_test(my_dataset);
+        VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(my_dataset);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
         /* Re-add attributes to get back into dense form */
         for(u = (min_dense - 1); u < (max_compact + 1); u++) {
@@ -5276,18 +5276,18 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
         } /* end for */
 
         /* Verify state of object */
-        ret = H5O_num_attrs_test(my_dataset, &nattrs);
-        CHECK(ret, FAIL, "H5O_num_attrs_test");
-        VERIFY(nattrs, (max_compact + 1), "H5O_num_attrs_test");
-        is_empty = H5O_is_attr_empty_test(my_dataset);
-        VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(my_dataset);
-        VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+        ret = H5O__num_attrs_test(my_dataset, &nattrs);
+        CHECK(ret, FAIL, "H5O__num_attrs_test");
+        VERIFY(nattrs, (max_compact + 1), "H5O__num_attrs_test");
+        is_empty = H5O__is_attr_empty_test(my_dataset);
+        VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(my_dataset);
+        VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
         /* Retrieve & verify # of records in the name & creation order indices */
-        ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
-        CHECK(ret, FAIL, "H5O_attr_dense_info_test");
-        VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
+        ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count);
+        CHECK(ret, FAIL, "H5O__attr_dense_info_test");
+        VERIFY(name_count, corder_count, "H5O__attr_dense_info_test");
     } /* end for */
 
     /* Close Datasets */
@@ -5335,18 +5335,18 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
         } /* end switch */
 
         /* Check on dataset's attribute storage status */
-        ret = H5O_num_attrs_test(my_dataset, &nattrs);
-        CHECK(ret, FAIL, "H5O_num_attrs_test");
-        VERIFY(nattrs, (max_compact + 1), "H5O_num_attrs_test");
-        is_empty = H5O_is_attr_empty_test(my_dataset);
-        VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(my_dataset);
-        VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+        ret = H5O__num_attrs_test(my_dataset, &nattrs);
+        CHECK(ret, FAIL, "H5O__num_attrs_test");
+        VERIFY(nattrs, (max_compact + 1), "H5O__num_attrs_test");
+        is_empty = H5O__is_attr_empty_test(my_dataset);
+        VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(my_dataset);
+        VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
         /* Retrieve & verify # of records in the name & creation order indices */
-        ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
-        CHECK(ret, FAIL, "H5O_attr_dense_info_test");
-        VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
+        ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count);
+        CHECK(ret, FAIL, "H5O__attr_dense_info_test");
+        VERIFY(name_count, corder_count, "H5O__attr_dense_info_test");
 
         /* Delete several attributes from object, until attribute storage resumes compact form */
         for(u = max_compact; u >= min_dense; u--) {
@@ -5355,18 +5355,18 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
             CHECK(ret, FAIL, "H5Adelete");
 
             /* Verify state of object */
-            ret = H5O_num_attrs_test(my_dataset, &nattrs);
-            CHECK(ret, FAIL, "H5O_num_attrs_test");
-            VERIFY(nattrs, u, "H5O_num_attrs_test");
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+            ret = H5O__num_attrs_test(my_dataset, &nattrs);
+            CHECK(ret, FAIL, "H5O__num_attrs_test");
+            VERIFY(nattrs, u, "H5O__num_attrs_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
             /* Retrieve & verify # of records in the name & creation order indices */
-            ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
-            CHECK(ret, FAIL, "H5O_attr_dense_info_test");
-            VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
+            ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count);
+            CHECK(ret, FAIL, "H5O__attr_dense_info_test");
+            VERIFY(name_count, corder_count, "H5O__attr_dense_info_test");
         } /* end for */
 
         /* Delete another attribute, to push attribute storage into compact form */
@@ -5375,13 +5375,13 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
         CHECK(ret, FAIL, "H5Adelete");
 
         /* Verify state of object */
-        ret = H5O_num_attrs_test(my_dataset, &nattrs);
-        CHECK(ret, FAIL, "H5O_num_attrs_test");
-        VERIFY(nattrs, (min_dense - 1), "H5O_num_attrs_test");
-        is_empty = H5O_is_attr_empty_test(my_dataset);
-        VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(my_dataset);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+        ret = H5O__num_attrs_test(my_dataset, &nattrs);
+        CHECK(ret, FAIL, "H5O__num_attrs_test");
+        VERIFY(nattrs, (min_dense - 1), "H5O__num_attrs_test");
+        is_empty = H5O__is_attr_empty_test(my_dataset);
+        VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(my_dataset);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
         /* Re-add attributes to get back into dense form */
         for(u = (min_dense - 1); u < (max_compact + 1); u++) {
@@ -5400,18 +5400,18 @@ test_attr_corder_transition(hid_t fcpl, hid_t fapl)
         } /* end for */
 
         /* Verify state of object */
-        ret = H5O_num_attrs_test(my_dataset, &nattrs);
-        CHECK(ret, FAIL, "H5O_num_attrs_test");
-        VERIFY(nattrs, (max_compact + 1), "H5O_num_attrs_test");
-        is_empty = H5O_is_attr_empty_test(my_dataset);
-        VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-        is_dense = H5O_is_attr_dense_test(my_dataset);
-        VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+        ret = H5O__num_attrs_test(my_dataset, &nattrs);
+        CHECK(ret, FAIL, "H5O__num_attrs_test");
+        VERIFY(nattrs, (max_compact + 1), "H5O__num_attrs_test");
+        is_empty = H5O__is_attr_empty_test(my_dataset);
+        VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+        is_dense = H5O__is_attr_dense_test(my_dataset);
+        VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
         /* Retrieve & verify # of records in the name & creation order indices */
-        ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
-        CHECK(ret, FAIL, "H5O_attr_dense_info_test");
-        VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
+        ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count);
+        CHECK(ret, FAIL, "H5O__attr_dense_info_test");
+        VERIFY(name_count, corder_count, "H5O__attr_dense_info_test");
 
         /* Delete all attributes */
         for(u = max_compact; u > 0; u--) {
@@ -5553,10 +5553,10 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl)
             } /* end switch */
 
             /* Check on dataset's attribute storage status */
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
             /* Create attributes, until attribute storage is in dense form */
             for(u = 0; u < max_compact * 2; u++) {
@@ -5575,18 +5575,18 @@ test_attr_corder_delete(hid_t fcpl, hid_t fapl)
             } /* end for */
 
             /* Verify state of object */
-            ret = H5O_num_attrs_test(my_dataset, &nattrs);
-            CHECK(ret, FAIL, "H5O_num_attrs_test");
-            VERIFY(nattrs, (max_compact * 2), "H5O_num_attrs_test");
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+            ret = H5O__num_attrs_test(my_dataset, &nattrs);
+            CHECK(ret, FAIL, "H5O__num_attrs_test");
+            VERIFY(nattrs, (max_compact * 2), "H5O__num_attrs_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
             /* Retrieve & verify # of records in the name & creation order indices */
-            ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
-            CHECK(ret, FAIL, "H5O_attr_dense_info_test");
-            VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
+            ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count);
+            CHECK(ret, FAIL, "H5O__attr_dense_info_test");
+            VERIFY(name_count, corder_count, "H5O__attr_dense_info_test");
         } /* end for */
 
         /* Close Datasets */
@@ -5888,10 +5888,10 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
             } /* end switch */
 
             /* Check on dataset's attribute storage status */
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
             /* Check for query on non-existant attribute */
             ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &ainfo, H5P_DEFAULT);
@@ -5920,13 +5920,13 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
             } /* end for */
 
             /* Verify state of object */
-            ret = H5O_num_attrs_test(my_dataset, &nattrs);
-            CHECK(ret, FAIL, "H5O_num_attrs_test");
-            VERIFY(nattrs, max_compact, "H5O_num_attrs_test");
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+            ret = H5O__num_attrs_test(my_dataset, &nattrs);
+            CHECK(ret, FAIL, "H5O__num_attrs_test");
+            VERIFY(nattrs, max_compact, "H5O__num_attrs_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
             /* Check for out of bound offset queries */
             ret = H5Aget_info_by_idx(my_dataset, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &ainfo, H5P_DEFAULT);
@@ -5952,8 +5952,8 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                 CHECK(ret, FAIL, "H5Aclose");
 
                 /* Verify state of object */
-                is_dense = H5O_is_attr_dense_test(my_dataset);
-                VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+                is_dense = H5O__is_attr_dense_test(my_dataset);
+                VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test");
 
                 /* Verify information for new attribute */
                 ret = attr_info_by_idx_check(my_dataset, attrname, (hsize_t)u, use_index);
@@ -5961,21 +5961,21 @@ test_attr_info_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
             } /* end for */
 
             /* Verify state of object */
-            ret = H5O_num_attrs_test(my_dataset, &nattrs);
-            CHECK(ret, FAIL, "H5O_num_attrs_test");
-            VERIFY(nattrs, (max_compact * 2), "H5O_num_attrs_test");
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+            ret = H5O__num_attrs_test(my_dataset, &nattrs);
+            CHECK(ret, FAIL, "H5O__num_attrs_test");
+            VERIFY(nattrs, (max_compact * 2), "H5O__num_attrs_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test");
 
             if(new_format) {
                 /* Retrieve & verify # of records in the name & creation order indices */
-                ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
-                CHECK(ret, FAIL, "H5O_attr_dense_info_test");
+                ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count);
+                CHECK(ret, FAIL, "H5O__attr_dense_info_test");
                 if(use_index)
-                    VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
-                VERIFY(name_count, (max_compact * 2), "H5O_attr_dense_info_test");
+                    VERIFY(name_count, corder_count, "H5O__attr_dense_info_test");
+                VERIFY(name_count, (max_compact * 2), "H5O__attr_dense_info_test");
             } /* end if */
 
             /* Check for out of bound offset queries */
@@ -6133,10 +6133,10 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     } /* end switch */
 
                     /* Check on dataset's attribute storage status */
-                    is_empty = H5O_is_attr_empty_test(my_dataset);
-                    VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
-                    is_dense = H5O_is_attr_dense_test(my_dataset);
-                    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+                    is_empty = H5O__is_attr_empty_test(my_dataset);
+                    VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
+                    is_dense = H5O__is_attr_dense_test(my_dataset);
+                    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
                     /* Check for deleting non-existant attribute */
                     ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
@@ -6163,13 +6163,13 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     } /* end for */
 
                     /* Verify state of object */
-                    ret = H5O_num_attrs_test(my_dataset, &nattrs);
-                    CHECK(ret, FAIL, "H5O_num_attrs_test");
-                    VERIFY(nattrs, max_compact, "H5O_num_attrs_test");
-                    is_empty = H5O_is_attr_empty_test(my_dataset);
-                    VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-                    is_dense = H5O_is_attr_dense_test(my_dataset);
-                    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+                    ret = H5O__num_attrs_test(my_dataset, &nattrs);
+                    CHECK(ret, FAIL, "H5O__num_attrs_test");
+                    VERIFY(nattrs, max_compact, "H5O__num_attrs_test");
+                    is_empty = H5O__is_attr_empty_test(my_dataset);
+                    VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+                    is_dense = H5O__is_attr_dense_test(my_dataset);
+                    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
                     /* Check for out of bound deletions */
                     ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT);
@@ -6229,8 +6229,8 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     CHECK(ret, FAIL, "H5Adelete_by_idx");
 
                     /* Verify state of attribute storage (empty) */
-                    is_empty = H5O_is_attr_empty_test(my_dataset);
-                    VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
+                    is_empty = H5O__is_attr_empty_test(my_dataset);
+                    VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
                 } /* end for */
 
                 /* Work on all the datasets */
@@ -6269,8 +6269,8 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
 
                         /* Verify state of object */
                         if(u >= max_compact) {
-                            is_dense = H5O_is_attr_dense_test(my_dataset);
-                            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+                            is_dense = H5O__is_attr_dense_test(my_dataset);
+                            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test");
                         } /* end if */
 
                         /* Verify information for new attribute */
@@ -6279,21 +6279,21 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     } /* end for */
 
                     /* Verify state of object */
-                    ret = H5O_num_attrs_test(my_dataset, &nattrs);
-                    CHECK(ret, FAIL, "H5O_num_attrs_test");
-                    VERIFY(nattrs, (max_compact * 2), "H5O_num_attrs_test");
-                    is_empty = H5O_is_attr_empty_test(my_dataset);
-                    VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-                    is_dense = H5O_is_attr_dense_test(my_dataset);
-                    VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+                    ret = H5O__num_attrs_test(my_dataset, &nattrs);
+                    CHECK(ret, FAIL, "H5O__num_attrs_test");
+                    VERIFY(nattrs, (max_compact * 2), "H5O__num_attrs_test");
+                    is_empty = H5O__is_attr_empty_test(my_dataset);
+                    VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+                    is_dense = H5O__is_attr_dense_test(my_dataset);
+                    VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test");
 
                     if(new_format) {
                         /* Retrieve & verify # of records in the name & creation order indices */
-                        ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
-                        CHECK(ret, FAIL, "H5O_attr_dense_info_test");
+                        ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count);
+                        CHECK(ret, FAIL, "H5O__attr_dense_info_test");
                         if(use_index)
-                            VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
-                        VERIFY(name_count, (max_compact * 2), "H5O_attr_dense_info_test");
+                            VERIFY(name_count, corder_count, "H5O__attr_dense_info_test");
+                        VERIFY(name_count, (max_compact * 2), "H5O__attr_dense_info_test");
                     } /* end if */
 
                     /* Check for out of bound deletion */
@@ -6354,8 +6354,8 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     CHECK(ret, FAIL, "H5Adelete_by_idx");
 
                     /* Verify state of attribute storage (empty) */
-                    is_empty = H5O_is_attr_empty_test(my_dataset);
-                    VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
+                    is_empty = H5O__is_attr_empty_test(my_dataset);
+                    VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
 
                     /* Check for deletion on empty attribute storage again */
                     ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
@@ -6402,8 +6402,8 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
 
                         /* Verify state of object */
                         if(u >= max_compact) {
-                            is_dense = H5O_is_attr_dense_test(my_dataset);
-                            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+                            is_dense = H5O__is_attr_dense_test(my_dataset);
+                            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test");
                         } /* end if */
 
                         /* Verify information for new attribute */
@@ -6514,8 +6514,8 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     CHECK(ret, FAIL, "H5Adelete_by_idx");
 
                     /* Verify state of attribute storage (empty) */
-                    is_empty = H5O_is_attr_empty_test(my_dataset);
-                    VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
+                    is_empty = H5O__is_attr_empty_test(my_dataset);
+                    VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
 
                     /* Check for deletion on empty attribute storage again */
                     ret = H5Adelete_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
@@ -7090,10 +7090,10 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     } /* end switch */
 
                     /* Check on dataset's attribute storage status */
-                    is_empty = H5O_is_attr_empty_test(my_dataset);
-                    VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
-                    is_dense = H5O_is_attr_dense_test(my_dataset);
-                    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+                    is_empty = H5O__is_attr_empty_test(my_dataset);
+                    VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
+                    is_dense = H5O__is_attr_dense_test(my_dataset);
+                    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
                     /* Check for iterating over object with no attributes (should be OK) */
                     ret = H5Aiterate2(my_dataset, idx_type, order, NULL, attr_iterate2_cb, NULL);
@@ -7126,13 +7126,13 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     } /* end for */
 
                     /* Verify state of object */
-                    ret = H5O_num_attrs_test(my_dataset, &nattrs);
-                    CHECK(ret, FAIL, "H5O_num_attrs_test");
-                    VERIFY(nattrs, max_compact, "H5O_num_attrs_test");
-                    is_empty = H5O_is_attr_empty_test(my_dataset);
-                    VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-                    is_dense = H5O_is_attr_dense_test(my_dataset);
-                    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+                    ret = H5O__num_attrs_test(my_dataset, &nattrs);
+                    CHECK(ret, FAIL, "H5O__num_attrs_test");
+                    VERIFY(nattrs, max_compact, "H5O__num_attrs_test");
+                    is_empty = H5O__is_attr_empty_test(my_dataset);
+                    VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+                    is_dense = H5O__is_attr_dense_test(my_dataset);
+                    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
                     /* Check for out of bound iteration */
                     idx = u;
@@ -7192,8 +7192,8 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl)
 
                         /* Verify state of object */
                         if(u >= max_compact) {
-                            is_dense = H5O_is_attr_dense_test(my_dataset);
-                            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+                            is_dense = H5O__is_attr_dense_test(my_dataset);
+                            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test");
                         } /* end if */
 
                         /* Verify information for new attribute */
@@ -7202,21 +7202,21 @@ test_attr_iterate2(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     } /* end for */
 
                     /* Verify state of object */
-                    ret = H5O_num_attrs_test(my_dataset, &nattrs);
-                    CHECK(ret, FAIL, "H5O_num_attrs_test");
-                    VERIFY(nattrs, (max_compact * 2), "H5O_num_attrs_test");
-                    is_empty = H5O_is_attr_empty_test(my_dataset);
-                    VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-                    is_dense = H5O_is_attr_dense_test(my_dataset);
-                    VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+                    ret = H5O__num_attrs_test(my_dataset, &nattrs);
+                    CHECK(ret, FAIL, "H5O__num_attrs_test");
+                    VERIFY(nattrs, (max_compact * 2), "H5O__num_attrs_test");
+                    is_empty = H5O__is_attr_empty_test(my_dataset);
+                    VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+                    is_dense = H5O__is_attr_dense_test(my_dataset);
+                    VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test");
 
                     if(new_format) {
                         /* Retrieve & verify # of records in the name & creation order indices */
-                        ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
-                        CHECK(ret, FAIL, "H5O_attr_dense_info_test");
+                        ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count);
+                        CHECK(ret, FAIL, "H5O__attr_dense_info_test");
                         if(use_index)
-                            VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
-                        VERIFY(name_count, (max_compact * 2), "H5O_attr_dense_info_test");
+                            VERIFY(name_count, corder_count, "H5O__attr_dense_info_test");
+                        VERIFY(name_count, (max_compact * 2), "H5O__attr_dense_info_test");
                     } /* end if */
 
                     /* Check for out of bound iteration */
@@ -7447,10 +7447,10 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     } /* end switch */
 
                     /* Check on dataset's attribute storage status */
-                    is_empty = H5O_is_attr_empty_test(my_dataset);
-                    VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
-                    is_dense = H5O_is_attr_dense_test(my_dataset);
-                    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+                    is_empty = H5O__is_attr_empty_test(my_dataset);
+                    VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
+                    is_dense = H5O__is_attr_dense_test(my_dataset);
+                    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
                     /* Check for opening an attribute on an object with no attributes */
                     ret_id = H5Aopen_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT, H5P_DEFAULT);
@@ -7477,13 +7477,13 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     } /* end for */
 
                     /* Verify state of object */
-                    ret = H5O_num_attrs_test(my_dataset, &nattrs);
-                    CHECK(ret, FAIL, "H5O_num_attrs_test");
-                    VERIFY(nattrs, max_compact, "H5O_num_attrs_test");
-                    is_empty = H5O_is_attr_empty_test(my_dataset);
-                    VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-                    is_dense = H5O_is_attr_dense_test(my_dataset);
-                    VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+                    ret = H5O__num_attrs_test(my_dataset, &nattrs);
+                    CHECK(ret, FAIL, "H5O__num_attrs_test");
+                    VERIFY(nattrs, max_compact, "H5O__num_attrs_test");
+                    is_empty = H5O__is_attr_empty_test(my_dataset);
+                    VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+                    is_dense = H5O__is_attr_dense_test(my_dataset);
+                    VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
                     /* Check for out of bound opening an attribute on an object */
                     ret_id = H5Aopen_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT, H5P_DEFAULT);
@@ -7531,8 +7531,8 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
 
                         /* Verify state of object */
                         if(u >= max_compact) {
-                            is_dense = H5O_is_attr_dense_test(my_dataset);
-                            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+                            is_dense = H5O__is_attr_dense_test(my_dataset);
+                            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test");
                         } /* end if */
 
                         /* Verify information for new attribute */
@@ -7541,21 +7541,21 @@ test_attr_open_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl)
                     } /* end for */
 
                     /* Verify state of object */
-                    ret = H5O_num_attrs_test(my_dataset, &nattrs);
-                    CHECK(ret, FAIL, "H5O_num_attrs_test");
-                    VERIFY(nattrs, (max_compact * 2), "H5O_num_attrs_test");
-                    is_empty = H5O_is_attr_empty_test(my_dataset);
-                    VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-                    is_dense = H5O_is_attr_dense_test(my_dataset);
-                    VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+                    ret = H5O__num_attrs_test(my_dataset, &nattrs);
+                    CHECK(ret, FAIL, "H5O__num_attrs_test");
+                    VERIFY(nattrs, (max_compact * 2), "H5O__num_attrs_test");
+                    is_empty = H5O__is_attr_empty_test(my_dataset);
+                    VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+                    is_dense = H5O__is_attr_dense_test(my_dataset);
+                    VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test");
 
                     if(new_format) {
                         /* Retrieve & verify # of records in the name & creation order indices */
-                        ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
-                        CHECK(ret, FAIL, "H5O_attr_dense_info_test");
+                        ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count);
+                        CHECK(ret, FAIL, "H5O__attr_dense_info_test");
                         if(use_index)
-                            VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
-                        VERIFY(name_count, (max_compact * 2), "H5O_attr_dense_info_test");
+                            VERIFY(name_count, corder_count, "H5O__attr_dense_info_test");
+                        VERIFY(name_count, (max_compact * 2), "H5O__attr_dense_info_test");
                     } /* end if */
 
                     /* Check for out of bound opening an attribute on an object */
@@ -7774,10 +7774,10 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl)
             } /* end switch */
 
             /* Check on dataset's attribute storage status */
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
             /* Check for opening a non-existant attribute on an object with no attributes */
             ret_id = H5Aopen(my_dataset, "foo", H5P_DEFAULT);
@@ -7810,13 +7810,13 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl)
             } /* end for */
 
             /* Verify state of object */
-            ret = H5O_num_attrs_test(my_dataset, &nattrs);
-            CHECK(ret, FAIL, "H5O_num_attrs_test");
-            VERIFY(nattrs, max_compact, "H5O_num_attrs_test");
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+            ret = H5O__num_attrs_test(my_dataset, &nattrs);
+            CHECK(ret, FAIL, "H5O__num_attrs_test");
+            VERIFY(nattrs, max_compact, "H5O__num_attrs_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
             /* Check for opening a non-existant attribute on an object with compact attribute storage */
             ret_id = H5Aopen(my_dataset, "foo", H5P_DEFAULT);
@@ -7873,8 +7873,8 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl)
 
                 /* Verify state of object */
                 if(u >= max_compact) {
-                    is_dense = H5O_is_attr_dense_test(my_dataset);
-                    VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+                    is_dense = H5O__is_attr_dense_test(my_dataset);
+                    VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test");
                 } /* end if */
 
                 /* Verify information for new attribute */
@@ -7883,21 +7883,21 @@ test_attr_open_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl)
             } /* end for */
 
             /* Verify state of object */
-            ret = H5O_num_attrs_test(my_dataset, &nattrs);
-            CHECK(ret, FAIL, "H5O_num_attrs_test");
-            VERIFY(nattrs, (max_compact * 2), "H5O_num_attrs_test");
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+            ret = H5O__num_attrs_test(my_dataset, &nattrs);
+            CHECK(ret, FAIL, "H5O__num_attrs_test");
+            VERIFY(nattrs, (max_compact * 2), "H5O__num_attrs_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test");
 
             if(new_format) {
                 /* Retrieve & verify # of records in the name & creation order indices */
-                ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
-                CHECK(ret, FAIL, "H5O_attr_dense_info_test");
+                ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count);
+                CHECK(ret, FAIL, "H5O__attr_dense_info_test");
                 if(use_index)
-                    VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
-                VERIFY(name_count, (max_compact * 2), "H5O_attr_dense_info_test");
+                    VERIFY(name_count, corder_count, "H5O__attr_dense_info_test");
+                VERIFY(name_count, (max_compact * 2), "H5O__attr_dense_info_test");
             } /* end if */
 
             /* Check for opening a non-existant attribute on an object with dense attribute storage */
@@ -8033,10 +8033,10 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl)
             } /* end switch */
 
             /* Check on dataset's attribute storage status */
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, TRUE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, TRUE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
             /* Create attributes, up to limit of compact form */
             for(u = 0; u < max_compact; u++) {
@@ -8059,13 +8059,13 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl)
             } /* end for */
 
             /* Verify state of object */
-            ret = H5O_num_attrs_test(my_dataset, &nattrs);
-            CHECK(ret, FAIL, "H5O_num_attrs_test");
-            VERIFY(nattrs, max_compact, "H5O_num_attrs_test");
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+            ret = H5O__num_attrs_test(my_dataset, &nattrs);
+            CHECK(ret, FAIL, "H5O__num_attrs_test");
+            VERIFY(nattrs, max_compact, "H5O__num_attrs_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
             /* Test opening attributes stored compactly */
             ret = attr_open_check(fid, dsetname, my_dataset, u);
@@ -8112,8 +8112,8 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl)
 
                 /* Verify state of object */
                 if(u >= max_compact) {
-                    is_dense = H5O_is_attr_dense_test(my_dataset);
-                    VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+                    is_dense = H5O__is_attr_dense_test(my_dataset);
+                    VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test");
                 } /* end if */
 
                 /* Verify information for new attribute */
@@ -8122,21 +8122,21 @@ test_attr_create_by_name(hbool_t new_format, hid_t fcpl, hid_t fapl)
             } /* end for */
 
             /* Verify state of object */
-            ret = H5O_num_attrs_test(my_dataset, &nattrs);
-            CHECK(ret, FAIL, "H5O_num_attrs_test");
-            VERIFY(nattrs, (max_compact * 2), "H5O_num_attrs_test");
-            is_empty = H5O_is_attr_empty_test(my_dataset);
-            VERIFY(is_empty, FALSE, "H5O_is_attr_empty_test");
-            is_dense = H5O_is_attr_dense_test(my_dataset);
-            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O_is_attr_dense_test");
+            ret = H5O__num_attrs_test(my_dataset, &nattrs);
+            CHECK(ret, FAIL, "H5O__num_attrs_test");
+            VERIFY(nattrs, (max_compact * 2), "H5O__num_attrs_test");
+            is_empty = H5O__is_attr_empty_test(my_dataset);
+            VERIFY(is_empty, FALSE, "H5O__is_attr_empty_test");
+            is_dense = H5O__is_attr_dense_test(my_dataset);
+            VERIFY(is_dense, (new_format ? TRUE : FALSE), "H5O__is_attr_dense_test");
 
             if(new_format) {
                 /* Retrieve & verify # of records in the name & creation order indices */
-                ret = H5O_attr_dense_info_test(my_dataset, &name_count, &corder_count);
-                CHECK(ret, FAIL, "H5O_attr_dense_info_test");
+                ret = H5O__attr_dense_info_test(my_dataset, &name_count, &corder_count);
+                CHECK(ret, FAIL, "H5O__attr_dense_info_test");
                 if(use_index)
-                    VERIFY(name_count, corder_count, "H5O_attr_dense_info_test");
-                VERIFY(name_count, (max_compact * 2), "H5O_attr_dense_info_test");
+                    VERIFY(name_count, corder_count, "H5O__attr_dense_info_test");
+                VERIFY(name_count, (max_compact * 2), "H5O__attr_dense_info_test");
             } /* end if */
 
             /* Test opening attributes stored compactly */
@@ -8295,14 +8295,14 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl)
         /* Check on dataset's message storage status */
         if(test_shared != 0) {
             /* Datasets' datatypes can be shared */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 1, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 1, "H5F__get_sohm_mesg_count_test");
 
             /* Datasets' dataspace can be shared */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 1, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 1, "H5F__get_sohm_mesg_count_test");
         } /* end if */
 
         /* Retrieve limits for compact/dense attribute storage */
@@ -8314,10 +8314,10 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl)
         CHECK(ret, FAIL, "H5Pclose");
 
         /* Check on datasets' attribute storage status */
-        is_dense = H5O_is_attr_dense_test(dataset);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
-        is_dense = H5O_is_attr_dense_test(dataset2);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+        is_dense = H5O__is_attr_dense_test(dataset);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
+        is_dense = H5O__is_attr_dense_test(dataset2);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
         /* Add attributes to each dataset, until after converting to dense storage */
         for(u = 0; u < max_compact * 2; u++) {
@@ -8369,11 +8369,11 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl)
             CHECK(ret, FAIL, "H5Aclose");
 
             /* Check on dataset's attribute storage status */
-            is_dense = H5O_is_attr_dense_test(dataset);
+            is_dense = H5O__is_attr_dense_test(dataset);
             if(u < max_compact)
-                VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
             else
-                VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
 
             /* Alternate between creating "small" & "big" attributes */
@@ -8421,11 +8421,11 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl)
             CHECK(ret, FAIL, "H5Aclose");
 
             /* Check on dataset's attribute storage status */
-            is_dense = H5O_is_attr_dense_test(dataset2);
+            is_dense = H5O__is_attr_dense_test(dataset2);
             if(u < max_compact)
-                VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
             else
-                VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
         } /* end for */
 
         /* Close attribute's datatype */
@@ -8442,15 +8442,15 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl)
         if(test_shared != 0) {
             if(test_shared == 1) {
                 /* Check on datatype storage status */
-                ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
-                CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-                VERIFY(mesg_count, 2, "H5F_get_sohm_mesg_count_test");
+                ret = H5F__get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+                CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+                VERIFY(mesg_count, 2, "H5F__get_sohm_mesg_count_test");
             } /* end if */
 
             /* Check on dataspace storage status */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 2, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 2, "H5F__get_sohm_mesg_count_test");
         } /* end if */
 
         /* Unlink datasets with attributes */
@@ -8466,20 +8466,20 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl)
         } /* end if */
 
         /* Check on attribute storage status */
-        ret = H5F_get_sohm_mesg_count_test(fid, H5O_ATTR_ID, &mesg_count);
-        CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-        VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+        ret = H5F__get_sohm_mesg_count_test(fid, H5O_ATTR_ID, &mesg_count);
+        CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+        VERIFY(mesg_count, 0, "H5F__get_sohm_mesg_count_test");
 
         if(test_shared != 0) {
             /* Check on datatype storage status */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 0, "H5F__get_sohm_mesg_count_test");
 
             /* Check on dataspace storage status */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 0, "H5F__get_sohm_mesg_count_test");
         } /* end if */
 
         /* Close file */
@@ -8631,14 +8631,14 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl)
         /* Check on dataset's message storage status */
         if(test_shared != 0) {
             /* Datasets' datatypes can be shared */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 1, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 1, "H5F__get_sohm_mesg_count_test");
 
             /* Datasets' dataspace can be shared */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 1, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 1, "H5F__get_sohm_mesg_count_test");
         } /* end if */
 
         /* Retrieve limits for compact/dense attribute storage */
@@ -8650,10 +8650,10 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl)
         CHECK(ret, FAIL, "H5Pclose");
 
         /* Check on datasets' attribute storage status */
-        is_dense = H5O_is_attr_dense_test(dataset);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
-        is_dense = H5O_is_attr_dense_test(dataset2);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+        is_dense = H5O__is_attr_dense_test(dataset);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
+        is_dense = H5O__is_attr_dense_test(dataset2);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
         /* Add attributes to each dataset, until after converting to dense storage */
         for(u = 0; u < max_compact * 2; u++) {
@@ -8705,11 +8705,11 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl)
             CHECK(ret, FAIL, "H5Aclose");
 
             /* Check on dataset's attribute storage status */
-            is_dense = H5O_is_attr_dense_test(dataset);
+            is_dense = H5O__is_attr_dense_test(dataset);
             if(u < max_compact)
-                VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
             else
-                VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
 
             /* Alternate between creating "small" & "big" attributes */
@@ -8757,11 +8757,11 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl)
             CHECK(ret, FAIL, "H5Aclose");
 
             /* Check on dataset's attribute storage status */
-            is_dense = H5O_is_attr_dense_test(dataset2);
+            is_dense = H5O__is_attr_dense_test(dataset2);
             if(u < max_compact)
-                VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
             else
-                VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
 
             /* Create new attribute name */
@@ -8894,15 +8894,15 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl)
         if(test_shared != 0) {
             if(test_shared == 1) {
                 /* Check on datatype storage status */
-                ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
-                CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-                VERIFY(mesg_count, 2, "H5F_get_sohm_mesg_count_test");
+                ret = H5F__get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+                CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+                VERIFY(mesg_count, 2, "H5F__get_sohm_mesg_count_test");
             } /* end if */
 
             /* Check on dataspace storage status */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 2, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 2, "H5F__get_sohm_mesg_count_test");
         } /* end if */
 
         /* Unlink datasets with attributes */
@@ -8918,20 +8918,20 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl)
         } /* end if */
 
         /* Check on attribute storage status */
-        ret = H5F_get_sohm_mesg_count_test(fid, H5O_ATTR_ID, &mesg_count);
-        CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-        VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+        ret = H5F__get_sohm_mesg_count_test(fid, H5O_ATTR_ID, &mesg_count);
+        CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+        VERIFY(mesg_count, 0, "H5F__get_sohm_mesg_count_test");
 
         if(test_shared != 0) {
             /* Check on datatype storage status */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 0, "H5F__get_sohm_mesg_count_test");
 
             /* Check on dataspace storage status */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 0, "H5F__get_sohm_mesg_count_test");
         } /* end if */
 
         /* Close file */
@@ -9082,14 +9082,14 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl)
         /* Check on dataset's message storage status */
         if(test_shared != 0) {
             /* Datasets' datatypes can be shared */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 1, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 1, "H5F__get_sohm_mesg_count_test");
 
             /* Datasets' dataspace can be shared */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 1, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 1, "H5F__get_sohm_mesg_count_test");
         } /* end if */
 
         /* Retrieve limits for compact/dense attribute storage */
@@ -9101,10 +9101,10 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl)
         CHECK(ret, FAIL, "H5Pclose");
 
         /* Check on datasets' attribute storage status */
-        is_dense = H5O_is_attr_dense_test(dataset);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
-        is_dense = H5O_is_attr_dense_test(dataset2);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+        is_dense = H5O__is_attr_dense_test(dataset);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
+        is_dense = H5O__is_attr_dense_test(dataset2);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
         /* Add attributes to each dataset, until after converting to dense storage */
         for(u = 0; u < max_compact * 2; u++) {
@@ -9156,11 +9156,11 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl)
             CHECK(ret, FAIL, "H5Aclose");
 
             /* Check on dataset's attribute storage status */
-            is_dense = H5O_is_attr_dense_test(dataset);
+            is_dense = H5O__is_attr_dense_test(dataset);
             if(u < max_compact)
-                VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
             else
-                VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
 
             /* Alternate between creating "small" & "big" attributes */
@@ -9200,7 +9200,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl)
                 /* Check refcount for attribute */
                 ret = H5A__get_shared_rc_test(attr, &shared_refcount);
                 CHECK(ret, FAIL, "H5A__get_shared_rc_test");
-                VERIFY(shared_refcount, 2, "H5A_get_shared_rc_test");
+                VERIFY(shared_refcount, 2, "H5A__get_shared_rc_test");
             } /* end else */
 
             /* Close attribute */
@@ -9208,11 +9208,11 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl)
             CHECK(ret, FAIL, "H5Aclose");
 
             /* Check on dataset's attribute storage status */
-            is_dense = H5O_is_attr_dense_test(dataset2);
+            is_dense = H5O__is_attr_dense_test(dataset2);
             if(u < max_compact)
-                VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
             else
-                VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
         } /* end for */
 
 
@@ -9268,15 +9268,15 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl)
         if(test_shared != 0) {
             if(test_shared == 1) {
                 /* Check on datatype storage status */
-                ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
-                CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-                VERIFY(mesg_count, 2, "H5F_get_sohm_mesg_count_test");
+                ret = H5F__get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+                CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+                VERIFY(mesg_count, 2, "H5F__get_sohm_mesg_count_test");
             } /* end if */
 
             /* Check on dataspace storage status */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 2, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 2, "H5F__get_sohm_mesg_count_test");
         } /* end if */
 
         /* Unlink datasets with attributes */
@@ -9292,20 +9292,20 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl)
         } /* end if */
 
         /* Check on attribute storage status */
-        ret = H5F_get_sohm_mesg_count_test(fid, H5O_ATTR_ID, &mesg_count);
-        CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-        VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+        ret = H5F__get_sohm_mesg_count_test(fid, H5O_ATTR_ID, &mesg_count);
+        CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+        VERIFY(mesg_count, 0, "H5F__get_sohm_mesg_count_test");
 
         if(test_shared != 0) {
             /* Check on datatype storage status */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 0, "H5F__get_sohm_mesg_count_test");
 
             /* Check on dataspace storage status */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 0, "H5F__get_sohm_mesg_count_test");
         } /* end if */
 
         /* Close file */
@@ -9456,14 +9456,14 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl)
         /* Check on dataset's message storage status */
         if(test_shared != 0) {
             /* Datasets' datatypes can be shared */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 1, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 1, "H5F__get_sohm_mesg_count_test");
 
             /* Datasets' dataspace can be shared */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 1, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 1, "H5F__get_sohm_mesg_count_test");
         } /* end if */
 
         /* Retrieve limits for compact/dense attribute storage */
@@ -9475,10 +9475,10 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl)
         CHECK(ret, FAIL, "H5Pclose");
 
         /* Check on datasets' attribute storage status */
-        is_dense = H5O_is_attr_dense_test(dataset);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
-        is_dense = H5O_is_attr_dense_test(dataset2);
-        VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+        is_dense = H5O__is_attr_dense_test(dataset);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
+        is_dense = H5O__is_attr_dense_test(dataset2);
+        VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
 
         /* Add attributes to each dataset, until after converting to dense storage */
         for(u = 0; u < max_compact * 2; u++) {
@@ -9530,11 +9530,11 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl)
             CHECK(ret, FAIL, "H5Aclose");
 
             /* Check on dataset's attribute storage status */
-            is_dense = H5O_is_attr_dense_test(dataset);
+            is_dense = H5O__is_attr_dense_test(dataset);
             if(u < max_compact)
-                VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
             else
-                VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
 
             /* Alternate between creating "small" & "big" attributes */
@@ -9582,11 +9582,11 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl)
             CHECK(ret, FAIL, "H5Aclose");
 
             /* Check on dataset's attribute storage status */
-            is_dense = H5O_is_attr_dense_test(dataset2);
+            is_dense = H5O__is_attr_dense_test(dataset2);
             if(u < max_compact)
-                VERIFY(is_dense, FALSE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, FALSE, "H5O__is_attr_dense_test");
             else
-                VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+                VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
         } /* end for */
 
 
@@ -9604,8 +9604,8 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl)
 
 
         /* Check on first dataset's attribute storage status */
-        is_dense = H5O_is_attr_dense_test(dataset);
-        VERIFY(is_dense, TRUE, "H5O_is_attr_dense_test");
+        is_dense = H5O__is_attr_dense_test(dataset);
+        VERIFY(is_dense, TRUE, "H5O__is_attr_dense_test");
 
         /* Check ref count on  attributes of first dataset */
         for(u = 0; u < max_compact * 2; u++) {
@@ -9652,20 +9652,20 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl)
         } /* end if */
 
         /* Check on attribute storage status */
-        ret = H5F_get_sohm_mesg_count_test(fid, H5O_ATTR_ID, &mesg_count);
-        CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-        VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+        ret = H5F__get_sohm_mesg_count_test(fid, H5O_ATTR_ID, &mesg_count);
+        CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+        VERIFY(mesg_count, 0, "H5F__get_sohm_mesg_count_test");
 
         if(test_shared != 0) {
             /* Check on datatype storage status */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_DTYPE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 0, "H5F__get_sohm_mesg_count_test");
 
             /* Check on dataspace storage status */
-            ret = H5F_get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
-            CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-            VERIFY(mesg_count, 0, "H5F_get_sohm_mesg_count_test");
+            ret = H5F__get_sohm_mesg_count_test(fid, H5O_SDSPACE_ID, &mesg_count);
+            CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+            VERIFY(mesg_count, 0, "H5F__get_sohm_mesg_count_test");
         } /* end if */
 
         /* Close file */
diff --git a/test/tfile.c b/test/tfile.c
index 0172dd1..6c313ba 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -2679,8 +2679,8 @@ test_cached_stab_info(void)
     CHECK(file_id, FAIL, "H5Fopen");
 
     /* Verify the cached symbol table information */
-    ret = H5F_check_cached_stab_test(file_id);
-    CHECK(ret, FAIL, "H5F_check_cached_stab_test");
+    ret = H5F__check_cached_stab_test(file_id);
+    CHECK(ret, FAIL, "H5F__check_cached_stab_test");
 
     /* Close file */
     ret = H5Fclose(file_id);
diff --git a/test/tgenprop.c b/test/tgenprop.c
index 72fe7ca..7ca7dca 100644
--- a/test/tgenprop.c
+++ b/test/tgenprop.c
@@ -1774,8 +1774,8 @@ test_genprop_path(void)
     CHECK_I(ret, "H5Pregister2");
 
     /* Get full path for first class */
-    path = H5P_get_class_path_test(cid1);
-    CHECK_PTR(path, "H5P_get_class_path_test");
+    path = H5P__get_class_path_test(cid1);
+    CHECK_PTR(path, "H5P__get_class_path_test");
     if(HDstrcmp(path,CLASS1_PATH)!=0)
         TestErrPrintf("Class names don't match!, path=%s, CLASS1_PATH=%s\n",path,CLASS1_PATH);
     H5free_memory(path);
@@ -1789,14 +1789,14 @@ test_genprop_path(void)
     CHECK_I(ret, "H5Pregister2");
 
     /* Get full path for second class */
-    path = H5P_get_class_path_test(cid2);
-    CHECK_PTR(path, "H5P_get_class_path_test");
+    path = H5P__get_class_path_test(cid2);
+    CHECK_PTR(path, "H5P__get_class_path_test");
     if(HDstrcmp(path,CLASS2_PATH)!=0)
         TestErrPrintf("Class names don't match!, path=%s, CLASS2_PATH=%s\n",path,CLASS2_PATH);
 
     /* Open a copy of the class with the path name */
-    cid3 = H5P_open_class_path_test(path);
-    CHECK_I(cid3, "H5Popen_class_path");
+    cid3 = H5P__open_class_path_test(path);
+    CHECK_I(cid3, "H5P__open_class_path_test");
 
     /* Check that the classes are equal */
     ret = H5Pequal(cid2,cid3);
diff --git a/test/tsohm.c b/test/tsohm.c
index 01ac3d2..0536047 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -3739,18 +3739,18 @@ test_sohm_external_dtype(void)
     CHECK_I(file1, "H5Fcreate");
 
     /* Check on datatype storage status. It should be zero now. */
-    ret = H5F_get_sohm_mesg_count_test(file1, H5O_DTYPE_ID, &dmsg_count);
-    CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-    VERIFY(dmsg_count, 0, "H5F_get_sohm_mesg_count_test");
+    ret = H5F__get_sohm_mesg_count_test(file1, H5O_DTYPE_ID, &dmsg_count);
+    CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+    VERIFY(dmsg_count, 0, "H5F__get_sohm_mesg_count_test");
 
     dataset1 = H5Dcreate2(file1, "dataset_1", s1_tid, space, H5P_DEFAULT, H5P_DEFAULT,
         H5P_DEFAULT);
     CHECK_I(dataset1, "H5Dcreate2");
 
     /* Check on datatype storage status.  It should be 1 now. */
-    ret = H5F_get_sohm_mesg_count_test(file1, H5O_DTYPE_ID, &dmsg_count);
-    CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-    VERIFY(dmsg_count, 1, "H5F_get_sohm_mesg_count_test");
+    ret = H5F__get_sohm_mesg_count_test(file1, H5O_DTYPE_ID, &dmsg_count);
+    CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+    VERIFY(dmsg_count, 1, "H5F__get_sohm_mesg_count_test");
 
     dset1_tid = H5Dget_type(dataset1);
     CHECK_I(dset1_tid, "H5Dget_type");
@@ -3775,18 +3775,18 @@ test_sohm_external_dtype(void)
     CHECK_I(file2, "H5Fcreate");
 
     /* Check on datatype storage status. It should be zero now. */
-    ret = H5F_get_sohm_mesg_count_test(file2, H5O_DTYPE_ID, &dmsg_count);
-    CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-    VERIFY(dmsg_count, 0, "H5F_get_sohm_mesg_count_test");
+    ret = H5F__get_sohm_mesg_count_test(file2, H5O_DTYPE_ID, &dmsg_count);
+    CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+    VERIFY(dmsg_count, 0, "H5F__get_sohm_mesg_count_test");
 
     dataset2 = H5Dcreate2(file2, "dataset_2", dset1_tid, space, H5P_DEFAULT, H5P_DEFAULT,
         H5P_DEFAULT);
     CHECK_I(dataset2, "H5Dcreate2");
 
     /* Check on datatype storage status.  It should be 1 now. */
-    ret = H5F_get_sohm_mesg_count_test(file2, H5O_DTYPE_ID, &dmsg_count);
-    CHECK(ret, FAIL, "H5F_get_sohm_mesg_count_test");
-    VERIFY(dmsg_count, 1, "H5F_get_sohm_mesg_count_test");
+    ret = H5F__get_sohm_mesg_count_test(file2, H5O_DTYPE_ID, &dmsg_count);
+    CHECK(ret, FAIL, "H5F__get_sohm_mesg_count_test");
+    VERIFY(dmsg_count, 1, "H5F__get_sohm_mesg_count_test");
 
     ret = H5Dwrite(dataset2, s1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, orig);
     CHECK_I(ret, "H5Dwrite");