[svn-r297] Switched templates to "property lists" and changed API prefix from H5C to H5P

12 files changed, 298 insertions, 298 deletions

diff --git a/src/H5Cpublic.h b/src/H5Cpublic.h
deleted file mode 100644
index 44444dc..0000000
--- a/src/H5Cpublic.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
- * NCSA HDF                                                                 *
- * Software Development Group                                               *
- * National Center for Supercomputing Applications                          *
- * University of Illinois at Urbana-Champaign                               *
- * 605 E. Springfield, Champaign IL 61820                                   *
- *                                                                          *
- * For conditions of distribution and use, see the accompanying             *
- * hdf/COPYING file.                                                        *
- *                                                                          *
- ****************************************************************************/
-
-/*
- * This file contains function prototypes for each exported function in the
- * H5C module.
- */
-#ifndef _H5Cpublic_H
-#define _H5Cpublic_H
-
-/* Default Template for creation, access, etc. templates */
-#define H5C_DEFAULT     (-2)
-
-/* Public headers needed by this file */
-#include <H5public.h>
-#include <H5Apublic.h>
-#include <H5Dpublic.h>
-
-/* Template classes */
-typedef enum H5C_class_t {
-    H5C_NO_CLASS         = -1,  /*error return value                         */
-    H5C_FILE_CREATE      = 0,   /*file creation template                     */
-    H5C_FILE_ACCESS      = 1,   /*file access template                       */
-    H5C_DATASET_CREATE   = 2,   /*dataset creation template                  */
-    H5C_DATASET_XFER     = 3,   /*dataset transfer template                  */
-
-    H5C_NCLASSES         = 4    /*this must be last!                         */
-} H5C_class_t;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Public functions */
-hid_t H5Ccreate (H5C_class_t type);
-herr_t H5Cclose (hid_t tid);
-hid_t H5Ccopy (hid_t tid);
-H5C_class_t H5Cget_class (hid_t tid);
-herr_t H5Cget_version (hid_t tid, int *boot/*out*/, int *heap/*out*/,
-                       int *freelist/*out*/, int *stab/*out*/,
-                       int *shhdr/*out*/);
-herr_t H5Cset_userblock (hid_t tid, size_t size);
-herr_t H5Cget_userblock (hid_t tid, size_t *size);
-herr_t H5Cset_sizes (hid_t tid, size_t sizeof_addr, size_t sizeof_size);
-herr_t H5Cget_sizes (hid_t tid, size_t *sizeof_addr/*out*/,
-                     size_t *sizeof_size/*out*/);
-herr_t H5Cset_sym_k (hid_t tid, int ik, int lk);
-herr_t H5Cget_sym_k (hid_t tid, int *ik/*out*/, int *lk/*out*/);
-herr_t H5Cset_istore_k (hid_t tid, int ik);
-herr_t H5Cget_istore_k (hid_t tid, int *ik/*out*/);
-herr_t H5Cset_layout (hid_t tid, H5D_layout_t layout);
-H5D_layout_t H5Cget_layout (hid_t tid);
-herr_t H5Cset_chunk (hid_t tid, int ndims, const size_t dim[]);
-int H5Cget_chunk (hid_t tid, int max_ndims, size_t dim[]/*out*/);
-herr_t H5Cset_stdio (hid_t tid);
-herr_t H5Cset_sec2 (hid_t tid);
-herr_t H5Cset_core (hid_t tid, size_t increment);
-herr_t H5Cset_split (hid_t tid, hid_t meta_tid, hid_t raw_tid);
-herr_t H5Cset_family (hid_t tid, hid_t memb_tid);
-#ifdef HAVE_PARALLEL
-herr_t H5Cset_mpi (hid_t tid, MPI_Comm comm, MPI_Info info, uintn access_mode);
-/* herr_t H5Cget_mpi (hid_t tid, int *ik); */  /* not defined yet */
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/src/H5D.c b/src/H5D.c
index dad5886..c7ac56b 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -19,7 +19,7 @@ static char		RcsId[] = "@(#)$Revision$";
 #include <H5private.h>		/* Generic Functions			  */
 #include <H5Aprivate.h>		/* Atoms			  */
 #include <H5ACprivate.h>	/* Cache			  */
-#include <H5Cprivate.h>		/* Templates				  */
+#include <H5Pprivate.h>		/* Templates				  */
 #include <H5Dprivate.h>		/* Dataset functions			  */
 #include <H5Eprivate.h>		/* Error handling		  */
 #include <H5Gprivate.h>		/* Group headers		  */
