[svn-r21925] Description:

    Bring r21919-21924 from trunk to 1.8 branch: cleanup FUNC_ENTER macros,
etc.

    Also removed Subversion mergeinfo tags from a few directories and files.
These are artifacts from non-root merges using pre-1.6 Subversion clients. (This
should fix the problem of unchanged directories looking "changed" during
checkins.)

Tested on:
    Mac OSX/64 10.7.3 (amazon) w/debug & production
    (daily tested on trunk)

5 files changed, 163 insertions, 163 deletions

diff --git a/test/getname.c b/test/getname.c
index 1e50dcc..1abc04a 100644
--- a/test/getname.c
+++ b/test/getname.c
@@ -72,7 +72,7 @@ check_name(hid_t id, const char *chk_name, const char *chk_user_path)
 
     /* Get user path */
     *user_path = '\0';
-    if(H5G_user_path_test(id, user_path, &user_path_len, &user_path_hidden) < 0) TEST_ERROR
+    if(H5G__user_path_test(id, user_path, &user_path_len, &user_path_hidden) < 0) TEST_ERROR
 
     /* Check on name from H5Iget_name() */
     if(HDstrcmp(name, chk_name)) goto error;
diff --git a/test/h5test.c b/test/h5test.c
index e5e798e..7faba81 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -1173,7 +1173,7 @@ h5_verify_cached_stabs_cb(hid_t oid, const char UNUSED *name,
     const H5O_info_t *oinfo, void UNUSED *udata)
 {
     if(oinfo->type == H5O_TYPE_GROUP)
-        return(H5G_verify_cached_stabs_test(oid));
+        return(H5G__verify_cached_stabs_test(oid));
     else
         return(0);
 } /* end h5_verify_cached_stabs_cb() */
diff --git a/test/links.c b/test/links.c
index 7ea758e..5169b68 100644
--- a/test/links.c
+++ b/test/links.c
@@ -5452,7 +5452,7 @@ external_link_unlink_dense(hid_t fapl, hbool_t new_format)
     if((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Check on root group's status */
-    if(H5G_is_empty_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) != TRUE) TEST_ERROR
 
     /* Query the group creation properties */
     if((gcpl = H5Gget_create_plist(gid)) < 0) TEST_ERROR
@@ -5463,10 +5463,10 @@ external_link_unlink_dense(hid_t fapl, hbool_t new_format)
     if(H5Lcreate_external(filename2, "/dst", gid, "src", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
 
     /* Check on root group's status */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, &nmsgs) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, &nmsgs) != TRUE) TEST_ERROR
     if(nmsgs != 1) TEST_ERROR
-    if(H5G_has_stab_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_stab_test(gid) == TRUE) TEST_ERROR
 
     /* Create enough objects in the root group to change it into a "dense" group */
     for(u = 0; u < max_compact; u++) {
@@ -5476,9 +5476,9 @@ external_link_unlink_dense(hid_t fapl, hbool_t new_format)
     } /* end for */
 
     /* Check on root group's status */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, NULL) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(gid) != TRUE) TEST_ERROR
 
     /* Close group creation property list */
     if(H5Pclose(gcpl) < 0) TEST_ERROR
@@ -5518,11 +5518,11 @@ external_link_unlink_dense(hid_t fapl, hbool_t new_format)
     } /* end for */
 
     /* Check on root group's status */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, &nmsgs) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, &nmsgs) != TRUE) TEST_ERROR
     if(nmsgs != (min_dense - 1)) TEST_ERROR
-    if(H5G_is_new_dense_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_stab_test(gid) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_stab_test(gid) == TRUE) TEST_ERROR
 
     /* Close root group */
     if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
@@ -5790,7 +5790,7 @@ external_link_ride(hid_t fapl, hbool_t new_format)
     if((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Check on root group's status */
-    if(H5G_is_empty_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) != TRUE) TEST_ERROR
 
     /* Query the group creation properties */
     if((gcpl = H5Gget_create_plist(gid)) < 0) TEST_ERROR
@@ -5804,13 +5804,13 @@ external_link_ride(hid_t fapl, hbool_t new_format)
     } /* end for */
 
     /* Check on root group's status */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, NULL) == TRUE) TEST_ERROR
     if(new_format) {
-        if(H5G_is_new_dense_test(gid) != TRUE) TEST_ERROR
+        if(H5G__is_new_dense_test(gid) != TRUE) TEST_ERROR
     } /* end if */
     else {
-        if(H5G_has_stab_test(gid) != TRUE) TEST_ERROR
+        if(H5G__has_stab_test(gid) != TRUE) TEST_ERROR
     } /* end else */
 
     /* Create external link */
