[svn-r641] Changed function names for beta release.

12 files changed, 509 insertions, 511 deletions

diff --git a/src/.distdep b/src/.distdep
index e37772b..ecdf739 100644
--- a/src/.distdep
+++ b/src/.distdep
@@ -1,3 +1,172 @@
+H5.o: \
+   H5.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5ACprivate.h \
+   H5ACpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Ipublic.h \
+   H5Dpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Iprivate.h \
+   H5MMprivate.h \
+   H5MMpublic.h \
+   H5Pprivate.h \
+   H5Ppublic.h \
+   H5Zpublic.h \
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h
+H5A.o: \
+   H5A.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Iprivate.h \
+   H5Ipublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Dpublic.h \
+   H5Dprivate.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h \
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Zprivate.h \
+   H5Zpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h \
+   H5Pprivate.h \
+   H5Ppublic.h \
+   H5Apkg.h \
+   H5Aprivate.h
+H5AC.o: \
+   H5AC.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5ACprivate.h \
+   H5ACpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Ipublic.h \
+   H5Dpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h
+H5B.o: \
+   H5B.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5ACprivate.h \
+   H5ACpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Ipublic.h \
+   H5Dpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Fmpioprivate.h \
+   H5MFprivate.h \
+   H5MFpublic.h
+H5D.o: \
+   H5D.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Iprivate.h \
+   H5Ipublic.h \
+   H5ACprivate.h \
+   H5ACpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Dpublic.h \
+   H5Dprivate.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h \
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Zprivate.h \
+   H5Zpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5HLprivate.h \
+   H5HLpublic.h \
+   H5MFprivate.h \
+   H5MFpublic.h
+H5E.o: \
+   H5E.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Iprivate.h \
+   H5Ipublic.h \
+   H5Eprivate.h
+H5F.o: \
+   H5F.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Aprivate.h \
+   H5Apublic.h \
+   H5Ipublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Dpublic.h \
+   H5Dprivate.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h \
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Zprivate.h \
+   H5Zpublic.h \
+   H5Iprivate.h \
+   H5ACprivate.h \
+   H5ACpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h
 H5Farray.o: \
    H5Farray.c \
    H5private.h \
@@ -34,6 +203,83 @@ H5Fcore.o: \
    H5Eprivate.h \
    H5Epublic.h \
    H5Ipublic.h
+H5Ffamily.o: \
+   H5Ffamily.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Ipublic.h
+H5Fistore.o: \
+   H5Fistore.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Dprivate.h \
+   H5Dpublic.h \
+   H5Ipublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h \
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Zprivate.h \
+   H5Zpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5MFprivate.h \
+   H5MFpublic.h
+H5Flow.o: \
+   H5Flow.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Ipublic.h \
+   H5Fmpioprivate.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Dpublic.h \
+   H5MMprivate.h
+H5Fmpio.o: \
+   H5Fmpio.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Ipublic.h \
+   H5Dprivate.h \
+   H5Dpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h \
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Zprivate.h \
+   H5Zpublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h
 H5Fsec2.o: \
    H5Fsec2.c \
    H5private.h \
@@ -73,6 +319,39 @@ H5Fstdio.o: \
    H5Dpublic.h \
    H5MMprivate.h \
    H5MMpublic.h
+H5G.o: \
+   H5G.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Aprivate.h \
+   H5Apublic.h \
+   H5Ipublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Dpublic.h \
+   H5Dprivate.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h \
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Zprivate.h \
+   H5Zpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Gpkg.h \
+   H5ACprivate.h \
+   H5ACpublic.h \
+   H5HLprivate.h \
+   H5HLpublic.h
 H5Gent.o: \
    H5Gent.c \
    H5private.h \
@@ -91,6 +370,39 @@ H5Gent.o: \
    H5Gpublic.h \
    H5Bprivate.h \
    H5Bpublic.h
+H5Gnode.o: \
+   H5Gnode.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5ACprivate.h \
+   H5ACpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Ipublic.h \
+   H5Dpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Fmpioprivate.h \
+   H5Gpkg.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5HLprivate.h \
+   H5HLpublic.h \
+   H5MFprivate.h \
+   H5MFpublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h \
+   H5Sprivate.h \
+   H5Spublic.h
 H5Gstab.o: \
    H5Gstab.c \
    H5private.h \