@@ -187,7 +187,7 @@ H5Dcreate(hid_t file_id, const char *name, hid_t type_id, hid_t space_id,
 	HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space");
     }
     if (create_parms_id >= 0) {
-	if (H5C_DATASET_CREATE != H5Cget_class(create_parms_id) ||
+	if (H5P_DATASET_CREATE != H5Pget_class(create_parms_id) ||
 	    NULL == (create_parms = H5A_object(create_parms_id))) {
 	    HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
 			  "not a dataset creation template");
@@ -415,7 +415,7 @@ H5Dget_type (hid_t dataset_id)
  *
  * Return:	Success:	ID for a copy of the dataset creation
  *				template.  The template should be released by
- *				calling H5Cclose().
+ *				calling H5Pclose().
  *
  *		Failure:	FAIL
  *
@@ -442,14 +442,14 @@ H5Dget_create_parms (hid_t dataset_id)
     }
 
     /* Copy the creation template */
-    if (NULL==(copied_parms=H5C_copy (H5C_DATASET_CREATE,
+    if (NULL==(copied_parms=H5P_copy (H5P_DATASET_CREATE,
 				      &(dataset->create_parms)))) {
 	HRETURN_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL,
 		       "unable to copy the creation template");
     }
 
     /* Create an atom */
-    if ((ret_value=H5A_register ((group_t)(H5_TEMPLATE_0+H5C_DATASET_CREATE),
+    if ((ret_value=H5A_register ((group_t)(H5_TEMPLATE_0+H5P_DATASET_CREATE),
 				 copied_parms))<0) {
 	HRETURN_ERROR (H5E_ATOM, H5E_CANTREGISTER, FAIL,
 		       "unable to register creation template");
@@ -478,7 +478,7 @@ H5Dget_create_parms (hid_t dataset_id)
  *		The number of elements in the memory data space must match
  *		the number of elements in the file data space.
  *
- *		The XFER_PARMS_ID can be the constant H5C_DEFAULT in which
+ *		The XFER_PARMS_ID can be the constant H5P_DEFAULT in which
  *		case the default data transfer properties are used.
  *
  * Return:	Success:	SUCCEED
@@ -534,9 +534,9 @@ H5Dread(hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id,
 	    HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space");
 	}
     }
-    if (H5C_DEFAULT == xfer_parms_id) {
+    if (H5P_DEFAULT == xfer_parms_id) {
 	xfer_parms = &H5D_xfer_dflt;
-    } else if (H5C_DATASET_XFER != H5Cget_class(xfer_parms_id) ||
+    } else if (H5P_DATASET_XFER != H5Pget_class(xfer_parms_id) ||
 	       NULL == (xfer_parms = H5A_object(xfer_parms_id))) {
 	HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
     }
@@ -573,7 +573,7 @@ H5Dread(hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id,
  *		The number of elements in the memory data space must match
  *		the number of elements in the file data space.
  *
- *		The XFER_PARMS_ID can be the constant H5C_DEFAULT in which
+ *		The XFER_PARMS_ID can be the constant H5P_DEFAULT in which
  *		case the default data transfer properties are used.
  *
  * Return:	Success:	SUCCEED
@@ -623,9 +623,9 @@ H5Dwrite(hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id,
 	    HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space");
 	}
     }
-    if (H5C_DEFAULT == xfer_parms_id) {
+    if (H5P_DEFAULT == xfer_parms_id) {
 	xfer_parms = &H5D_xfer_dflt;
-    } else if (H5C_DATASET_XFER != H5Cget_class(xfer_parms_id) ||
+    } else if (H5P_DATASET_XFER != H5Pget_class(xfer_parms_id) ||
 	       NULL == (xfer_parms = H5A_object(xfer_parms_id))) {
 	HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
     }
diff --git a/src/H5F.c b/src/H5F.c
index 6e639c3..e2b884e 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -40,7 +40,7 @@ static char		RcsId[] = "@(#)$Revision$";
 #include <H5private.h>		/*library functions			  */
 #include <H5Aprivate.h>		/*atoms					  */
 #include <H5ACprivate.h>	/*cache					  */
-#include <H5Cprivate.h>		/*templates				  */
+#include <H5Pprivate.h>		/*templates				  */
 #include <H5Eprivate.h>		/*error handling		  */
 #include <H5Gprivate.h>		/*symbol tables				  */
 #include <H5Mprivate.h>		/*meta data				  */
@@ -239,7 +239,7 @@ H5F_encode_length_unusual(const H5F_t *f, uint8 **p, uint8 *l)
  * Modifications:
  *
  * 	Robb Matzke, 18 Feb 1998
- *	Calls H5C_copy() to copy the template and H5C_close() to free that
+ *	Calls H5P_copy() to copy the template and H5P_close() to free that
  *	template if an error occurs.
  *
  *-------------------------------------------------------------------------
@@ -259,15 +259,15 @@ H5Fget_create_template(hid_t fid)
     }
     
     /* Create the template object to return */
-    if (NULL==(tmpl=H5C_copy (H5C_FILE_CREATE,
+    if (NULL==(tmpl=H5P_copy (H5P_FILE_CREATE,
 			      &(file->shared->create_parms)))) {
 	HRETURN_ERROR (H5E_INTERNAL, H5E_CANTINIT, FAIL,
 		       "unable to copy file creation properties");
     }
 
     /* Create an atom */
-    if ((ret_value = H5C_create(H5C_FILE_CREATE, tmpl)) < 0) {
-	H5C_close (H5C_FILE_CREATE, tmpl);
+    if ((ret_value = H5P_create(H5P_FILE_CREATE, tmpl)) < 0) {
+	H5P_close (H5P_FILE_CREATE, tmpl);
 	HRETURN_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL,
 		      "unable to register property list");
     }
@@ -309,15 +309,15 @@ H5Fget_access_template (hid_t file_id)
     }
 
     /* Create the template object to return */
-    if (NULL==(tmpl=H5C_copy (H5C_FILE_ACCESS,
+    if (NULL==(tmpl=H5P_copy (H5P_FILE_ACCESS,
 			      &(f->shared->access_parms)))) {
 	HRETURN_ERROR (H5E_INTERNAL, H5E_CANTINIT, FAIL,
 		       "unable to copy file access properties");
     }
 
     /* Create an atom */
-    if ((ret_value = H5C_create (H5C_FILE_ACCESS, tmpl))<0) {
-	H5C_close (H5C_FILE_ACCESS, tmpl);
+    if ((ret_value = H5P_create (H5P_FILE_ACCESS, tmpl))<0) {
+	H5P_close (H5P_FILE_ACCESS, tmpl);
 	HRETURN_ERROR (H5E_ATOM, H5E_CANTREGISTER, FAIL,
 		       "unable to register property list");
     }
@@ -1009,11 +1009,11 @@ H5F_open(const char *name, uintn flags,
  *
  *		The more complex behaviors of a file's creation and access
  *		are controlled through the file-creation and file-access
- *		property lists.  The value of H5C_DEFAULT for a template
+ *		property lists.  The value of H5P_DEFAULT for a template
  *		value indicates that the library should use the default
  *		values for the appropriate template.
  *
- * See also:	H5Fpublic.h for the list of supported flags. H5Cpublic.h for
+ * See also:	H5Fpublic.h for the list of supported flags. H5Ppublic.h for
  * 		the list of file creation and file access properties.
  *
  * Return:	Success:	A file ID
@@ -1039,7 +1039,7 @@ H5F_open(const char *name, uintn flags,
  *	Better error checking for the creation and access property lists. It
  *	used to be possible to swap the two and core the library.  Also, zero
  *	is no longer valid as a default property list; one must use
- *	H5C_DEFAULT instead.
+ *	H5P_DEFAULT instead.
  *
  *-------------------------------------------------------------------------
  */
@@ -1071,16 +1071,16 @@ H5Fcreate(const char *filename, uintn flags, hid_t create_id,
 	HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL,
 		     "mutually exclusive flags for file creation");
     }
-    if (H5C_DEFAULT==create_id) {
+    if (H5P_DEFAULT==create_id) {
 	create_parms = &H5F_create_dflt;
-    } else if (H5C_FILE_CREATE!=H5Cget_class (create_id) ||
+    } else if (H5P_FILE_CREATE!=H5Pget_class (create_id) ||
 	       NULL == (create_parms = H5A_object(create_id))) {
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
 		    "not a file creation property list");
     }
-    if (H5C_DEFAULT==access_id) {
+    if (H5P_DEFAULT==access_id) {
 	access_parms = &H5F_access_dflt;
-    } else if (H5C_FILE_ACCESS!=H5Cget_class (access_id) ||
+    } else if (H5P_FILE_ACCESS!=H5Pget_class (access_id) ||
 	       NULL == (access_parms = H5A_object(access_id))) {
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
 		    "not a file access property list");
@@ -1176,9 +1176,9 @@ H5Fopen(const char *filename, uintn flags, hid_t access_id)
 	(flags & H5F_ACC_TRUNC) || (flags & H5F_ACC_EXCL)) {
 	HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file open flags");
     }
-    if (H5C_DEFAULT==access_id) {
+    if (H5P_DEFAULT==access_id) {
 	access_parms = &H5F_access_dflt;
-    } else if (H5C_FILE_ACCESS!=H5Cget_class (access_id) ||
+    } else if (H5P_FILE_ACCESS!=H5Pget_class (access_id) ||
 	       NULL == (access_parms = H5A_object(access_id))) {
 	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
 		    "not a file access property list");
diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h
index 51d4d56..5843103 100644
--- a/src/H5Fpublic.h
+++ b/src/H5Fpublic.h
@@ -44,8 +44,8 @@
 #endif
 
 /*
- * Low-level file drivers.  These values are returned by H5Cget_file_driver()
- * and are set by the various H5Cset_...() functions that set file driver
+ * Low-level file drivers.  These values are returned by H5Pget_file_driver()
+ * and are set by the various H5Pset_...() functions that set file driver
  * properties.
  */
 typedef enum H5F_driver_t {
@@ -59,7 +59,7 @@ typedef enum H5F_driver_t {
 } H5F_driver_t;
 
 
-/* Parallel styles passed to H5Cset_mpi() */
+/* Parallel styles passed to H5Pset_mpi() */
 #ifdef HAVE_PARALLEL
 #  define H5ACC_INDEPENDENT 0x0010	/*MPI independent access	*/
 #  define H5ACC_COLLECTIVE  0x0011	/*MPI collective access		*/
diff --git a/src/H5M.c b/src/H5M.c
index e805248..5078950 100644
--- a/src/H5M.c
+++ b/src/H5M.c
@@ -45,13 +45,13 @@ static char             RcsId[] = "@(#)$Revision$";
 
 #include <H5private.h>          /* Generic functions */
 #include <H5Aprivate.h>		/* Atom interface */
-#include <H5Cprivate.h>         /* Template interface */
+#include <H5Pprivate.h>         /* Template interface */
 #include <H5Dprivate.h>         /* Dataset interface */
 #include <H5Eprivate.h>         /*error handling */
 #include <H5Sprivate.h>         /* Dataspace functions */
 #include <H5Tprivate.h>         /* Datatype interface */
 #include <H5Mprivate.h>         /* Meta-object interface */
-#include <H5Cprivate.h>         /* Template interface */
+#include <H5Pprivate.h>         /* Template interface */
 
 #define PABLO_MASK      H5M_mask
 
@@ -59,11 +59,11 @@ static char             RcsId[] = "@(#)$Revision$";
 
 static meta_func_t      meta_func_arr[] =
 {
-    {                           /* Template object meta-functions (defined in H5C.c) */
+    {                           /* Template object meta-functions (defined in H5P.c) */
         H5_TEMPLATE_0,          /* File-Creation Template Type ID */
         NULL,                   /* File-Creation Template Create */
         NULL,                   /* File-Creation Template Access */
-        H5Ccopy,                /* File-Creation Template Copy */
+        H5Pcopy,                /* File-Creation Template Copy */
         NULL,                   /* File-Creation Template FindName */
         NULL,                   /* File-Creation Template NameLen */
         NULL,                   /* File-Creation Template GetName */
@@ -74,13 +74,13 @@ static meta_func_t      meta_func_arr[] =
         NULL,                   /* File-Creation Template Delete */
         NULL,                   /* File-Creation Template GetParent */
         NULL,                   /* File-Creation Template GetFile */
-        H5Cclose                /* File-Creation Template Release */
+        H5Pclose                /* File-Creation Template Release */
     },
-    {                           /* Template object meta-functions (defined in H5C.c) */
+    {                           /* Template object meta-functions (defined in H5P.c) */
         H5_TEMPLATE_1,          /* File-Access Template Type ID */
         NULL,                   /* File-Access Template Create */
         NULL,                   /* File-Access Template Access */
-        H5Ccopy,                /* File-Access Template Copy */
+        H5Pcopy,                /* File-Access Template Copy */
         NULL,                   /* File-Access Template FindName */
         NULL,                   /* File-Access Template NameLen */
         NULL,                   /* File-Access Template GetName */
@@ -91,7 +91,7 @@ static meta_func_t      meta_func_arr[] =
         NULL,                   /* File-Access Template Delete */
         NULL,                   /* File-Access Template GetParent */
         NULL,                   /* File-Access Template GetFile */
-        H5Cclose                /* File-Access Template Release */
+        H5Pclose                /* File-Access Template Release */
     },
     {                           /* Datatype object meta-functions (defined in H5T.c) */
         H5_DATATYPE,            /* Datatype Type ID */
diff --git a/src/H5Mpublic.h b/src/H5Mpublic.h
index 6366a1f..1f5e582 100644
--- a/src/H5Mpublic.h
+++ b/src/H5Mpublic.h
@@ -18,7 +18,7 @@
 
 /* Public headers needed by this file */
 #include <H5public.h>
-#include <H5Cpublic.h>          /*for hobjtype_t defn                        */
+#include <H5Ppublic.h>          /*for hobjtype_t defn                        */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/H5C.c b/src/H5P.c
index d549289..4e180e2b 100644
--- a/src/H5C.c
+++ b/src/H5P.c
@@ -22,26 +22,26 @@ static char             RcsId[] = "@(#)$Revision$";
 #include <H5private.h>          /* Generic Functions                      */
 #include <H5Aprivate.h>         /* Atoms                          */
 #include <H5Bprivate.h>         /* B-tree subclass names          */
-#include <H5Cprivate.h>         /* Template information           */
+#include <H5Pprivate.h>         /* Template information           */
 #include <H5Dprivate.h>         /* Datasets                               */
 #include <H5Eprivate.h>         /* Error handling                 */
 #include <H5MMprivate.h>        /* Memory management                      */
 
-#define PABLO_MASK      H5C_mask
+#define PABLO_MASK      H5P_mask
 
 /* Is the interface initialized? */
 static hbool_t          interface_initialize_g = FALSE;
-#define INTERFACE_INIT H5C_init_interface
-static herr_t           H5C_init_interface(void);
+#define INTERFACE_INIT H5P_init_interface
+static herr_t           H5P_init_interface(void);
 
 /* PRIVATE PROTOTYPES */
-static void             H5C_term_interface(void);
+static void             H5P_term_interface(void);
 
 /*--------------------------------------------------------------------------
 NAME
-   H5C_init_interface -- Initialize interface-specific information
+   H5P_init_interface -- Initialize interface-specific information
 USAGE
-    herr_t H5C_init_interface()
+    herr_t H5P_init_interface()
    
 RETURNS
    SUCCEED/FAIL
@@ -50,13 +50,13 @@ DESCRIPTION
 
 --------------------------------------------------------------------------*/
 static herr_t
-H5C_init_interface(void)
+H5P_init_interface(void)
 {
     herr_t                  ret_value = SUCCEED;
     intn                    i;
     herr_t                  status;
 
-    FUNC_ENTER(H5C_init_interface, FAIL);
+    FUNC_ENTER(H5P_init_interface, FAIL);
 
     /*
      * Make sure the file creation and file access default templates are
@@ -65,17 +65,17 @@ H5C_init_interface(void)
      */
     if (H5F_init_interface ()<0) {
 	HRETURN_ERROR (H5E_INTERNAL, H5E_CANTINIT, FAIL,
-		       "unable to initialize H5F and H5C interfaces");
+		       "unable to initialize H5F and H5P interfaces");
     }
 
-    assert(H5C_NCLASSES <= H5_TEMPLATE_MAX - H5_TEMPLATE_0);
+    assert(H5P_NCLASSES <= H5_TEMPLATE_MAX - H5_TEMPLATE_0);
 
     /*
      * Initialize the mappings between template classes and atom groups. We
      * keep the two separate because template classes are publicly visible but
      * atom groups aren't.
      */
-    for (i = 0; i < H5C_NCLASSES; i++) {
+    for (i = 0; i < H5P_NCLASSES; i++) {
         status = H5A_init_group((group_t)(H5_TEMPLATE_0 +i),
 				H5A_TEMPID_HASHSIZE, 0, NULL);
         if (status < 0) ret_value = FAIL;
@@ -88,7 +88,7 @@ H5C_init_interface(void)
     /*
      * Register cleanup function.
      */
-    if (H5_add_exit(H5C_term_interface) < 0) {
+    if (H5_add_exit(H5P_term_interface) < 0) {
         HRETURN_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL,
                       "unable to install atexit function");
     }
@@ -98,11 +98,11 @@ H5C_init_interface(void)
 
 /*--------------------------------------------------------------------------
  NAME
-    H5C_term_interface
+    H5P_term_interface
  PURPOSE
-    Terminate various H5C objects
+    Terminate various H5P objects
  USAGE
-    void H5C_term_interface()
+    void H5P_term_interface()
  RETURNS
     SUCCEED/FAIL
  DESCRIPTION
@@ -114,23 +114,23 @@ H5C_init_interface(void)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static void
-H5C_term_interface(void)
+H5P_term_interface(void)
 {
     intn                    i;
 
-    for (i = 0; i < H5C_NCLASSES; i++) {
+    for (i = 0; i < H5P_NCLASSES; i++) {
         H5A_destroy_group((group_t)(H5_TEMPLATE_0 + i));
     }
 }
 
 /*--------------------------------------------------------------------------
  NAME
-    H5Ccreate
+    H5Pcreate
  PURPOSE
     Returns a copy of the default template for some class of templates.
  USAGE
-    herr_t H5Ccreate (type)
-        H5C_class_t type;       IN: Template class whose default is desired.
+    herr_t H5Pcreate (type)
+        H5P_class_t type;       IN: Template class whose default is desired.
  RETURNS
     Template ID or FAIL
  
@@ -143,31 +143,31 @@ H5C_term_interface(void)
     Returns a copy of the default template for some class of templates.
 --------------------------------------------------------------------------*/
 hid_t
-H5Ccreate(H5C_class_t type)
+H5Pcreate(H5P_class_t type)
 {
     hid_t                   ret_value = FAIL;
     void                   *tmpl = NULL;
 
-    FUNC_ENTER(H5Ccreate, FAIL);
+    FUNC_ENTER(H5Pcreate, FAIL);
 
     /* Allocate a new template and initialize it with default values */
     switch (type) {
-    case H5C_FILE_CREATE:
+    case H5P_FILE_CREATE:
 	tmpl = H5MM_xmalloc(sizeof(H5F_create_t));
         memcpy(tmpl, &H5F_create_dflt, sizeof(H5F_create_t));
         break;
 
-    case H5C_FILE_ACCESS:
+    case H5P_FILE_ACCESS:
         tmpl = H5MM_xmalloc(sizeof(H5F_access_t));
         memcpy(tmpl, &H5F_access_dflt, sizeof(H5F_access_t));
         break;
 
-    case H5C_DATASET_CREATE:
+    case H5P_DATASET_CREATE:
         tmpl = H5MM_xmalloc(sizeof(H5D_create_t));
         memcpy(tmpl, &H5D_create_dflt, sizeof(H5D_create_t));
         break;
 
-    case H5C_DATASET_XFER:
+    case H5P_DATASET_XFER:
         tmpl = H5MM_xmalloc(sizeof(H5D_xfer_t));
         memcpy(tmpl, &H5D_xfer_dflt, sizeof(H5D_xfer_t));
         break;
@@ -178,7 +178,7 @@ H5Ccreate(H5C_class_t type)
     }
 
     /* Atomize the new template */
-    if ((ret_value = H5C_create(type, tmpl)) < 0) {
+    if ((ret_value = H5P_create(type, tmpl)) < 0) {
         HRETURN_ERROR(H5E_ATOM, H5E_CANTINIT, FAIL,
                       "can't register template");
     }
@@ -186,11 +186,11 @@ H5Ccreate(H5C_class_t type)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5C_create
+ * Function:    H5P_create
  *
  * Purpose:     Given a pointer to some template struct, atomize the template
  *              and return its ID. The template memory is not copied, so the
- *              caller should not free it; it will be freed by H5C_release().
+ *              caller should not free it; it will be freed by H5P_release().
  *
  * Return:      Success:        A new template ID.
  *
@@ -204,14 +204,14 @@ H5Ccreate(H5C_class_t type)
  *-------------------------------------------------------------------------
  */
 hid_t
-H5C_create(H5C_class_t type, void *tmpl)
+H5P_create(H5P_class_t type, void *tmpl)
 {
     hid_t	ret_value = FAIL;
 
-    FUNC_ENTER(H5C_create, FAIL);
+    FUNC_ENTER(H5P_create, FAIL);
 
     /* check args */
-    assert(type >= 0 && type < H5C_NCLASSES);
+    assert(type >= 0 && type < H5P_NCLASSES);
     assert(tmpl);
 
     /* Atomize the new template */
@@ -225,11 +225,11 @@ H5C_create(H5C_class_t type, void *tmpl)
 
 /*--------------------------------------------------------------------------
  NAME
-    H5Cclose
+    H5Pclose
  PURPOSE
     Release access to a template object.
  USAGE
-    herr_t H5Cclose(oid)
+    herr_t H5Pclose(oid)
         hid_t oid;       IN: Template object to release access to
  RETURNS
     SUCCEED/FAIL
@@ -237,15 +237,15 @@ H5C_create(H5C_class_t type, void *tmpl)
         This function releases access to a template object
 --------------------------------------------------------------------------*/
 herr_t
-H5Cclose(hid_t tid)
+H5Pclose(hid_t tid)
 {
-    H5C_class_t		type;
+    H5P_class_t		type;
     void                *tmpl = NULL;
 
-    FUNC_ENTER(H5Cclose, FAIL);
+    FUNC_ENTER(H5Pclose, FAIL);
 
     /* Check arguments */
-    if ((type=H5Cget_class (tid))<0 ||
+    if ((type=H5Pget_class (tid))<0 ||
 	NULL==(tmpl=H5A_object (tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list");
     }
@@ -256,14 +256,14 @@ H5Cclose(hid_t tid)
      * free function is not registered as part of the group because it takes
      * an extra argument.
      */
-    if (0==H5A_dec_ref(tid)) H5C_close (type, tmpl);
+    if (0==H5A_dec_ref(tid)) H5P_close (type, tmpl);
 
     FUNC_LEAVE (SUCCEED);
 }
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5C_close
+ * Function:	H5P_close
  *
  * Purpose:	Closes a template and frees the memory associated with the
  *		template.
@@ -280,24 +280,24 @@ H5Cclose(hid_t tid)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C_close (H5C_class_t type, void *tmpl)
+H5P_close (H5P_class_t type, void *tmpl)
 {
-    FUNC_ENTER (H5C_close, FAIL);
+    FUNC_ENTER (H5P_close, FAIL);
 
     /* Check args */
     assert (tmpl);
 
     /* Some templates may need to do special things */
     switch (type) {
-    case H5C_FILE_ACCESS:
+    case H5P_FILE_ACCESS:
 #ifdef LATER
 	/* Need to free the COMM and INFO objects too. */
 #endif
 	break;
 	
-    case H5C_FILE_CREATE:
-    case H5C_DATASET_CREATE:
-    case H5C_DATASET_XFER:
+    case H5P_FILE_CREATE:
+    case H5P_DATASET_CREATE:
+    case H5P_DATASET_XFER:
 	/*nothing to do*/
 	break;
 
@@ -313,13 +313,13 @@ H5C_close (H5C_class_t type, void *tmpl)
 
 
 /*-------------------------------------------------------------------------
- * Function:    H5Cget_class
+ * Function:    H5Pget_class
  *
  * Purpose:     Returns the class identifier for a template.
  *
  * Return:      Success:        A template class
  *
- *              Failure:        H5C_NO_CLASS (-1)
+ *              Failure:        H5P_NO_CLASS (-1)
  *
  * Programmer:  Robb Matzke
  *              Wednesday, December  3, 1997
@@ -328,27 +328,27 @@ H5C_close (H5C_class_t type, void *tmpl)
  *
  *-------------------------------------------------------------------------
  */
-H5C_class_t
-H5Cget_class(hid_t tid)
+H5P_class_t
+H5Pget_class(hid_t tid)
 {
     group_t                 group;
-    H5C_class_t             ret_value = H5C_NO_CLASS;
+    H5P_class_t             ret_value = H5P_NO_CLASS;
 
-    FUNC_ENTER(H5Cget_class, H5C_NO_CLASS);
+    FUNC_ENTER(H5Pget_class, H5P_NO_CLASS);
 
     if ((group = H5A_group(tid)) < 0 ||
 #ifndef NDEBUG
         group >= H5_TEMPLATE_MAX ||
 #endif
         group < H5_TEMPLATE_0) {
-        HRETURN_ERROR(H5E_ATOM, H5E_BADATOM, H5C_NO_CLASS, "not a template");
+        HRETURN_ERROR(H5E_ATOM, H5E_BADATOM, H5P_NO_CLASS, "not a template");
     }
-    ret_value = (H5C_class_t)(group - H5_TEMPLATE_0);
+    ret_value = (H5P_class_t)(group - H5_TEMPLATE_0);
     FUNC_LEAVE(ret_value);
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5Cget_version
+ * Function:    H5Pget_version
  *
  * Purpose:     Retrieves version information for various parts of a file.
  *
@@ -374,15 +374,15 @@ H5Cget_class(hid_t tid)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cget_version(hid_t tid, int *boot /*out */ , int *heap /*out */ ,
+H5Pget_version(hid_t tid, int *boot /*out */ , int *heap /*out */ ,
          int *freelist /*out */ , int *stab /*out */ , int *shhdr /*out */ )
 {
     H5F_create_t           *tmpl = NULL;
 
-    FUNC_ENTER(H5Cget_version, FAIL);
+    FUNC_ENTER(H5Pget_version, FAIL);
 
     /* Check arguments */
-    if (H5C_FILE_CREATE != H5Cget_class(tid) ||
+    if (H5P_FILE_CREATE != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
                       "not a file creation template");
@@ -403,7 +403,7 @@ H5Cget_version(hid_t tid, int *boot /*out */ , int *heap /*out */ ,
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5Cset_userblock
+ * Function:    H5Pset_userblock
  *
  * Purpose:     Sets the userblock size field of a file creation template.
  *
@@ -419,15 +419,15 @@ H5Cget_version(hid_t tid, int *boot /*out */ , int *heap /*out */ ,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cset_userblock(hid_t tid, size_t size)
+H5Pset_userblock(hid_t tid, size_t size)
 {
     intn                    i;
     H5F_create_t           *tmpl = NULL;
 
-    FUNC_ENTER(H5Cset_userblock, FAIL);
+    FUNC_ENTER(H5Pset_userblock, FAIL);
 
     /* Check arguments */
-    if (H5C_FILE_CREATE != H5Cget_class(tid) ||
+    if (H5P_FILE_CREATE != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
                       "not a file creation template");
@@ -448,7 +448,7 @@ H5Cset_userblock(hid_t tid, size_t size)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5Cget_userblock
+ * Function:    H5Pget_userblock
  *
  * Purpose:     Queries the size of a user block in a file creation template.
  *
@@ -464,14 +464,14 @@ H5Cset_userblock(hid_t tid, size_t size)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cget_userblock(hid_t tid, size_t *size)
+H5Pget_userblock(hid_t tid, size_t *size)
 {
     H5F_create_t           *tmpl = NULL;
 
-    FUNC_ENTER(H5Cget_userblock, FAIL);
+    FUNC_ENTER(H5Pget_userblock, FAIL);
 
     /* Check args */
-    if (H5C_FILE_CREATE != H5Cget_class(tid) ||
+    if (H5P_FILE_CREATE != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
                       "not a file creation template");
@@ -484,7 +484,7 @@ H5Cget_userblock(hid_t tid, size_t *size)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5Cset_sizes
+ * Function:    H5Pset_sizes
  *
  * Purpose:     Sets file size-of addresses and sizes.  TEMPLATE
  *              should be a file creation template.  A value of zero causes
@@ -502,14 +502,14 @@ H5Cget_userblock(hid_t tid, size_t *size)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cset_sizes(hid_t tid, size_t sizeof_addr, size_t sizeof_size)
+H5Pset_sizes(hid_t tid, size_t sizeof_addr, size_t sizeof_size)
 {
     H5F_create_t           *tmpl = NULL;
 
-    FUNC_ENTER(H5Cset_sizeof_addr, FAIL);
+    FUNC_ENTER(H5Pset_sizeof_addr, FAIL);
 
     /* Check arguments */
-    if (H5C_FILE_CREATE != H5Cget_class(tid) ||
+    if (H5P_FILE_CREATE != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
                       "not a file creation template");
@@ -538,7 +538,7 @@ H5Cset_sizes(hid_t tid, size_t sizeof_addr, size_t sizeof_size)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5Cget_sizes
+ * Function:    H5Pget_sizes
  *
  * Purpose:     Returns the size of address and size quantities stored in a
  *              file according to a file creation template.  Either (or even
@@ -556,15 +556,15 @@ H5Cset_sizes(hid_t tid, size_t sizeof_addr, size_t sizeof_size)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cget_sizes(hid_t tid,
+H5Pget_sizes(hid_t tid,
              size_t *sizeof_addr /*out */ , size_t *sizeof_size /*out */ )
 {
     H5F_create_t           *tmpl = NULL;
 
-    FUNC_ENTER(H5Cget_sizes, FAIL);
+    FUNC_ENTER(H5Pget_sizes, FAIL);
 
     /* Check args */
-    if (H5C_FILE_CREATE != H5Cget_class(tid) ||
+    if (H5P_FILE_CREATE != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
                       "not a file creation template");
@@ -579,7 +579,7 @@ H5Cget_sizes(hid_t tid,
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5Cset_sym_k
+ * Function:    H5Pset_sym_k
  *
  * Purpose:     IK is one half the rank of a tree that stores a symbol
  *              table for a group.  Internal nodes of the symbol table are on
@@ -608,14 +608,14 @@ H5Cget_sizes(hid_t tid,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cset_sym_k(hid_t tid, int ik, int lk)
+H5Pset_sym_k(hid_t tid, int ik, int lk)
 {
     H5F_create_t           *tmpl = NULL;
 
-    FUNC_ENTER(H5Cset_sym_k, FAIL);
+    FUNC_ENTER(H5Pset_sym_k, FAIL);
 
     /* Check arguments */
-    if (H5C_FILE_CREATE != H5Cget_class(tid) ||
+    if (H5P_FILE_CREATE != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
                       "not a file creation template");
@@ -631,10 +631,10 @@ H5Cset_sym_k(hid_t tid, int ik, int lk)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5Cget_sym_k
+ * Function:    H5Pget_sym_k
  *
  * Purpose:     Retrieves the symbol table B-tree 1/2 rank (IK) and the
- *              symbol table leaf node 1/2 size (LK).  See H5Cset_sym_k() for
+ *              symbol table leaf node 1/2 size (LK).  See H5Pset_sym_k() for
  *              details. Either (or even both) IK and LK may be null
  *              pointers.
  *
@@ -650,14 +650,14 @@ H5Cset_sym_k(hid_t tid, int ik, int lk)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cget_sym_k(hid_t tid, int *ik /*out */ , int *lk /*out */ )
+H5Pget_sym_k(hid_t tid, int *ik /*out */ , int *lk /*out */ )
 {
     H5F_create_t           *tmpl = NULL;
 
-    FUNC_ENTER(H5Cget_sym_k, FAIL);
+    FUNC_ENTER(H5Pget_sym_k, FAIL);
 
     /* Check arguments */
-    if (H5C_FILE_CREATE != H5Cget_class(tid) ||
+    if (H5P_FILE_CREATE != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
                       "not a file creation template");
@@ -672,7 +672,7 @@ H5Cget_sym_k(hid_t tid, int *ik /*out */ , int *lk /*out */ )
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5Cset_istore_k
+ * Function:    H5Pset_istore_k
  *
  * Purpose:     IK is one half the rank of a tree that stores chunked raw
  *              data.  On average, such a tree will be 75% full, or have an
@@ -690,14 +690,14 @@ H5Cget_sym_k(hid_t tid, int *ik /*out */ , int *lk /*out */ )
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cset_istore_k(hid_t tid, int ik)
+H5Pset_istore_k(hid_t tid, int ik)
 {
     H5F_create_t           *tmpl = NULL;
 
-    FUNC_ENTER(H5Cset_istore_k, FAIL);
+    FUNC_ENTER(H5Pset_istore_k, FAIL);
 
     /* Check arguments */
-    if (H5C_FILE_CREATE != H5Cget_class(tid) ||
+    if (H5P_FILE_CREATE != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
                       "not a file creation template");
@@ -713,10 +713,10 @@ H5Cset_istore_k(hid_t tid, int ik)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5Cget_istore_k
+ * Function:    H5Pget_istore_k
  *
  * Purpose:     Queries the 1/2 rank of an indexed storage B-tree.  See
- *              H5Cset_istore_k() for details.  The argument IK may be the
+ *              H5Pset_istore_k() for details.  The argument IK may be the
  *              null pointer.
  *
  * Return:      Success:        SUCCEED, size returned through IK
@@ -731,14 +731,14 @@ H5Cset_istore_k(hid_t tid, int ik)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cget_istore_k(hid_t tid, int *ik /*out */ )
+H5Pget_istore_k(hid_t tid, int *ik /*out */ )
 {
     H5F_create_t           *tmpl = NULL;
 
-    FUNC_ENTER(H5Cget_istore_k, FAIL);
+    FUNC_ENTER(H5Pget_istore_k, FAIL);
 
     /* Check arguments */
-    if (H5C_FILE_CREATE != H5Cget_class(tid) ||
+    if (H5P_FILE_CREATE != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
                       "not a file creation template");
@@ -751,7 +751,7 @@ H5Cget_istore_k(hid_t tid, int *ik /*out */ )
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5Cset_layout
+ * Function:    H5Pset_layout
  *
  * Purpose:     Sets the layout of raw data in the file.
  *
@@ -767,14 +767,14 @@ H5Cget_istore_k(hid_t tid, int *ik /*out */ )
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cset_layout(hid_t tid, H5D_layout_t layout)
+H5Pset_layout(hid_t tid, H5D_layout_t layout)
 {
     H5D_create_t           *tmpl = NULL;
 
-    FUNC_ENTER(H5Cset_layout, FAIL);
+    FUNC_ENTER(H5Pset_layout, FAIL);
 
     /* Check arguments */
-    if (H5C_DATASET_CREATE != H5Cget_class(tid) ||
+    if (H5P_DATASET_CREATE != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
                       "not a dataset creation template");
@@ -790,7 +790,7 @@ H5Cset_layout(hid_t tid, H5D_layout_t layout)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5Cget_layout
+ * Function:    H5Pget_layout
  *
  * Purpose:     Retrieves layout type of a dataset creation template.
  *
@@ -806,14 +806,14 @@ H5Cset_layout(hid_t tid, H5D_layout_t layout)
  *-------------------------------------------------------------------------
  */
 H5D_layout_t
-H5Cget_layout(hid_t tid)
+H5Pget_layout(hid_t tid)
 {
     H5D_create_t           *tmpl = NULL;
 
-    FUNC_ENTER(H5Cget_layout, H5D_LAYOUT_ERROR);
+    FUNC_ENTER(H5Pget_layout, H5D_LAYOUT_ERROR);
 
     /* Check arguments */
-    if (H5C_DATASET_CREATE != H5Cget_class(tid) ||
+    if (H5P_DATASET_CREATE != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, H5D_LAYOUT_ERROR,
                       "not a dataset creation template");
@@ -822,7 +822,7 @@ H5Cget_layout(hid_t tid)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5Cset_chunk
+ * Function:    H5Pset_chunk
  *
  * Purpose:     Sets the number of dimensions and the size of each chunk to
  *              the values specified.  The dimensionality of the chunk should
@@ -843,15 +843,15 @@ H5Cget_layout(hid_t tid)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cset_chunk(hid_t tid, int ndims, const size_t dim[])
+H5Pset_chunk(hid_t tid, int ndims, const size_t dim[])
 {
     int                     i;
     H5D_create_t           *tmpl = NULL;
 
-    FUNC_ENTER(H5Cset_chunk, FAIL);
+    FUNC_ENTER(H5Pset_chunk, FAIL);
 
     /* Check arguments */
-    if (H5C_DATASET_CREATE != H5Cget_class(tid) ||
+    if (H5P_DATASET_CREATE != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
                       "not a dataset creation template");
@@ -885,7 +885,7 @@ H5Cset_chunk(hid_t tid, int ndims, const size_t dim[])
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5Cget_chunk
+ * Function:    H5Pget_chunk
  *
  * Purpose:     Retrieves the chunk size of chunked layout.  The chunk
  *              dimensionality is returned and the chunk size in each
@@ -904,15 +904,15 @@ H5Cset_chunk(hid_t tid, int ndims, const size_t dim[])
  *-------------------------------------------------------------------------
  */
 int
-H5Cget_chunk(hid_t tid, int max_ndims, size_t dim[] /*out */ )
+H5Pget_chunk(hid_t tid, int max_ndims, size_t dim[] /*out */ )
 {
     int                     i;
     H5D_create_t           *tmpl = NULL;
 
-    FUNC_ENTER(H5Cget_chunk, FAIL);
+    FUNC_ENTER(H5Pget_chunk, FAIL);
 
     /* Check arguments */
-    if (H5C_DATASET_CREATE != H5Cget_class(tid) ||
+    if (H5P_DATASET_CREATE != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
                       "not a dataset creation template");
@@ -930,7 +930,7 @@ H5Cget_chunk(hid_t tid, int max_ndims, size_t dim[] /*out */ )
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Cset_stdio
+ * Function:	H5Pset_stdio
  *
  * Purpose:	Set the low level file driver to use the functions declared
  *		in the stdio.h file: fopen(), fseek() or fseek64(), fread(),
@@ -948,14 +948,14 @@ H5Cget_chunk(hid_t tid, int max_ndims, size_t dim[] /*out */ )
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cset_stdio (hid_t tid)
+H5Pset_stdio (hid_t tid)
 {
     H5F_access_t	*tmpl = NULL;
     
-    FUNC_ENTER (H5Cset_stdio, FAIL);
+    FUNC_ENTER (H5Pset_stdio, FAIL);
 
     /* Check arguments */
-    if (H5C_FILE_ACCESS != H5Cget_class(tid) ||
+    if (H5P_FILE_ACCESS != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
 		      "not a file access template");
@@ -969,7 +969,7 @@ H5Cset_stdio (hid_t tid)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Cset_sec2
+ * Function:	H5Pset_sec2
  *
  * Purpose:	Set the low-level file driver to use the functions declared
  *		in the unistd.h file: open(), lseek() or lseek64(), read(),
@@ -987,14 +987,14 @@ H5Cset_stdio (hid_t tid)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cset_sec2 (hid_t tid)
+H5Pset_sec2 (hid_t tid)
 {
     H5F_access_t	*tmpl = NULL;
     
-    FUNC_ENTER (H5Cset_sec2, FAIL);
+    FUNC_ENTER (H5Pset_sec2, FAIL);
 
     /* Check arguments */
-    if (H5C_FILE_ACCESS != H5Cget_class(tid) ||
+    if (H5P_FILE_ACCESS != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
 		      "not a file access template");
@@ -1008,7 +1008,7 @@ H5Cset_sec2 (hid_t tid)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Cset_core
+ * Function:	H5Pset_core
  *
  * Purpose:	Set the low-level file driver to use malloc() and free().
  *		This driver is restricted to temporary files which are not
@@ -1030,14 +1030,14 @@ H5Cset_sec2 (hid_t tid)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cset_core (hid_t tid, size_t increment)
+H5Pset_core (hid_t tid, size_t increment)
 {
     H5F_access_t	*tmpl = NULL;
     
-    FUNC_ENTER (H5Cset_core, FAIL);
+    FUNC_ENTER (H5Pset_core, FAIL);
 
     /* Check arguments */
-    if (H5C_FILE_ACCESS != H5Cget_class(tid) ||
+    if (H5P_FILE_ACCESS != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
 		      "not a file access template");
@@ -1056,7 +1056,7 @@ H5Cset_core (hid_t tid, size_t increment)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Cset_split
+ * Function:	H5Pset_split
  *
  * Purpose:	Set the low-level driver to split meta data from raw data,
  *		storing meta data in one file and raw data in another file.
@@ -1073,28 +1073,28 @@ H5Cset_core (hid_t tid, size_t increment)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cset_split (hid_t tid, hid_t meta_tid, hid_t raw_tid)
+H5Pset_split (hid_t tid, hid_t meta_tid, hid_t raw_tid)
 {
     H5F_access_t	*tmpl = NULL;
     H5F_access_t	*meta_tmpl = NULL;
     H5F_access_t	*raw_tmpl = NULL;
     
-    FUNC_ENTER (H5Cset_split, FAIL);
+    FUNC_ENTER (H5Pset_split, FAIL);
 
     /* Check arguments */
-    if (H5C_FILE_ACCESS != H5Cget_class(tid) ||
+    if (H5P_FILE_ACCESS != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
 		      "not a file access template");
     }
-    if (H5C_DEFAULT!=meta_tid &&
-	(H5C_FILE_ACCESS != H5Cget_class(meta_tid) ||
+    if (H5P_DEFAULT!=meta_tid &&
+	(H5P_FILE_ACCESS != H5Pget_class(meta_tid) ||
 	 NULL == (tmpl = H5A_object(meta_tid)))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
 		      "not a file access template");
     }
-    if (H5C_DEFAULT!=raw_tid &&
-	(H5C_FILE_ACCESS != H5Cget_class(raw_tid) ||
+    if (H5P_DEFAULT!=raw_tid &&
+	(H5P_FILE_ACCESS != H5Pget_class(raw_tid) ||
 	 NULL == (tmpl = H5A_object(raw_tid)))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
 		      "not a file access template");
@@ -1102,15 +1102,15 @@ H5Cset_split (hid_t tid, hid_t meta_tid, hid_t raw_tid)
 
     /* Set driver */
     tmpl->driver = H5F_LOW_SPLIT;
-    tmpl->u.split.meta_access = H5C_copy (H5C_FILE_ACCESS, meta_tmpl);
-    tmpl->u.split.raw_access = H5C_copy (H5C_FILE_ACCESS, raw_tmpl);
+    tmpl->u.split.meta_access = H5P_copy (H5P_FILE_ACCESS, meta_tmpl);
+    tmpl->u.split.raw_access = H5P_copy (H5P_FILE_ACCESS, raw_tmpl);
 
     FUNC_LEAVE (SUCCEED);
 }
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Cset_family
+ * Function:	H5Pset_family
  *
  * Purpose:	Sets the low-level driver to stripe the hdf5 address space
  *		across a family of files.
@@ -1127,22 +1127,22 @@ H5Cset_split (hid_t tid, hid_t meta_tid, hid_t raw_tid)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cset_family (hid_t tid, hid_t memb_tid)
+H5Pset_family (hid_t tid, hid_t memb_tid)
 {
     
     H5F_access_t	*tmpl = NULL;
     H5F_access_t	*memb_tmpl = NULL;
     
-    FUNC_ENTER (H5Cset_family, FAIL);
+    FUNC_ENTER (H5Pset_family, FAIL);
 
     /* Check arguments */
-    if (H5C_FILE_ACCESS != H5Cget_class(tid) ||
+    if (H5P_FILE_ACCESS != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
 		      "not a file access template");
     }
-    if (H5C_DEFAULT!=memb_tid &&
-	(H5C_FILE_ACCESS != H5Cget_class(memb_tid) ||
+    if (H5P_DEFAULT!=memb_tid &&
+	(H5P_FILE_ACCESS != H5Pget_class(memb_tid) ||
 	 NULL == (tmpl = H5A_object(memb_tid)))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
 		      "not a file access template");
@@ -1150,7 +1150,7 @@ H5Cset_family (hid_t tid, hid_t memb_tid)
 
     /* Set driver */
     tmpl->driver = H5F_LOW_FAMILY;
-    tmpl->u.fam.memb_access = H5C_copy (H5C_FILE_ACCESS, memb_tmpl);
+    tmpl->u.fam.memb_access = H5P_copy (H5P_FILE_ACCESS, memb_tmpl);
 
     FUNC_LEAVE (SUCCEED);
 }
@@ -1159,9 +1159,9 @@ H5Cset_family (hid_t tid, hid_t memb_tid)
 
 #ifdef HAVE_PARALLEL
 /*-------------------------------------------------------------------------
- * Function:    H5Cset_mpi
+ * Function:    H5Pset_mpi
  *
- * Signature:   herr_t H5Cset_mpi(hid_t tid, MPI_Comm comm, MPI_Info info,
+ * Signature:   herr_t H5Pset_mpi(hid_t tid, MPI_Comm comm, MPI_Info info,
  *                  uintn access_mode) 
  *
  * Purpose:     Store the access mode for MPIO call and the user supplied
@@ -1212,16 +1212,16 @@ H5Cset_family (hid_t tid, hid_t memb_tid)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Cset_mpi (hid_t tid, MPI_Comm comm, MPI_Info info, uintn access_mode)
+H5Pset_mpi (hid_t tid, MPI_Comm comm, MPI_Info info, uintn access_mode)
 {
     H5F_access_t           *tmpl = NULL;
     MPI_Comm		    lcomm;
     int			    mrc;		/* MPI return code */
 
-    FUNC_ENTER(H5Cset_mpi, FAIL);
+    FUNC_ENTER(H5Pset_mpi, FAIL);
 
     /* Check arguments */
-    if (H5C_FILE_ACCESS != H5Cget_class(tid) ||
+    if (H5P_FILE_ACCESS != H5Pget_class(tid) ||
         NULL == (tmpl = H5A_object(tid))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL,
 		      "not a file access template");
@@ -1273,11 +1273,11 @@ H5Cset_mpi (hid_t tid, MPI_Comm comm, MPI_Info info, uintn access_mode)
 
 /*--------------------------------------------------------------------------
  NAME
-    H5Ccopy
+    H5Pcopy
  PURPOSE
     Copy a template
  USAGE
-    hid_t H5C_copy(tid)
+    hid_t H5P_copy(tid)
         hid_t tid;        IN: Template object to copy
  RETURNS
     Returns template ID (atom) on success, FAIL on failure
@@ -1295,26 +1295,26 @@ H5Cset_mpi (hid_t tid, MPI_Comm comm, MPI_Info info, uintn access_mode)
     settings.
 --------------------------------------------------------------------------*/
 hid_t
-H5Ccopy(hid_t tid)
+H5Pcopy(hid_t tid)
 {
     const void             *tmpl = NULL;
     void                   *new_tmpl = NULL;
-    H5C_class_t             type;
+    H5P_class_t             type;
     hid_t                   ret_value = FAIL;
     group_t                 group;
 
-    FUNC_ENTER(H5Ccopy, FAIL);
+    FUNC_ENTER(H5Pcopy, FAIL);
 
     /* Check args */
     if (NULL == (tmpl = H5A_object(tid)) ||
-        (type = H5Cget_class(tid)) < 0 ||
+        (type = H5Pget_class(tid)) < 0 ||
         (group = H5A_group(tid)) < 0) {
         HRETURN_ERROR(H5E_ATOM, H5E_BADATOM, FAIL,
                       "can't unatomize template");
     }
 
     /* Copy it */
-    if (NULL==(new_tmpl=H5C_copy (type, tmpl))) {
+    if (NULL==(new_tmpl=H5P_copy (type, tmpl))) {
 	HRETURN_ERROR (H5E_INTERNAL, H5E_CANTINIT, FAIL,
 		       "unable to copy template");
     }
@@ -1328,7 +1328,7 @@ H5Ccopy(hid_t tid)
 }
 
 /*-------------------------------------------------------------------------
- * Function:	H5C_copy
+ * Function:	H5P_copy
  *
  * Purpose:	Creates a new template and initializes it with some other
  *		template.
@@ -1345,28 +1345,28 @@ H5Ccopy(hid_t tid)
  *-------------------------------------------------------------------------
  */
 void *
-H5C_copy (H5C_class_t type, const void *src)
+H5P_copy (H5P_class_t type, const void *src)
 {
     size_t	size;
     void	*dst = NULL;
     
-    FUNC_ENTER (H5C_copy, NULL);
+    FUNC_ENTER (H5P_copy, NULL);
     
     /* How big is the template */
     switch (type) {
-    case H5C_FILE_CREATE:
+    case H5P_FILE_CREATE:
         size = sizeof(H5F_create_t);
         break;
 
-    case H5C_FILE_ACCESS:
+    case H5P_FILE_ACCESS:
 	size = sizeof(H5F_access_t);
 	break;
 
-    case H5C_DATASET_CREATE:
+    case H5P_DATASET_CREATE:
         size = sizeof(H5D_create_t);
         break;
 
-    case H5C_DATASET_XFER:
+    case H5P_DATASET_XFER:
         size = sizeof(H5D_xfer_t);
         break;
 
diff --git a/src/H5Cprivate.h b/src/H5Pprivate.h
index a01df14..d1b877b 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Pprivate.h
@@ -11,19 +11,19 @@
  ****************************************************************************/
 
 /*
- * This file contains private information about the H5C module
+ * This file contains private information about the H5P module
  */
-#ifndef _H5Cprivate_H
-#define _H5Cprivate_H
+#ifndef _H5Pprivate_H
+#define _H5Pprivate_H
 
-#include <H5Cpublic.h>
+#include <H5Ppublic.h>
 
 /* Private headers needed by this file */
 #include <H5private.h>
 #include <H5Fprivate.h>
 
-hid_t H5C_create (H5C_class_t type, void *tmpl);
-void *H5C_copy (H5C_class_t type, const void *src);
-herr_t H5C_close (H5C_class_t type, void *tmpl);
+hid_t H5P_create (H5P_class_t type, void *tmpl);
+void *H5P_copy (H5P_class_t type, const void *src);
+herr_t H5P_close (H5P_class_t type, void *tmpl);
 
 #endif
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
new file mode 100644
index 0000000..b8074d2
--- /dev/null
+++ b/src/H5Ppublic.h
@@ -0,0 +1,77 @@
+/****************************************************************************
+ * NCSA HDF                                                                 *
+ * Software Development Group                                               *
+ * National Center for Supercomputing Applications                          *
+ * University of Illinois at Urbana-Champaign                               *
+ * 605 E. Springfield, Champaign IL 61820                                   *
+ *                                                                          *
+ * For conditions of distribution and use, see the accompanying             *
+ * hdf/COPYING file.                                                        *
+ *                                                                          *
+ ****************************************************************************/
+
+/*
+ * This file contains function prototypes for each exported function in the
+ * H5P module.
+ */
+#ifndef _H5Ppublic_H
+#define _H5Ppublic_H
+
+/* Default Template for creation, access, etc. templates */
+#define H5P_DEFAULT     (-2)
+
+/* Public headers needed by this file */
+#include <H5public.h>
+#include <H5Apublic.h>
+#include <H5Dpublic.h>
+
+/* Template classes */
+typedef enum H5P_class_t {
+    H5P_NO_CLASS         = -1,  /*error return value                         */
+    H5P_FILE_CREATE      = 0,   /*file creation template                     */
+    H5P_FILE_ACCESS      = 1,   /*file access template                       */
+    H5P_DATASET_CREATE   = 2,   /*dataset creation template                  */
+    H5P_DATASET_XFER     = 3,   /*dataset transfer template                  */
+
+    H5P_NCLASSES         = 4    /*this must be last!                         */
+} H5P_class_t;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Public functions */
+hid_t H5Pcreate (H5P_class_t type);
+herr_t H5Pclose (hid_t tid);
+hid_t H5Pcopy (hid_t tid);
+H5P_class_t H5Pget_class (hid_t tid);
+herr_t H5Pget_version (hid_t tid, int *boot/*out*/, int *heap/*out*/,
+                       int *freelist/*out*/, int *stab/*out*/,
+                       int *shhdr/*out*/);
+herr_t H5Pset_userblock (hid_t tid, size_t size);
+herr_t H5Pget_userblock (hid_t tid, size_t *size);
+herr_t H5Pset_sizes (hid_t tid, size_t sizeof_addr, size_t sizeof_size);
+herr_t H5Pget_sizes (hid_t tid, size_t *sizeof_addr/*out*/,
+                     size_t *sizeof_size/*out*/);
+herr_t H5Pset_sym_k (hid_t tid, int ik, int lk);
+herr_t H5Pget_sym_k (hid_t tid, int *ik/*out*/, int *lk/*out*/);
+herr_t H5Pset_istore_k (hid_t tid, int ik);
+herr_t H5Pget_istore_k (hid_t tid, int *ik/*out*/);
+herr_t H5Pset_layout (hid_t tid, H5D_layout_t layout);
+H5D_layout_t H5Pget_layout (hid_t tid);
+herr_t H5Pset_chunk (hid_t tid, int ndims, const size_t dim[]);
+int H5Pget_chunk (hid_t tid, int max_ndims, size_t dim[]/*out*/);
+herr_t H5Pset_stdio (hid_t tid);
+herr_t H5Pset_sec2 (hid_t tid);
+herr_t H5Pset_core (hid_t tid, size_t increment);
+herr_t H5Pset_split (hid_t tid, hid_t meta_tid, hid_t raw_tid);
+herr_t H5Pset_family (hid_t tid, hid_t memb_tid);
+#ifdef HAVE_PARALLEL
+herr_t H5Pset_mpi (hid_t tid, MPI_Comm comm, MPI_Info info, uintn access_mode);
+/* herr_t H5Pget_mpi (hid_t tid, int *ik); */  /* not defined yet */
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/src/Makefile.in b/src/Makefile.in
index d84fcb1..249e4d7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,7 +16,7 @@ PROGS=debug
 # Source and object files for the library (lexicographically)...
 PARALLEL_SRC=H5Fmpio.c
 
-LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5C.c H5D.c H5E.c H5F.c H5Farray.c H5Fcore.c  \
+LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5P.c H5D.c H5E.c H5F.c H5Farray.c H5Fcore.c  \
 	H5Ffamily.c H5Fistore.c H5Flow.c H5Fsec2.c H5Fsplit.c H5Fstdio.c      \
         H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5H.c H5M.c H5MF.c H5MM.c H5O.c    \
         H5Ocont.c H5Odtype.c H5Oefl.c H5Olayout.c H5Oname.c H5Onull.c         \
@@ -33,14 +33,14 @@ PROG_SRC=debug.c
 PROG_OBJ=$(PROG_SRC:.c=.o)
 
 # Public header files (to be installed)...
-PUB_HDR=H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5Cpublic.h	      \
+PUB_HDR=H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5Ppublic.h	      \
         H5Dpublic.h H5Epublic.h H5Fpublic.h H5Gpublic.h H5Hpublic.h	      \
         H5Mpublic.h H5MFpublic.h H5MMpublic.h H5Opublic.h H5Spublic.h	      \
 	H5Tpublic.h H5config.h hdf5.h
 
 # Other header files (not to be installed)...
 PRIVATE_HDR=H5private.h H5Aprivate.h H5ACprivate.h H5Bprivate.h		      \
-	H5Cprivate.h H5Dprivate.h H5Eprivate.h H5Fprivate.h H5Gprivate.h      \
+	H5Pprivate.h H5Dprivate.h H5Eprivate.h H5Fprivate.h H5Gprivate.h      \
 	H5Gpkg.h H5Hprivate.h H5Mprivate.h H5MFprivate.h H5MMprivate.h	      \
 	H5Oprivate.h H5Sprivate.h H5Tprivate.h H5Tpkg.h H5Vprivate.h
 
diff --git a/src/debug.c b/src/debug.c
index 8356de7..2e7e1c4 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -17,7 +17,7 @@
 #include <H5private.h>
 #include <H5Aprivate.h>
 #include <H5Bprivate.h>
-#include <H5Cprivate.h>
+#include <H5Pprivate.h>
 #include <H5Fprivate.h>
 #include <H5Gprivate.h>
 #include <H5Hprivate.h>
@@ -57,7 +57,7 @@ main(int argc, char *argv[])
     /*
      * Open the file and get the file descriptor.
      */
-    if ((fid = H5Fopen(argv[1], H5F_ACC_RDONLY, H5C_DEFAULT)) < 0) {
+    if ((fid = H5Fopen(argv[1], H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) {
         fprintf(stderr, "cannot open file\n");
         HDexit(1);
     }
diff --git a/src/hdf5.h b/src/hdf5.h
index a5d8f19..8252a21 100644
--- a/src/hdf5.h
+++ b/src/hdf5.h
@@ -19,19 +19,19 @@
 #define _HDF5_H
 
 #include <H5public.h>
-#include <H5Apublic.h>
-#include <H5ACpublic.h>
-#include <H5Bpublic.h>
-#include <H5Cpublic.h>
-#include <H5Dpublic.h>
-#include <H5Epublic.h>
-#include <H5Fpublic.h>
-#include <H5Gpublic.h>
+#include <H5Apublic.h>      /* Atoms */
+#include <H5ACpublic.h>     /* Metadata cache */
+#include <H5Bpublic.h>      /* B-trees */
+#include <H5Dpublic.h>      /* Datasets */
+#include <H5Epublic.h>      /* Errors */
+#include <H5Fpublic.h>      /* Files */
+#include <H5Gpublic.h>      /* Groups */
 #include <H5Hpublic.h>
-#include <H5Mpublic.h>
+#include <H5Mpublic.h>      /* "Meta" */
 #include <H5MFpublic.h>
 #include <H5MMpublic.h>
-#include <H5Opublic.h>
-#include <H5Spublic.h>
-#include <H5Tpublic.h>
+#include <H5Opublic.h>      /* Object headers */
+#include <H5Ppublic.h>      /* Property lists */
+#include <H5Spublic.h>      /* Dataspaces */
+#include <H5Tpublic.h>      /* Datatypes */
 #endif