@@ -5818,9 +5818,9 @@ external_link_ride(hid_t fapl, hbool_t new_format)
     if(H5Lcreate_external(filename2, "/dst", gid, "src", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
 
     /* Check on root group's status */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, NULL) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(gid) != TRUE) TEST_ERROR
 
     /* Close group creation property list */
     if(H5Pclose(gcpl) < 0) TEST_ERROR
@@ -5872,11 +5872,11 @@ external_link_ride(hid_t fapl, hbool_t new_format)
     } /* end for */
 
     /* Check on root group's status */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, &nmsgs) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, &nmsgs) != TRUE) TEST_ERROR
     if(nmsgs != (min_dense - 1)) TEST_ERROR
-    if(H5G_has_stab_test(gid) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_stab_test(gid) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(gid) == TRUE) TEST_ERROR
 
     /* Close root group */
     if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
@@ -10215,7 +10215,7 @@ corder_create_empty(hid_t fapl)
     if((group_id = H5Gcreate2(file_id, CORDER_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check on group's status */
-    if(H5G_is_empty_test(group_id) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(group_id) != TRUE) TEST_ERROR
 
     /* Close the group */
     if(H5Gclose(group_id) < 0) TEST_ERROR
@@ -10234,7 +10234,7 @@ corder_create_empty(hid_t fapl)
     if((group_id = H5Gopen2(file_id, CORDER_GROUP_NAME, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Check on group's status */
-    if(H5G_is_empty_test(group_id) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(group_id) != TRUE) TEST_ERROR
 
     /* Retrieve group creation property list for group */
     if((gcpl_id = H5Gget_create_plist(group_id)) < 0) TEST_ERROR
@@ -10308,9 +10308,9 @@ corder_create_compact(hid_t fapl)
     if((group_id = H5Gcreate2(file_id, CORDER_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check on group's initial status */
-    if(H5G_is_empty_test(group_id) != TRUE) TEST_ERROR
-    if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__is_empty_test(group_id) != TRUE) TEST_ERROR
+    if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(group_id) == TRUE) TEST_ERROR
 
     /* Query the group creation properties */
     if(H5Pget_link_phase_change(gcpl_id, &max_compact, &min_dense) < 0) TEST_ERROR
@@ -10322,10 +10322,10 @@ corder_create_compact(hid_t fapl)
         if(H5Gclose(group_id2) < 0) TEST_ERROR
 
         /* Verify state of group */
-        if(H5G_has_links_test(group_id, &nlinks) != TRUE) TEST_ERROR
+        if(H5G__has_links_test(group_id, &nlinks) != TRUE) TEST_ERROR
         if(nlinks != (u + 1)) TEST_ERROR
-        if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-        if(H5G_is_new_dense_test(group_id) == TRUE) TEST_ERROR
+        if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+        if(H5G__is_new_dense_test(group_id) == TRUE) TEST_ERROR
     } /* end for */
 
     /* Close the group */
@@ -10345,10 +10345,10 @@ corder_create_compact(hid_t fapl)
     if((group_id = H5Gopen2(file_id, CORDER_GROUP_NAME, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Verify state of group */
-    if(H5G_has_links_test(group_id, &nlinks) != TRUE) TEST_ERROR
+    if(H5G__has_links_test(group_id, &nlinks) != TRUE) TEST_ERROR
     if(nlinks != max_compact) TEST_ERROR
-    if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(group_id) == TRUE) TEST_ERROR
 
     /* Loop through links, checking their creation order values */
     /* (the name index is used, but the creation order value is in the same order) */
@@ -10428,9 +10428,9 @@ corder_create_dense(hid_t fapl)
     if((group_id = H5Gcreate2(file_id, CORDER_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check on group's initial status */
-    if(H5G_is_empty_test(group_id) != TRUE) TEST_ERROR
-    if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__is_empty_test(group_id) != TRUE) TEST_ERROR
+    if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(group_id) == TRUE) TEST_ERROR
 
     /* Query the group creation properties */
     if(H5Pget_link_phase_change(gcpl_id, &max_compact, &min_dense) < 0) TEST_ERROR
@@ -10442,10 +10442,10 @@ corder_create_dense(hid_t fapl)
         if(H5Gclose(group_id2) < 0) TEST_ERROR
 
         /* Verify state of group */
-        if(H5G_has_links_test(group_id, &nlinks) != TRUE) TEST_ERROR
+        if(H5G__has_links_test(group_id, &nlinks) != TRUE) TEST_ERROR
         if(nlinks != (u + 1)) TEST_ERROR
-        if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-        if(H5G_is_new_dense_test(group_id) == TRUE) TEST_ERROR
+        if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+        if(H5G__is_new_dense_test(group_id) == TRUE) TEST_ERROR
     } /* end for */
 
     /* Create another link, to push group into dense form */
@@ -10454,12 +10454,12 @@ corder_create_dense(hid_t fapl)
     if(H5Gclose(group_id2) < 0) TEST_ERROR
 
     /* Verify state of group */
-    if(H5G_has_links_test(group_id, NULL) == TRUE) TEST_ERROR
-    if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+    if(H5G__has_links_test(group_id, NULL) == TRUE) TEST_ERROR
+    if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
     /* Retrieve & verify # of records in the name & creation order indices */
-    if(H5G_new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
+    if(H5G__new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
     if(name_count != corder_count) TEST_ERROR
 
     /* Close the group */
@@ -10479,9 +10479,9 @@ corder_create_dense(hid_t fapl)
     if((group_id = H5Gopen2(file_id, CORDER_GROUP_NAME, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Verify state of group */
-    if(H5G_has_links_test(group_id, NULL) == TRUE) TEST_ERROR
-    if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+    if(H5G__has_links_test(group_id, NULL) == TRUE) TEST_ERROR
+    if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
     /* Loop through links, checking their creation order values */
     /* (the name index is used, but the creation order value is in the same order) */
@@ -10602,12 +10602,12 @@ corder_transition(hid_t fapl)
     if(H5Gclose(group_id2) < 0) TEST_ERROR
 
     /* Verify state of group */
-    if(H5G_has_links_test(group_id, NULL) == TRUE) TEST_ERROR
-    if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+    if(H5G__has_links_test(group_id, NULL) == TRUE) TEST_ERROR
+    if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
     /* Retrieve & verify # of records in the name & creation order indices */
-    if(H5G_new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
+    if(H5G__new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
     if(name_count != corder_count) TEST_ERROR
 
     /* Delete several links from group, until it resumes compact form */
@@ -10616,12 +10616,12 @@ corder_transition(hid_t fapl)
         if(H5Ldelete(group_id, objname, H5P_DEFAULT) < 0) TEST_ERROR
 
         /* Verify state of group */
-        if(H5G_has_links_test(group_id, NULL) == TRUE) TEST_ERROR
-        if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-        if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+        if(H5G__has_links_test(group_id, NULL) == TRUE) TEST_ERROR
+        if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+        if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
         /* Retrieve & verify # of records in the name & creation order indices */
-        if(H5G_new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
+        if(H5G__new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
         if(name_count != corder_count) TEST_ERROR
     } /* end for */
 
@@ -10630,10 +10630,10 @@ corder_transition(hid_t fapl)
     if(H5Ldelete(group_id, objname, H5P_DEFAULT) < 0) TEST_ERROR
 
     /* Verify state of group */
-    if(H5G_has_links_test(group_id, &nlinks) != TRUE) TEST_ERROR
+    if(H5G__has_links_test(group_id, &nlinks) != TRUE) TEST_ERROR
     if(nlinks != (min_dense - 1)) TEST_ERROR
-    if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(group_id) == TRUE) TEST_ERROR
 
     /* Re-add links to get back into dense form */
     for(u = (min_dense - 1); u < (max_compact + 1); u++) {
@@ -10643,12 +10643,12 @@ corder_transition(hid_t fapl)
     } /* end for */
 
     /* Verify state of group */
-    if(H5G_has_links_test(group_id, NULL) == TRUE) TEST_ERROR
-    if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+    if(H5G__has_links_test(group_id, NULL) == TRUE) TEST_ERROR
+    if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
     /* Retrieve & verify # of records in the name & creation order indices */
-    if(H5G_new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
+    if(H5G__new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
     if(name_count != corder_count) TEST_ERROR
 
     /* Close the group */
@@ -10665,12 +10665,12 @@ corder_transition(hid_t fapl)
     if((group_id = H5Gopen2(file_id, CORDER_GROUP_NAME, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Verify state of group */
-    if(H5G_has_links_test(group_id, NULL) == TRUE) TEST_ERROR
-    if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+    if(H5G__has_links_test(group_id, NULL) == TRUE) TEST_ERROR
+    if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
     /* Retrieve & verify # of records in the name & creation order indices */
-    if(H5G_new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
+    if(H5G__new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
     if(name_count != corder_count) TEST_ERROR
 
     /* Delete several links from group, until it resumes compact form */
@@ -10679,12 +10679,12 @@ corder_transition(hid_t fapl)
         if(H5Ldelete(group_id, objname, H5P_DEFAULT) < 0) TEST_ERROR
 
         /* Verify state of group */
-        if(H5G_has_links_test(group_id, NULL) == TRUE) TEST_ERROR
-        if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-        if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+        if(H5G__has_links_test(group_id, NULL) == TRUE) TEST_ERROR
+        if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+        if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
         /* Retrieve & verify # of records in the name & creation order indices */
-        if(H5G_new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
+        if(H5G__new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
         if(name_count != corder_count) TEST_ERROR
     } /* end for */
 
@@ -10693,10 +10693,10 @@ corder_transition(hid_t fapl)
     if(H5Ldelete(group_id, objname, H5P_DEFAULT) < 0) TEST_ERROR
 
     /* Verify state of group */
-    if(H5G_has_links_test(group_id, &nlinks) != TRUE) TEST_ERROR
+    if(H5G__has_links_test(group_id, &nlinks) != TRUE) TEST_ERROR
     if(nlinks != (min_dense - 1)) TEST_ERROR
-    if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(group_id) == TRUE) TEST_ERROR
 
     /* Re-add links to get back into dense form */
     for(u = (min_dense - 1); u < (max_compact + 1); u++) {
@@ -10706,12 +10706,12 @@ corder_transition(hid_t fapl)
     } /* end for */
 
     /* Verify state of group */
-    if(H5G_has_links_test(group_id, NULL) == TRUE) TEST_ERROR
-    if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+    if(H5G__has_links_test(group_id, NULL) == TRUE) TEST_ERROR
+    if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
     /* Retrieve & verify # of records in the name & creation order indices */
-    if(H5G_new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
+    if(H5G__new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
     if(name_count != corder_count) TEST_ERROR
 
     /* Delete all the links */
@@ -10823,12 +10823,12 @@ corder_delete(hid_t fapl)
         } /* end for */
 
         /* Verify state of group */
-        if(H5G_has_links_test(group_id, NULL) == TRUE) TEST_ERROR
-        if(H5G_has_stab_test(group_id) == TRUE) TEST_ERROR
-        if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+        if(H5G__has_links_test(group_id, NULL) == TRUE) TEST_ERROR
+        if(H5G__has_stab_test(group_id) == TRUE) TEST_ERROR
+        if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
         /* Retrieve & verify # of records in the name & creation order indices */
-        if(H5G_new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
+        if(H5G__new_dense_info_test(group_id, &name_count, &corder_count) < 0) TEST_ERROR
         if(name_count != corder_count) TEST_ERROR
 
         /* Close the group */
@@ -11132,7 +11132,7 @@ link_info_by_idx(hid_t fapl)
             } /* end for */
 
             /* Verify state of group */
-            if(H5G_has_links_test(group_id, NULL) != TRUE) TEST_ERROR
+            if(H5G__has_links_test(group_id, NULL) != TRUE) TEST_ERROR
 
             /* Check for out of bound offset queries */
             H5E_BEGIN_TRY {
@@ -11170,7 +11170,7 @@ link_info_by_idx(hid_t fapl)
                 } /* end else */
 
                 /* Verify state of group */
-                if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+                if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
                 /* Verify link information for new link */
                 if(link_info_by_idx_check(group_id, objname, (hsize_t)u, hard_link, use_index) < 0) TEST_ERROR
@@ -11359,7 +11359,7 @@ link_info_by_idx_old(hid_t fapl)
         if(ret >= 0) TEST_ERROR
 
         /* Verify state of group */
-        if(H5G_has_stab_test(group_id) != TRUE) TEST_ERROR
+        if(H5G__has_stab_test(group_id) != TRUE) TEST_ERROR
 
         /* Close the group */
         if(H5Gclose(group_id) < 0) TEST_ERROR
@@ -11491,7 +11491,7 @@ delete_by_idx(hid_t fapl)
                 } /* end for */
 
                 /* Verify state of group (compact) */
-                if(H5G_has_links_test(group_id, NULL) != TRUE) TEST_ERROR
+                if(H5G__has_links_test(group_id, NULL) != TRUE) TEST_ERROR
 
                 /* Check for out of bound deletion */
                 H5E_BEGIN_TRY {
@@ -11528,7 +11528,7 @@ delete_by_idx(hid_t fapl)
                 if(H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT) < 0) TEST_ERROR
 
                 /* Verify state of group (empty) */
-                if(H5G_has_links_test(group_id, NULL) == TRUE) TEST_ERROR
+                if(H5G__has_links_test(group_id, NULL) == TRUE) TEST_ERROR
 
                 /* Create more links, to push group into dense form */
                 for(u = 0; u < (max_compact * 2); u++) {
@@ -11543,7 +11543,7 @@ delete_by_idx(hid_t fapl)
 
                     /* Verify state of group (dense) */
                     if(u >= max_compact)
-                        if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+                        if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
                     /* Verify link information for new link */
                     if(link_info_by_idx_check(group_id, objname, (hsize_t)u, TRUE, use_index) < 0) TEST_ERROR
@@ -11584,8 +11584,8 @@ delete_by_idx(hid_t fapl)
                 if(H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT) < 0) TEST_ERROR
 
                 /* Verify state of group (empty) */
-                if(H5G_has_links_test(group_id, NULL) == TRUE) TEST_ERROR
-                if(H5G_is_new_dense_test(group_id) == TRUE) TEST_ERROR
+                if(H5G__has_links_test(group_id, NULL) == TRUE) TEST_ERROR
+                if(H5G__is_new_dense_test(group_id) == TRUE) TEST_ERROR
 
                 /* Check for deletion on empty group again */
                 H5E_BEGIN_TRY {
@@ -11610,7 +11610,7 @@ delete_by_idx(hid_t fapl)
 
                     /* Verify state of group (dense) */
                     if(u >= max_compact)
-                        if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+                        if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
                     /* Verify link information for new link */
                     if(link_info_by_idx_check(group_id, objname, (hsize_t)u, TRUE, use_index) < 0) TEST_ERROR
@@ -11670,8 +11670,8 @@ delete_by_idx(hid_t fapl)
                 if(H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT) < 0) TEST_ERROR
 
                 /* Verify state of group (empty) */
-                if(H5G_has_links_test(group_id, NULL) == TRUE) TEST_ERROR
-                if(H5G_is_new_dense_test(group_id) == TRUE) TEST_ERROR
+                if(H5G__has_links_test(group_id, NULL) == TRUE) TEST_ERROR
+                if(H5G__is_new_dense_test(group_id) == TRUE) TEST_ERROR
 
 
 
@@ -11821,7 +11821,7 @@ delete_by_idx_old(hid_t fapl)
         if(ret >= 0) TEST_ERROR
 
         /* Verify state of group */
-        if(H5G_has_stab_test(group_id) != TRUE) TEST_ERROR
+        if(H5G__has_stab_test(group_id) != TRUE) TEST_ERROR
 
 
         /* Delete links in middle */
@@ -11903,7 +11903,7 @@ delete_by_idx_old(hid_t fapl)
         if(H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT) < 0) TEST_ERROR
 
         /* Verify state of group */
-        if(H5G_has_stab_test(group_id) != TRUE) TEST_ERROR
+        if(H5G__has_stab_test(group_id) != TRUE) TEST_ERROR
 
         /* Close the group */
         if(H5Gclose(group_id) < 0) TEST_ERROR
@@ -12330,7 +12330,7 @@ link_iterate(hid_t fapl)
                 } /* end for */
 
                 /* Verify state of group (compact) */
-                if(H5G_has_links_test(group_id, NULL) != TRUE) TEST_ERROR
+                if(H5G__has_links_test(group_id, NULL) != TRUE) TEST_ERROR
 
                 /* Check for out of bound iteration on compact group */
                 skip = (hsize_t)u;
@@ -12356,7 +12356,7 @@ link_iterate(hid_t fapl)
                 } /* end for */
 
                 /* Verify state of group (dense) */
-                if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+                if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
                 /* Check for out of bound iteration on dense group */
                 skip = (hsize_t)u;
@@ -12743,7 +12743,7 @@ link_iterate_old(hid_t fapl)
         } /* end for */
 
         /* Verify state of group (symbol table) */
-        if(H5G_has_stab_test(group_id) != TRUE) TEST_ERROR
+        if(H5G__has_stab_test(group_id) != TRUE) TEST_ERROR
 
         /* Check for out of bound iteration on old-style group */
         skip = (hsize_t)u;
@@ -13034,7 +13034,7 @@ open_by_idx(hid_t fapl)
                 } /* end for */
 
                 /* Verify state of group (compact) */
-                if(H5G_has_links_test(group_id, NULL) != TRUE) TEST_ERROR
+                if(H5G__has_links_test(group_id, NULL) != TRUE) TEST_ERROR
 
                 /* Check for out of bound open by index on compact group */
                 H5E_BEGIN_TRY {
@@ -13069,7 +13069,7 @@ open_by_idx(hid_t fapl)
                 } /* end for */
 
                 /* Verify state of group (dense) */
-                if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+                if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
                 /* Check for out of bound open by index on compact group */
                 H5E_BEGIN_TRY {
@@ -13211,7 +13211,7 @@ open_by_idx_old(hid_t fapl)
         } /* end for */
 
         /* Verify state of group (symbol table) */
-        if(H5G_has_stab_test(group_id) != TRUE) TEST_ERROR
+        if(H5G__has_stab_test(group_id) != TRUE) TEST_ERROR
 
         /* Check for out of bound open by index */
         H5E_BEGIN_TRY {
@@ -13482,7 +13482,7 @@ object_info(hid_t fapl)
                 } /* end for */
 
                 /* Verify state of group (compact) */
-                if(H5G_has_links_test(group_id, NULL) != TRUE) TEST_ERROR
+                if(H5G__has_links_test(group_id, NULL) != TRUE) TEST_ERROR
 
                 /* Check for out of bound query by index */
                 H5E_BEGIN_TRY {
@@ -13530,7 +13530,7 @@ object_info(hid_t fapl)
                 } /* end for */
 
                 /* Verify state of group (dense) */
-                if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+                if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
                 /* Check for out of bound query by index */
                 H5E_BEGIN_TRY {
@@ -13679,7 +13679,7 @@ object_info_old(hid_t fapl)
         } /* end for */
 
         /* Verify state of group (symbol table) */
-        if(H5G_has_stab_test(group_id) != TRUE) TEST_ERROR
+        if(H5G__has_stab_test(group_id) != TRUE) TEST_ERROR
 
         /* Check for out of bound query by index */
         H5E_BEGIN_TRY {
@@ -13967,7 +13967,7 @@ group_info(hid_t fapl)
                 } /* end for */
 
                 /* Verify state of group (compact) */
-                if(H5G_has_links_test(group_id, NULL) != TRUE) TEST_ERROR
+                if(H5G__has_links_test(group_id, NULL) != TRUE) TEST_ERROR
 
                 /* Check for out of bound query by index */
                 H5E_BEGIN_TRY {
@@ -14108,7 +14108,7 @@ group_info(hid_t fapl)
                 } /* end for */
 
                 /* Verify state of group (dense) */
-                if(H5G_is_new_dense_test(group_id) != TRUE) TEST_ERROR
+                if(H5G__is_new_dense_test(group_id) != TRUE) TEST_ERROR
 
                 /* Check for out of bound query by index */
                 H5E_BEGIN_TRY {
@@ -14338,7 +14338,7 @@ group_info_old(hid_t fapl)
         } /* end for */
 
         /* Verify state of group (old-style) */
-        if(H5G_has_stab_test(group_id) != TRUE) TEST_ERROR
+        if(H5G__has_stab_test(group_id) != TRUE) TEST_ERROR
 
         /* Check for out of bound query by index */
         H5E_BEGIN_TRY {
diff --git a/test/stab.c b/test/stab.c
index b460d90..a42ee5e 100644
--- a/test/stab.c
+++ b/test/stab.c
@@ -277,14 +277,14 @@ test_large(hid_t fapl, hbool_t new_format)
      */
     if((cwg = H5Gcreate2(fid, "/big", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
     if(new_format)
-        if(H5G_has_stab_test(cwg) != FALSE) TEST_ERROR
+        if(H5G__has_stab_test(cwg) != FALSE) TEST_ERROR
     for(i = 0; i < LARGE_NOBJS; i++) {
         sprintf(name, "%05d%05d", (HDrandom() % 100000), i);
 	if((dir = H5Gcreate2(cwg, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
         if(H5Gclose(dir) < 0) TEST_ERROR
     }
     if(new_format)
-        if(H5G_is_new_dense_test(cwg) != TRUE) TEST_ERROR
+        if(H5G__is_new_dense_test(cwg) != TRUE) TEST_ERROR
     if(H5Gclose(cwg) < 0) TEST_ERROR
 
     /* Close file */
@@ -386,21 +386,21 @@ lifecycle(hid_t fapl2)
     if(est_name_len != LIFECYCLE_EST_NAME_LEN) TEST_ERROR
 
     /* Use internal testing routine to check that the group has no links or symbol table */
-    if(H5G_is_empty_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) != TRUE) TEST_ERROR
 
     /* Create first "bottom" group */
     sprintf(objname, LIFECYCLE_BOTTOM_GROUP, (unsigned)0);
     if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check on bottom group's status */
-    if(H5G_is_empty_test(gid2) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid2) != TRUE) TEST_ERROR
 
     /* Close bottom group */
     if(H5Gclose(gid2) < 0) TEST_ERROR
 
     /* Check on top group's status */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, &nmsgs) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, &nmsgs) != TRUE) TEST_ERROR
     if(nmsgs != 1) TEST_ERROR
 
     /* Create several more bottom groups, to push the top group almost to a symbol table */
@@ -410,17 +410,17 @@ lifecycle(hid_t fapl2)
         if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
         /* Check on bottom group's status */
-        if(H5G_is_empty_test(gid2) != TRUE) TEST_ERROR
+        if(H5G__is_empty_test(gid2) != TRUE) TEST_ERROR
 
         /* Close bottom group */
         if(H5Gclose(gid2) < 0) TEST_ERROR
     } /* end for */
 
     /* Check on top group's status */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, &nmsgs) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, &nmsgs) != TRUE) TEST_ERROR
     if(nmsgs != LIFECYCLE_MAX_COMPACT) TEST_ERROR
-    if(H5G_is_new_dense_test(gid) != FALSE) TEST_ERROR
+    if(H5G__is_new_dense_test(gid) != FALSE) TEST_ERROR
 
     /* Check that the object header is only one chunk and the space has been allocated correctly */
     if(H5Oget_info(gid, &oinfo) < 0) TEST_ERROR
@@ -434,15 +434,15 @@ lifecycle(hid_t fapl2)
     if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check on bottom group's status */
-    if(H5G_is_empty_test(gid2) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid2) != TRUE) TEST_ERROR
 
     /* Close bottom group */
     if(H5Gclose(gid2) < 0) TEST_ERROR
 
     /* Check on top group's status */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, NULL) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(gid) != TRUE) TEST_ERROR
 
     /* Check that the object header is still one chunk and the space has been allocated correctly */
     if(H5Oget_info(gid, &oinfo) < 0) TEST_ERROR
@@ -461,9 +461,9 @@ lifecycle(hid_t fapl2)
     } /* end while */
 
     /* Check on top group's status */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, NULL) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(gid) != TRUE) TEST_ERROR
 
     /* Unlink one more object from the group, which should transform back to using links */
     sprintf(objname, LIFECYCLE_BOTTOM_GROUP, u);
@@ -471,8 +471,8 @@ lifecycle(hid_t fapl2)
     u--;
 
     /* Check on top group's status */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, &nmsgs) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, &nmsgs) != TRUE) TEST_ERROR
     if(nmsgs != (LIFECYCLE_MIN_DENSE - 1)) TEST_ERROR
 
     /* Unlink last two objects from top group */
@@ -483,7 +483,7 @@ lifecycle(hid_t fapl2)
     if(H5Ldelete(gid, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Check on top group's status */
-    if(H5G_is_empty_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) != TRUE) TEST_ERROR
 
     /* Close top group */
     if(H5Gclose(gid) < 0) TEST_ERROR
@@ -568,47 +568,47 @@ long_compact(hid_t fapl2)
     if((gid = H5Gcreate2(fid, "top", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Use internal testing routine to check that the group has no links or dense storage */
-    if(H5G_is_empty_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) != TRUE) TEST_ERROR
 
     /* Create first group with "long" name */
     if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check on bottom group's status */
-    if(H5G_is_empty_test(gid2) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid2) != TRUE) TEST_ERROR
 
     /* Close bottom group */
     if(H5Gclose(gid2) < 0) TEST_ERROR
 
     /* Check on top group's status */
     /* (Should have dense storage to hold links, since name is too long for object header message) */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, NULL) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(gid) != TRUE) TEST_ERROR
 
     /* Create second group with "long" name */
     objname[0] = 'b';
     if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check on bottom group's status */
-    if(H5G_is_empty_test(gid2) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid2) != TRUE) TEST_ERROR
 
     /* Close bottom group */
     if(H5Gclose(gid2) < 0) TEST_ERROR
 
     /* Check on top group's status */
     /* (Should have dense storage to hold links, since name is too long for object header message) */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, NULL) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(gid) != TRUE) TEST_ERROR
 
     /* Unlink second object from top group */
     if(H5Ldelete(gid, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Check on top group's status */
     /* (Should still be dense storage to hold links, since name is too long for object header message) */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, NULL) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(gid) != TRUE) TEST_ERROR
 
     /* Unlink first object from top group */
     objname[0] = 'a';
@@ -616,7 +616,7 @@ long_compact(hid_t fapl2)
 
     /* Check on top group's status */
     /* (Should have deleted the dense storage now) */
-    if(H5G_is_empty_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) != TRUE) TEST_ERROR
 
     /* Free object name */
     HDfree(objname);
@@ -684,9 +684,9 @@ read_old(void)
     if((gid = H5Gopen2(fid, "old", H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check on old group's status */
-    if(H5G_is_empty_test(gid) == FALSE) TEST_ERROR
-    if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR
-    if(H5G_has_stab_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == FALSE) TEST_ERROR
+    if(H5G__has_links_test(gid, NULL) == TRUE) TEST_ERROR
+    if(H5G__has_stab_test(gid) != TRUE) TEST_ERROR
 
     /* Create a bunch of objects in the group */
     for(u = 0; u < READ_OLD_NGROUPS; u++) {
@@ -694,7 +694,7 @@ read_old(void)
         if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
         /* Check on bottom group's status */
-        if(H5G_is_empty_test(gid2) != TRUE) TEST_ERROR
+        if(H5G__is_empty_test(gid2) != TRUE) TEST_ERROR
 
         /* Close bottom group */
         if(H5Gclose(gid2) < 0) TEST_ERROR
@@ -702,9 +702,9 @@ read_old(void)
 
     /* Check on old group's status */
     /* (Should stay in old "symbol table" form) */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR
-    if(H5G_has_stab_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, NULL) == TRUE) TEST_ERROR
+    if(H5G__has_stab_test(gid) != TRUE) TEST_ERROR
 
     /* Delete new objects from old group */
     for(u = 0; u < READ_OLD_NGROUPS; u++) {
@@ -714,9 +714,9 @@ read_old(void)
 
     /* Check on old group's status */
     /* (Should stay in old "symbol table" form, but have no links) */
-    if(H5G_is_empty_test(gid) == FALSE) TEST_ERROR
-    if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR
-    if(H5G_has_stab_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == FALSE) TEST_ERROR
+    if(H5G__has_links_test(gid, NULL) == TRUE) TEST_ERROR
+    if(H5G__has_stab_test(gid) != TRUE) TEST_ERROR
 
     /* Close old group */
     if(H5Gclose(gid) < 0) TEST_ERROR
@@ -798,29 +798,29 @@ no_compact(hid_t fapl2)
     if(H5Pclose(gcpl) < 0) TEST_ERROR
 
     /* Use internal testing routine to check that the group has no links or dense storage */
-    if(H5G_is_empty_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) != TRUE) TEST_ERROR
 
     /* Create first "bottom" group */
     sprintf(objname, NO_COMPACT_BOTTOM_GROUP, (unsigned)0);
     if((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
 
     /* Check on bottom group's status */
-    if(H5G_is_empty_test(gid2) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid2) != TRUE) TEST_ERROR
 
     /* Close bottom group */
     if(H5Gclose(gid2) < 0) TEST_ERROR
 
     /* Check on top group's status */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, NULL) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(gid) != TRUE) TEST_ERROR
 
     /* Unlink object from top group */
     sprintf(objname, NO_COMPACT_BOTTOM_GROUP, (unsigned)0);
     if(H5Ldelete(gid, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Check on top group's status */
-    if(H5G_is_empty_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) != TRUE) TEST_ERROR
 
     /* Close top group */
     if(H5Gclose(gid) < 0) TEST_ERROR
diff --git a/test/unlink.c b/test/unlink.c
index 604b014..993a7ec 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -2221,9 +2221,9 @@ test_full_group_compact(hid_t fapl)
     } /* end for */
 
     /* Check on group's status */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, NULL) != TRUE) TEST_ERROR
-    if(H5G_has_stab_test(gid) == TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, NULL) != TRUE) TEST_ERROR
+    if(H5G__has_stab_test(gid) == TRUE) TEST_ERROR
 
     /* Close group with objects to delete */
     if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
@@ -2367,9 +2367,9 @@ test_full_group_dense(hid_t fapl)
     } /* end for */
 
     /* Check on group's status */
-    if(H5G_is_empty_test(gid) == TRUE) TEST_ERROR
-    if(H5G_has_links_test(gid, NULL) == TRUE) TEST_ERROR
-    if(H5G_is_new_dense_test(gid) != TRUE) TEST_ERROR
+    if(H5G__is_empty_test(gid) == TRUE) TEST_ERROR
+    if(H5G__has_links_test(gid, NULL) == TRUE) TEST_ERROR
+    if(H5G__is_new_dense_test(gid) != TRUE) TEST_ERROR
 
     /* Close group with objects to delete */
     if(H5Gclose(gid) < 0) FAIL_STACK_ERROR