@@ -138,6 +450,23 @@ H5HG.o: \
    H5MFprivate.h \
    H5MFpublic.h \
    H5MMprivate.h
+H5HL.o: \
+   H5HL.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5ACprivate.h \
+   H5ACpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Ipublic.h \
+   H5Dpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Fmpioprivate.h \
+   H5HLprivate.h \
+   H5HLpublic.h \
+   H5MFprivate.h
 H5I.o: \
    H5I.c \
    H5private.h \
@@ -146,6 +475,14 @@ H5I.o: \
    H5Iprivate.h \
    H5Ipublic.h \
    H5Eprivate.h
+H5MF.o: \
+   H5MF.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Ipublic.h
 H5MM.o: \
    H5MM.c \
    H5private.h \
@@ -154,6 +491,33 @@ H5MM.o: \
    H5Eprivate.h \
    H5Epublic.h \
    H5Ipublic.h
+H5O.o: \
+   H5O.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5ACprivate.h \
+   H5ACpublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Ipublic.h \
+   H5Dpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Fmpioprivate.h \
+   H5MFprivate.h \
+   H5MFpublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h
 H5Oattr.o: \
    H5Oattr.c \
    H5private.h \
@@ -302,6 +666,29 @@ H5Olayout.o: \
    H5Sprivate.h \
    H5Spublic.h \
    H5Zprivate.h
+H5Omtime.o: \
+   H5Omtime.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Ipublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Dpublic.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
+   H5Bprivate.h \
+   H5Bpublic.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h
 H5Oname.o: \
    H5Oname.c \
    H5private.h \
@@ -412,117 +799,71 @@ H5Ostab.o: \
    H5HGpublic.h \
    H5Tprivate.h \
    H5Tpublic.h
-H5Sall.o: \
-   H5Sall.c \
+H5P.o: \
+   H5P.c \
    H5private.h \
    H5public.h \
    H5config.h \
-   H5Eprivate.h \
-   H5Epublic.h \
+   H5Iprivate.h \
    H5Ipublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
    H5Bprivate.h \
    H5Bpublic.h \
    H5Fprivate.h \
    H5Fpublic.h \
    H5Dpublic.h \
+   H5Dprivate.h \
+   H5Gprivate.h \
+   H5Gpublic.h \
    H5Oprivate.h \
    H5Opublic.h \
    H5HGprivate.h \
    H5HGpublic.h \
    H5Tprivate.h \
-   H5Tpublic.h
-H5Tbit.o: \
-   H5Tbit.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
+   H5Tpublic.h \
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Zprivate.h \
+   H5Zpublic.h \
    H5Eprivate.h \
    H5Epublic.h \
+   H5MMprivate.h
+H5R.o: \
+   H5R.c \
+   H5Rprivate.h \
+   H5Rpublic.h \
    H5Ipublic.h \
-   H5Iprivate.h \
-   H5Tpkg.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Gprivate.h
-H5Tinit.o: \
-   H5Tinit.c \
-   H5private.h \
    H5public.h \
    H5config.h \
-   H5Iprivate.h \
-   H5Ipublic.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Tpkg.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
+   H5Dprivate.h \
    H5Dpublic.h \
-   H5Tprivate.h
-H5V.o: \
-   H5V.c \
    H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
    H5Fprivate.h \
    H5Fpublic.h \
-   H5Dpublic.h \
    H5Gprivate.h \
    H5Gpublic.h \
    H5Bprivate.h \
    H5Bpublic.h \
+   H5Oprivate.h \
+   H5Opublic.h \
    H5HGprivate.h \
    H5HGpublic.h \
    H5Tprivate.h \
    H5Tpublic.h \
    H5Sprivate.h \
-   H5Spublic.h
-H5AC.o: \
-   H5AC.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5ACprivate.h \
-   H5ACpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Ipublic.h \
-   H5Dpublic.h \
+   H5Spublic.h \
+   H5Zprivate.h \
+   H5Zpublic.h \
    H5Eprivate.h \
    H5Epublic.h
-H5Ffamily.o: \
-   H5Ffamily.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h
-H5Omtime.o: \
-   H5Omtime.c \
+H5S.o: \
+   H5S.c \
    H5private.h \
    H5public.h \
    H5config.h \
+   H5Iprivate.h \
+   H5Ipublic.h \
    H5Eprivate.h \
    H5Epublic.h \
-   H5Ipublic.h \
    H5MMprivate.h \
    H5MMpublic.h \
    H5Oprivate.h \
@@ -536,54 +877,9 @@ H5Omtime.o: \
    H5Bpublic.h \
    H5HGprivate.h \
    H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h
-H5Fistore.o: \
-   H5Fistore.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Dprivate.h \
-   H5Dpublic.h \
-   H5Ipublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5MFprivate.h \
-   H5MFpublic.h
-H5E.o: \
-   H5E.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Iprivate.h \
-   H5Ipublic.h \
-   H5Eprivate.h
-H5MF.o: \
-   H5MF.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h
-H5Shyper.o: \
-   H5Shyper.c \
+   H5Tprivate.h
+H5Sall.o: \
+   H5Sall.c \
    H5private.h \
    H5public.h \
    H5config.h \
@@ -605,123 +901,29 @@ H5Shyper.o: \
    H5HGpublic.h \
    H5Tprivate.h \
    H5Tpublic.h
-H5Tconv.o: \
-   H5Tconv.c \
-   H5Iprivate.h \
-   H5Ipublic.h \
-   H5public.h \
-   H5config.h \
-   H5private.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Tpkg.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h
-H5Z.o: \
-   H5Z.c \
+H5Shyper.o: \
+   H5Shyper.c \
    H5private.h \
    H5public.h \
    H5config.h \
    H5Eprivate.h \
    H5Epublic.h \
    H5Ipublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h
-H5.o: \
-   H5.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5ACprivate.h \
-   H5ACpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Ipublic.h \
-   H5Dpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Iprivate.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Pprivate.h \
-   H5Ppublic.h \
-   H5Zpublic.h \
    H5Sprivate.h \
    H5Spublic.h \
    H5Gprivate.h \
    H5Gpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h
-H5P.o: \
-   H5P.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Iprivate.h \
-   H5Ipublic.h \
    H5Bprivate.h \
    H5Bpublic.h \
    H5Fprivate.h \
    H5Fpublic.h \
    H5Dpublic.h \
-   H5Dprivate.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
    H5Oprivate.h \
    H5Opublic.h \
    H5HGprivate.h \
    H5HGpublic.h \
    H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5MMprivate.h
-H5TB.o: \
-   H5TB.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Iprivate.h \
-   H5Ipublic.h \
-   H5Eprivate.h
+   H5Tpublic.h
 H5Smpio.o: \
    H5Smpio.c \
    H5private.h \
@@ -796,49 +998,14 @@ H5Sselect.o: \
    H5Tpublic.h \
    H5Zprivate.h \
    H5Zpublic.h
-H5G.o: \
-   H5G.c \
+H5T.o: \
+   H5T.c \
    H5private.h \
    H5public.h \
    H5config.h \
-   H5Aprivate.h \
-   H5Apublic.h \
-   H5Ipublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Dprivate.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Gpkg.h \
-   H5ACprivate.h \
-   H5ACpublic.h \
-   H5HLprivate.h \
-   H5HLpublic.h
-H5R.o: \
-   H5R.c \
-   H5Rprivate.h \
-   H5Rpublic.h \
-   H5Ipublic.h \
-   H5public.h \
-   H5config.h \
    H5Dprivate.h \
    H5Dpublic.h \
-   H5private.h \
+   H5Ipublic.h \
    H5Fprivate.h \
    H5Fpublic.h \
    H5Gprivate.h \
@@ -855,236 +1022,90 @@ H5R.o: \
    H5Spublic.h \
    H5Zprivate.h \
    H5Zpublic.h \
-   H5Eprivate.h \
-   H5Epublic.h
-H5A.o: \
-   H5A.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
    H5Iprivate.h \
-   H5Ipublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Dprivate.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
    H5Eprivate.h \
    H5Epublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Pprivate.h \
-   H5Ppublic.h \
-   H5Apkg.h \
-   H5Aprivate.h
-H5B.o: \
-   H5B.c \
+   H5MMprivate.h
+H5Tbit.o: \
+   H5Tbit.c \
    H5private.h \
    H5public.h \
    H5config.h \
-   H5ACprivate.h \
-   H5ACpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Ipublic.h \
-   H5Dpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
    H5Eprivate.h \
    H5Epublic.h \
-   H5MFprivate.h \
-   H5MFpublic.h \
-   H5MMprivate.h
-H5D.o: \
-   H5D.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Iprivate.h \
    H5Ipublic.h \
-   H5ACprivate.h \
-   H5ACpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Dprivate.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
+   H5Iprivate.h \
+   H5Tpkg.h \
    H5HGprivate.h \
    H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5HLprivate.h \
-   H5HLpublic.h \
-   H5MFprivate.h \
-   H5MFpublic.h
-H5F.o: \
-   H5F.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Aprivate.h \
-   H5Apublic.h \
-   H5Ipublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
    H5Fprivate.h \
    H5Fpublic.h \
    H5Dpublic.h \
-   H5Dprivate.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
    H5Tprivate.h \
    H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
+   H5Gprivate.h
+H5Tconv.o: \
+   H5Tconv.c \
    H5Iprivate.h \
-   H5ACprivate.h \
-   H5ACpublic.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h
-H5Flow.o: \
-   H5Flow.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Eprivate.h \
-   H5Epublic.h \
    H5Ipublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h
-H5Fmpio.o: \
-   H5Fmpio.c \
-   H5private.h \
    H5public.h \
    H5config.h \
+   H5private.h \
    H5Eprivate.h \
    H5Epublic.h \
-   H5Ipublic.h \
-   H5Dprivate.h \
-   H5Dpublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h \
+   H5Tpkg.h \
+   H5HGprivate.h \
+   H5HGpublic.h \
    H5Fprivate.h \
    H5Fpublic.h \
+   H5Dpublic.h \
+   H5Tprivate.h \
+   H5Tpublic.h \
    H5Gprivate.h \
    H5Gpublic.h \
    H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h
-H5Gnode.o: \
-   H5Gnode.c \
+   H5Bpublic.h
+H5Tinit.o: \
+   H5Tinit.c \
    H5private.h \
    H5public.h \
    H5config.h \
-   H5ACprivate.h \
-   H5ACpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
+   H5Iprivate.h \
    H5Ipublic.h \
-   H5Dpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
    H5Eprivate.h \
    H5Epublic.h \
-   H5Gpkg.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5HLprivate.h \
-   H5HLpublic.h \
-   H5MFprivate.h \
-   H5MFpublic.h \
    H5MMprivate.h \
    H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
+   H5Tpkg.h \
    H5HGprivate.h \
    H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h
-H5HL.o: \
-   H5HL.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5ACprivate.h \
-   H5ACpublic.h \
    H5Fprivate.h \
    H5Fpublic.h \
-   H5Ipublic.h \
    H5Dpublic.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5HLprivate.h \
-   H5HLpublic.h \
-   H5MFprivate.h \
-   H5MFpublic.h \
-   H5MMprivate.h
-H5O.o: \
-   H5O.c \
+   H5Tprivate.h
+H5TB.o: \
+   H5TB.c \
    H5private.h \
    H5public.h \
    H5config.h \
-   H5ACprivate.h \
-   H5ACpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
+   H5Iprivate.h \
    H5Ipublic.h \
-   H5Dpublic.h \
+   H5Eprivate.h
+H5V.o: \
+   H5V.c \
+   H5private.h \
+   H5public.h \
+   H5config.h \
    H5Eprivate.h \
    H5Epublic.h \
-   H5MFprivate.h \
-   H5MFpublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
+   H5Ipublic.h \
    H5Oprivate.h \
    H5Opublic.h \
+   H5Fprivate.h \
+   H5Fpublic.h \
+   H5Dpublic.h \
    H5Gprivate.h \
    H5Gpublic.h \
    H5Bprivate.h \
@@ -1093,16 +1114,16 @@ H5O.o: \
    H5HGpublic.h \
    H5Tprivate.h \
    H5Tpublic.h \
-   H5Sprivate.h
-H5S.o: \
-   H5S.c \
+   H5Sprivate.h \
+   H5Spublic.h
+H5Z.o: \
+   H5Z.c \
    H5private.h \
    H5public.h \
    H5config.h \
-   H5Iprivate.h \
-   H5Ipublic.h \
    H5Eprivate.h \
    H5Epublic.h \
+   H5Ipublic.h \
    H5MMprivate.h \
    H5MMpublic.h \
    H5Oprivate.h \
@@ -1116,32 +1137,9 @@ H5S.o: \
    H5Bpublic.h \
    H5HGprivate.h \
    H5HGpublic.h \
-   H5Tprivate.h
-H5T.o: \
-   H5T.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5Dprivate.h \
-   H5Dpublic.h \
-   H5Ipublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
    H5Tprivate.h \
    H5Tpublic.h \
    H5Sprivate.h \
    H5Spublic.h \
    H5Zprivate.h \
-   H5Zpublic.h \
-   H5Iprivate.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5MMprivate.h
+   H5Zpublic.h
diff --git a/src/H5.c b/src/H5.c
index 0db7f28..959ec19 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -24,7 +24,7 @@ static char             RcsId[] = "@(#)$Revision$";
 
    EXPORTED ROUTINES
    H5dont_atexit    -- Indicate that an 'atexit' routine is _not_ to be installed
-   H5version        -- Check the version of the library
+   H5get_libversion        -- Check the version of the library
 
    LIBRARY-SCOPED ROUTINES
    H5_init_library      -- initialize the HDF5 library
@@ -402,7 +402,7 @@ H5_debug_mask(const char *s)
     
 
 /*-------------------------------------------------------------------------
- * Function:	H5version
+ * Function:	H5get_libversion
  *
  * Purpose:	Returns the library version numbers through arguments. MAJNUM
  *		will be the major revision number of the library, MINNUM the
@@ -427,11 +427,11 @@ H5_debug_mask(const char *s)
  *-------------------------------------------------------------------------
  */
 herr_t 
-H5version(unsigned *majnum, unsigned *minnum, unsigned *relnum)
+H5get_libversion(unsigned *majnum, unsigned *minnum, unsigned *relnum)
 {
     herr_t                  ret_value = SUCCEED;
 
-    FUNC_ENTER(H5version, FAIL);
+    FUNC_ENTER(H5get_libversion, FAIL);
 
     /* Set the version information */
     if (majnum) *majnum = H5_VERS_MAJOR;
@@ -443,7 +443,7 @@ H5version(unsigned *majnum, unsigned *minnum, unsigned *relnum)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5vers_check
+ * Function:	H5check_version
  *
  * Purpose:	Verifies that the arguments match the version numbers
  *		compiled into the library.  This function is intended to be
@@ -463,7 +463,7 @@ H5version(unsigned *majnum, unsigned *minnum, unsigned *relnum)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5vers_check (unsigned majnum, unsigned minnum, unsigned relnum)
+H5check_version (unsigned majnum, unsigned minnum, unsigned relnum)
 {
     /* Don't initialize the library quite yet */
     
diff --git a/src/H5A.c b/src/H5A.c
index 268258a..01cec37 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -1040,11 +1040,11 @@ H5Aget_name(hid_t attr_id, size_t buf_size, char *buf)
 
 /*--------------------------------------------------------------------------
  NAME
-    H5Anum_attrs
+    H5Aget_num_attrs
  PURPOSE
     Determines the number of attributes attached to an object
  USAGE
-    int H5Anum_attrs (loc_id)
+    int H5Aget_num_attrs (loc_id)
         hid_t loc_id;       IN: Object (dataset or group) to be queried
  RETURNS
     Number of attributes on success, negative on failure
@@ -1060,13 +1060,13 @@ H5Aget_name(hid_t attr_id, size_t buf_size, char *buf)
  *	The LOC_ID can also be a named (committed) data type.
 --------------------------------------------------------------------------*/
 int
-H5Anum_attrs(hid_t loc_id)
+H5Aget_num_attrs(hid_t loc_id)
 {
     H5G_entry_t    	*ent = NULL;	/*symtab ent of object to attribute */
     void           	*obj = NULL;
     int			ret_value = 0;
 
-    FUNC_ENTER(H5Anum_attrs, FAIL);
+    FUNC_ENTER(H5Aget_num_attrs, FAIL);
     H5TRACE1("Is","i",loc_id);
 
     /* check arguments */
@@ -1100,7 +1100,7 @@ H5Anum_attrs(hid_t loc_id)
     ret_value=H5O_count(ent, H5O_ATTR);
 
     FUNC_LEAVE(ret_value);
-} /* H5Anum_attrs() */
+} /* H5Aget_num_attrs() */
 
 
 /*--------------------------------------------------------------------------
diff --git a/src/H5Apublic.h b/src/H5Apublic.h
index b3b556f..f40d17e 100644
--- a/src/H5Apublic.h
+++ b/src/H5Apublic.h
@@ -37,7 +37,7 @@ herr_t H5Aclose(hid_t attr_id);
 hid_t H5Aget_space(hid_t attr_id);
 hid_t H5Aget_type(hid_t attr_id);
 size_t H5Aget_name(hid_t attr_id, size_t buf_size, char *buf);
-int H5Anum_attrs(hid_t loc_id);
+int H5Aget_num_attrs(hid_t loc_id);
 int H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op,
 	       void *op_data);
 herr_t H5Adelete(hid_t loc_id, const char *name);
diff --git a/src/H5Epublic.h b/src/H5Epublic.h
index 43db4b3..f930f98 100644
--- a/src/H5Epublic.h
+++ b/src/H5Epublic.h
@@ -25,7 +25,7 @@
 /*
  * One often needs to temporarily disable automatic error reporting when
  * trying something that's likely or expected to fail.  For instance, to
- * determine if an object exists one can call H5Gstat() which will fail if
+ * determine if an object exists one can call H5Gget_stat() which will fail if
  * the object doesn't exist.  The code to try can be nested between calls to
  * H5Eget_auto() and H5Eset_auto(), but it's easier just to use this macro
  * like:
diff --git a/src/H5G.c b/src/H5G.c
index d4f6c91..64a99db 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -631,7 +631,7 @@ H5Gunlink(hid_t __unused__ loc_id, const char __unused__ *name)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Gstat
+ * Function:	H5Gget_stat
  *
  * Purpose:	Returns information about an object.  If FOLLOW_LINK is
  *		non-zero then all symbolic links are followed; otherwise all
@@ -650,12 +650,12 @@ H5Gunlink(hid_t __unused__ loc_id, const char __unused__ *name)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Gstat(hid_t loc_id, const char *name, hbool_t follow_link,
+H5Gget_stat(hid_t loc_id, const char *name, hbool_t follow_link,
 	 H5G_stat_t *statbuf/*out*/)
 {
     H5G_entry_t	*loc = NULL;
     
-    FUNC_ENTER (H5Gstat, FAIL);
+    FUNC_ENTER (H5Gget_stat, FAIL);
     H5TRACE4("e","isbx",loc_id,name,follow_link,statbuf);
 
     /* Check arguments */
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index 586a50f..a116253 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -68,7 +68,7 @@ herr_t H5Gmove (hid_t loc_id, const char *src, const char *dst);
 herr_t H5Glink (hid_t loc_id, H5G_link_t type, const char *cur_name,
 		const char *new_name);
 herr_t H5Gunlink (hid_t loc_id, const char *name);
-herr_t H5Gstat (hid_t loc_id, const char *name, hbool_t follow_link,
+herr_t H5Gget_stat (hid_t loc_id, const char *name, hbool_t follow_link,
 		H5G_stat_t *statbuf/*out*/);
 herr_t H5Gget_linkval (hid_t loc_id, const char *name, size_t size,
 		       char *buf/*out*/);
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index 3daf15a..bce48b5 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -136,7 +136,7 @@ H5O_mtime_decode(H5F_t __unused__ *f, const uint8 *p,
      * The catch-all.  If we can't convert a character string universal
      * coordinated time to a time_t value reliably then we can't decode the
      * modification time message. This really isn't as bad as it sounds --
-     * the only way a user can get the modification time is from H5Gstat()
+     * the only way a user can get the modification time is from H5Gget_stat()
      * and H5G_stat() can gracefully recover.
      */
 
diff --git a/src/H5S.c b/src/H5S.c
index cd387d9..dc8f334 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -729,7 +729,7 @@ H5S_extent_npoints(const H5S_t *ds)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Sextent_npoints
+ * Function:	H5Sget_simple_extent_npoints
  *
  * Purpose:	Determines how many data points a dataset extent has.
  *
@@ -746,12 +746,12 @@ H5S_extent_npoints(const H5S_t *ds)
  *-------------------------------------------------------------------------
  */
 hsize_t
-H5Sextent_npoints(hid_t space_id)
+H5Sget_simple_extent_npoints(hid_t space_id)
 {
     H5S_t		   *ds = NULL;
     hsize_t		    ret_value = 0;
 
-    FUNC_ENTER(H5Sextent_npoints, 0);
+    FUNC_ENTER(H5Sget_simple_extent_npoints, 0);
     H5TRACE1("h","i",space_id);
 
     /* Check args */
@@ -832,7 +832,7 @@ H5S_get_npoints_max(const H5S_t *ds)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Sextent_ndims
+ * Function:	H5Sget_simple_extent_ndims
  *
  * Purpose:	Determines the dimensionality of a data space.
  *
@@ -848,12 +848,12 @@ H5S_get_npoints_max(const H5S_t *ds)
  *-------------------------------------------------------------------------
  */
 int
-H5Sextent_ndims(hid_t space_id)
+H5Sget_simple_extent_ndims(hid_t space_id)
 {
     H5S_t		   *ds = NULL;
     intn		   ret_value = 0;
 
-    FUNC_ENTER(H5Sextent_ndims, FAIL);
+    FUNC_ENTER(H5Sget_simple_extent_ndims, FAIL);
     H5TRACE1("Is","i",space_id);
 
     /* Check args */
@@ -916,13 +916,13 @@ H5S_extent_ndims(const H5S_t *ds)
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5Sextent_dims
+ * Function:	H5Sget_simple_extent_dims
  *
  * Purpose:	Returns the size and maximum sizes in each dimension of
  *		a data space DS through	the DIMS and MAXDIMS arguments.
  *
  * Return:	Success:	Number of dimensions, the same value as
- *				returned by H5Sextent_ndims().
+ *				returned by H5Sget_simple_extent_ndims().
  *
  *		Failure:	FAIL
  *
@@ -938,13 +938,13 @@ H5S_extent_ndims(const H5S_t *ds)
  *-------------------------------------------------------------------------
  */
 int
-H5Sextent_dims(hid_t space_id, hsize_t dims[]/*out*/,
+H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[]/*out*/,
 		hsize_t maxdims[]/*out*/)
 {
     H5S_t		   *ds = NULL;
     intn		   ret_value = 0;
 
-    FUNC_ENTER(H5Sextent_dims, FAIL);
+    FUNC_ENTER(H5Sget_simple_extent_dims, FAIL);
     H5TRACE3("Is","ixx",space_id,dims,maxdims);
 
     /* Check args */
@@ -1644,7 +1644,7 @@ H5Screate_simple(int rank, const hsize_t dims[/*rank*/],
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5Sextent_class
+ * Function:	H5Sget_simple_extent_type
  *
  * Purpose:	Retrieves the type of extent for a dataspace object
  *
@@ -1662,12 +1662,12 @@ H5Screate_simple(int rank, const hsize_t dims[/*rank*/],
  *-------------------------------------------------------------------------
  */
 H5S_class_t
-H5Sextent_class(hid_t sid)
+H5Sget_simple_extent_type(hid_t sid)
 {
     H5S_class_t	ret_value = H5S_NO_CLASS;
     H5S_t	*space = NULL;
 
-    FUNC_ENTER(H5Sextent_class, FAIL);
+    FUNC_ENTER(H5Sget_simple_extent_type, FAIL);
     H5TRACE1("Sc","i",sid);
 
     /* Check arguments */
diff --git a/src/H5Spublic.h b/src/H5Spublic.h
index 9dca348..55b8ab1 100644
--- a/src/H5Spublic.h
+++ b/src/H5Spublic.h
@@ -50,18 +50,18 @@ herr_t H5Sset_extent_simple (hid_t space_id, int rank, const hsize_t dims[],
 			     const hsize_t max[]);
 hid_t H5Scopy (hid_t space_id);
 herr_t H5Sclose (hid_t space_id);
-hsize_t H5Sextent_npoints (hid_t space_id);
-int H5Sextent_ndims (hid_t space_id);
-int H5Sextent_dims (hid_t space_id, hsize_t dims[], hsize_t maxdims[]);
+hsize_t H5Sget_simple_extent_npoints (hid_t space_id);
+int H5Sget_simple_extent_ndims (hid_t space_id);
+int H5Sget_simple_extent_dims (hid_t space_id, hsize_t dims[], hsize_t maxdims[]);
 hbool_t H5Sis_simple (hid_t space_id);
 herr_t H5Sset_space (hid_t space_id, int rank, const hsize_t *dims);
-hsize_t H5Sselect_npoints (hid_t spaceid);
+hsize_t H5Sget_select_npoints (hid_t spaceid);
 herr_t H5Sselect_hyperslab (hid_t space_id, H5S_seloper_t op,
 			    const hssize_t start[], const hsize_t _stride[],
 			    const hsize_t count[], const hsize_t _block[]);
 herr_t H5Sselect_elements (hid_t space_id, H5S_seloper_t op, size_t num_elemn,
 			   const hssize_t **coord);
-H5S_class_t H5Sextent_class (hid_t space_id);
+H5S_class_t H5Sget_simple_extent_type (hid_t space_id);
 herr_t H5Sset_extent_none (hid_t space_id);
 herr_t H5Sextent_copy (hid_t dst_id,hid_t src_id);
 herr_t H5Sselect_all (hid_t spaceid);
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index 52c1636..d7478d3 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -641,11 +641,11 @@ done:
 
 /*--------------------------------------------------------------------------
  NAME
-    H5Sselect_npoints
+    H5Sget_select_npoints
  PURPOSE
     Get the number of elements in current selection
  USAGE
-    hsize_t H5Sselect_npoints(dsid)
+    hsize_t H5Sget_select_npoints(dsid)
         hid_t dsid;             IN: Dataspace ID of selection to query
  RETURNS
     The number of elements in selection on success, 0 on failure
@@ -657,12 +657,12 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 hsize_t
-H5Sselect_npoints(hid_t spaceid)
+H5Sget_select_npoints(hid_t spaceid)
 {
     H5S_t	*space = NULL;      /* Dataspace to modify selection of */
     hsize_t ret_value=0;        /* return value */
 
-    FUNC_ENTER (H5Sselect_npoints, 0);
+    FUNC_ENTER (H5Sget_select_npoints, 0);
     H5TRACE1("h","i",spaceid);
 
     /* Check args */
@@ -674,7 +674,7 @@ H5Sselect_npoints(hid_t spaceid)
     ret_value = H5S_select_npoints(space);
 
     FUNC_LEAVE (ret_value);
-}   /* H5Sselect_npoints() */
+}   /* H5Sget_select_npoints() */
 
 /*--------------------------------------------------------------------------
  NAME
@@ -725,7 +725,7 @@ H5S_select_npoints (const H5S_t *space)
     }
 
     FUNC_LEAVE (ret_value);
-}   /* H5Sselect_npoints() */
+}   /* H5S_select_npoints() */
 
 /*--------------------------------------------------------------------------
  NAME
diff --git a/src/H5public.h b/src/H5public.h
index 703d375..87b4464 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -29,7 +29,7 @@
 #define H5_VERS_MINOR	0       /* For minor interface/format changes  	     */
 #define H5_VERS_RELEASE	75      /* For tweaks, bug-fixes, or development     */
 
-#define H5check()	H5vers_check(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
+#define H5check()	H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR,	      \
 				     H5_VERS_RELEASE)
 
 /*
@@ -82,8 +82,8 @@ extern "C" {
 herr_t H5open (void);
 herr_t H5close (void);
 herr_t H5dont_atexit (void);
-herr_t H5version (unsigned *majnum, unsigned *minnum, unsigned *relnum);
-herr_t H5vers_check (unsigned majnum, unsigned minnum, unsigned relnum);
+herr_t H5get_libversion (unsigned *majnum, unsigned *minnum, unsigned *relnum);
+herr_t H5check_version (unsigned majnum, unsigned minnum, unsigned relnum);
 
 #ifdef __cplusplus
 }