From 1a67bd06c8c6a43fc7e2f23b5912bdc3513ff17c Mon Sep 17 00:00:00 2001
From: Krzysztof Czurylo <krzysztof.czurylo@intel.com>
Date: Thu, 13 Nov 2014 12:39:42 +0100
Subject: [PATCH] common: remove "_pool_" from API names

---
 benchmarks/blk_mt/blk_mt.c                    | 12 ++---
 benchmarks/log_mt/log_mt.c                    |  6 +--
 benchmarks/vmem_mt/vmem_mt.c                  |  8 +--
 doc/libvmem.3                                 | 54 +++++++++----------
 examples/libpmemblk/assetdb/asset_checkout.c  |  2 +-
 examples/libpmemblk/assetdb/asset_load.c      |  2 +-
 src/blk.c                                     | 30 +++++------
 src/include/libpmemblk.h                      |  8 +--
 src/include/libpmemlog.h                      |  9 ++--
 src/include/libpmemobj.h                      |  8 +--
 src/include/libvmem.h                         | 14 ++---
 src/libpmemblk.map                            |  8 +--
 src/libpmemlog.map                            |  8 +--
 src/libpmemobj.map                            |  8 +--
 src/libvmem.map                               | 12 ++---
 src/log.c                                     | 30 +++++------
 src/obj.c                                     | 30 +++++------
 src/test/Makefile                             | 10 ++--
 src/test/blk_nblock/README                    |  2 +-
 src/test/blk_nblock/blk_nblock.c              | 13 +++--
 src/test/blk_nblock/out0.log.match            |  4 +-
 src/test/blk_nblock/out1.log.match            | 26 ++++-----
 src/test/blk_recovery/README                  |  4 +-
 src/test/blk_recovery/TEST0                   |  2 +-
 src/test/blk_recovery/blk_recovery.c          | 12 ++---
 src/test/blk_rw/README                        |  2 +-
 src/test/blk_rw/blk_rw.c                      | 16 +++---
 src/test/blk_rw_mt/blk_rw_mt.c                | 12 ++---
 src/test/log_basic/README                     |  6 +--
 src/test/log_basic/TEST0                      |  6 +--
 src/test/log_basic/TEST1                      |  6 +--
 src/test/log_basic/TEST2                      |  6 +--
 src/test/log_basic/TEST3                      |  6 +--
 src/test/log_basic/log_basic.c                | 18 +++----
 src/test/log_basic/out0.log.match             |  2 +-
 src/test/log_basic/out1.log.match             |  2 +-
 src/test/log_basic/out2.log.match             |  2 +-
 src/test/log_basic/out3.log.match             |  2 +-
 src/test/log_recovery/README                  |  6 +--
 src/test/log_recovery/log_recovery.c          | 18 +++----
 src/test/log_walker/README                    |  2 +-
 src/test/log_walker/log_walker.c              |  6 +--
 src/test/pmem_map/.gitignore                  |  1 +
 src/test/{pmem_map_raw => pmem_map}/Makefile  |  8 +--
 src/test/{pmem_map_raw => pmem_map}/README    |  4 +-
 src/test/{pmem_map_raw => pmem_map}/TEST0     |  6 +--
 src/test/{pmem_map_raw => pmem_map}/TEST1     |  6 +--
 .../{pmem_map_raw => pmem_map}/err0.log.match |  0
 .../{pmem_map_raw => pmem_map}/err1.log.match |  0
 src/test/pmem_map/out0.log.match              |  3 ++
 src/test/pmem_map/out1.log.match              |  4 ++
 .../pmem_map_raw.c => pmem_map/pmem_map.c}    |  6 +--
 src/test/pmem_map_raw/.gitignore              |  1 -
 src/test/pmem_map_raw/out0.log.match          |  3 --
 src/test/pmem_map_raw/out1.log.match          |  4 --
 src/test/scope/out0.log.match                 | 48 ++++++++---------
 src/test/scope/out2.log.match                 | 32 +++++------
 src/test/scope/out3.log.match                 | 32 +++++------
 src/test/scope/out4.log.match                 | 32 +++++------
 src/test/unittest/unittest.h                  |  6 +--
 src/test/util_pool_create/TEST0               |  2 +-
 src/test/util_pool_open/TEST0                 |  6 +--
 src/test/util_pool_open/out0.log.match        |  2 +-
 .../vmem_aligned_alloc/vmem_aligned_alloc.c   | 12 ++---
 src/test/vmem_calloc/vmem_calloc.c            | 12 ++---
 src/test/vmem_check/.gitignore                |  1 +
 .../{vmem_pool_check => vmem_check}/Makefile  |  8 +--
 .../{vmem_pool_check => vmem_check}/TEST0     |  6 +--
 .../{vmem_pool_check => vmem_check}/TEST1     |  6 +--
 .../vmem_check.c}                             | 36 ++++++-------
 .../vmem_check_allocations.c                  | 10 ++--
 src/test/vmem_create/.gitignore               |  1 +
 .../Makefile                                  |  8 +--
 .../{vmem_pool_create => vmem_create}/TEST0   |  6 +--
 .../err0.log.match                            |  0
 src/test/vmem_create/out0.log.match           |  4 ++
 .../vmem_create.c}                            | 12 ++---
 src/test/vmem_create_error/.gitignore         |  1 +
 .../Makefile                                  |  8 +--
 .../TEST0                                     |  6 +--
 .../err0.log.match                            |  0
 src/test/vmem_create_error/out0.log.match     |  3 ++
 .../vmem_create_error.c}                      | 12 ++---
 src/test/vmem_create_in_region/.gitignore     |  1 +
 src/test/vmem_create_in_region/Makefile       | 43 +++++++++++++++
 .../TEST0                                     |  6 +--
 .../err0.log.match                            |  0
 src/test/vmem_create_in_region/out0.log.match |  3 ++
 .../vmem_create_in_region.c}                  | 14 ++---
 .../vmem_custom_alloc/vmem_custom_alloc.c     | 12 ++---
 src/test/vmem_freespace/vmem_freespace.c      | 20 +++----
 src/test/vmem_malloc/vmem_malloc.c            | 12 ++---
 .../vmem_mix_allocations.c                    | 12 ++---
 .../vmem_multiple_pools/vmem_multiple_pools.c | 14 ++---
 .../vmem_out_of_memory/vmem_out_of_memory.c   | 12 ++---
 .../vmem_pages_purging/vmem_pages_purging.c   |  6 +--
 src/test/vmem_pool_check/.gitignore           |  1 -
 src/test/vmem_pool_create/.gitignore          |  1 -
 src/test/vmem_pool_create/out0.log.match      |  4 --
 src/test/vmem_pool_create_error/.gitignore    |  1 -
 .../vmem_pool_create_error/out0.log.match     |  3 --
 .../vmem_pool_create_in_region/.gitignore     |  1 -
 src/test/vmem_pool_create_in_region/Makefile  | 43 ---------------
 .../vmem_pool_create_in_region/out0.log.match |  3 --
 src/test/vmem_realloc/vmem_realloc.c          | 12 ++---
 src/test/vmem_stats/vmem_stats.c              | 16 +++---
 src/test/vmem_strdup/vmem_strdup.c            | 12 ++---
 src/test/vmem_valgrind/vmem_valgrind.c        | 16 +++---
 src/vmem.c                                    | 24 ++++-----
 109 files changed, 544 insertions(+), 546 deletions(-)
 create mode 100644 src/test/pmem_map/.gitignore
 rename src/test/{pmem_map_raw => pmem_map}/Makefile (92%)
 rename src/test/{pmem_map_raw => pmem_map}/README (83%)
 rename src/test/{pmem_map_raw => pmem_map}/TEST0 (91%)
 rename src/test/{pmem_map_raw => pmem_map}/TEST1 (92%)
 rename src/test/{pmem_map_raw => pmem_map}/err0.log.match (100%)
 rename src/test/{pmem_map_raw => pmem_map}/err1.log.match (100%)
 create mode 100644 src/test/pmem_map/out0.log.match
 create mode 100644 src/test/pmem_map/out1.log.match
 rename src/test/{pmem_map_raw/pmem_map_raw.c => pmem_map/pmem_map.c} (95%)
 delete mode 100644 src/test/pmem_map_raw/.gitignore
 delete mode 100644 src/test/pmem_map_raw/out0.log.match
 delete mode 100644 src/test/pmem_map_raw/out1.log.match
 create mode 100644 src/test/vmem_check/.gitignore
 rename src/test/{vmem_pool_check => vmem_check}/Makefile (91%)
 rename src/test/{vmem_pool_check => vmem_check}/TEST0 (91%)
 rename src/test/{vmem_pool_check => vmem_check}/TEST1 (91%)
 rename src/test/{vmem_pool_check/vmem_pool_check.c => vmem_check/vmem_check.c} (75%)
 create mode 100644 src/test/vmem_create/.gitignore
 rename src/test/{vmem_pool_create => vmem_create}/Makefile (90%)
 rename src/test/{vmem_pool_create => vmem_create}/TEST0 (91%)
 rename src/test/{vmem_pool_create => vmem_create}/err0.log.match (100%)
 create mode 100644 src/test/vmem_create/out0.log.match
 rename src/test/{vmem_pool_create/vmem_pool_create.c => vmem_create/vmem_create.c} (90%)
 create mode 100644 src/test/vmem_create_error/.gitignore
 rename src/test/{vmem_pool_create_error => vmem_create_error}/Makefile (88%)
 rename src/test/{vmem_pool_create_error => vmem_create_error}/TEST0 (90%)
 rename src/test/{vmem_pool_create_error => vmem_create_error}/err0.log.match (100%)
 create mode 100644 src/test/vmem_create_error/out0.log.match
 rename src/test/{vmem_pool_create_error/vmem_pool_create_error.c => vmem_create_error/vmem_create_error.c} (86%)
 create mode 100644 src/test/vmem_create_in_region/.gitignore
 create mode 100644 src/test/vmem_create_in_region/Makefile
 rename src/test/{vmem_pool_create_in_region => vmem_create_in_region}/TEST0 (89%)
 rename src/test/{vmem_pool_create_in_region => vmem_create_in_region}/err0.log.match (100%)
 create mode 100644 src/test/vmem_create_in_region/out0.log.match
 rename src/test/{vmem_pool_create_in_region/vmem_pool_create_in_region.c => vmem_create_in_region/vmem_create_in_region.c} (86%)
 delete mode 100644 src/test/vmem_pool_check/.gitignore
 delete mode 100644 src/test/vmem_pool_create/.gitignore
 delete mode 100644 src/test/vmem_pool_create/out0.log.match
 delete mode 100644 src/test/vmem_pool_create_error/.gitignore
 delete mode 100644 src/test/vmem_pool_create_error/out0.log.match
 delete mode 100644 src/test/vmem_pool_create_in_region/.gitignore
 delete mode 100644 src/test/vmem_pool_create_in_region/Makefile
 delete mode 100644 src/test/vmem_pool_create_in_region/out0.log.match

diff --git a/benchmarks/blk_mt/blk_mt.c b/benchmarks/blk_mt/blk_mt.c
index f34c24684..d3ff17c82 100644
--- a/benchmarks/blk_mt/blk_mt.c
+++ b/benchmarks/blk_mt/blk_mt.c
@@ -152,10 +152,10 @@ main(int argc, char *argv[])
 	} else {
 		close(worker_params[0].file_desc);
 		worker_params[0].file_desc = -1;
-		if ((worker_params[0].handle = pmemblk_pool_open(
+		if ((worker_params[0].handle = pmemblk_open(
 				arguments.file_path,
 				worker_params[0].block_size)) == NULL) {
-			fprintf(stderr, "!%s: pmemblk_pool_open\n", argv[2]);
+			fprintf(stderr, "!%s: pmemblk_open\n", argv[2]);
 			exit(1);
 		}
 		worker_params[0].num_blocks = pmemblk_nblock(
@@ -215,15 +215,15 @@ main(int argc, char *argv[])
 
 	/* cleanup and check pmem file */
 	if (!arguments.file_io) {
-		pmemblk_pool_close(worker_params[0].handle);
+		pmemblk_close(worker_params[0].handle);
 
 		/* not really necessary, but check consistency */
-		int result = pmemblk_pool_check(arguments.file_path);
+		int result = pmemblk_check(arguments.file_path);
 		if (result < 0) {
-			fprintf(stderr, "!%s: pmemblk_pool_check\n",
+			fprintf(stderr, "!%s: pmemblk_check\n",
 					arguments.file_path);
 		} else if (result == 0) {
-			fprintf(stderr, "%s: pmemblk_pool_check: not "
+			fprintf(stderr, "%s: pmemblk_check: not "
 					"consistent\n", arguments.file_path);
 		}
 	}
diff --git a/benchmarks/log_mt/log_mt.c b/benchmarks/log_mt/log_mt.c
index 2dcd77f1c..122f38adf 100644
--- a/benchmarks/log_mt/log_mt.c
+++ b/benchmarks/log_mt/log_mt.c
@@ -141,8 +141,8 @@ main(int argc, char *argv[])
 			exit(1);
 		}
 
-		if ((plp = pmemlog_pool_open(args.file_name)) == NULL) {
-			perror("pmemlog_pool_open");
+		if ((plp = pmemlog_open(args.file_name)) == NULL) {
+			perror("pmemlog_open");
 			exit(1);
 		}
 		Tasks = Tasks_pmemlog;
@@ -173,7 +173,7 @@ main(int argc, char *argv[])
 	if (args.fileio_mode) {
 		close(fd);
 	} else {
-		pmemlog_pool_close(plp);
+		pmemlog_close(plp);
 	}
 
 	(fails == 0) ? exit(0) : exit(1);
diff --git a/benchmarks/vmem_mt/vmem_mt.c b/benchmarks/vmem_mt/vmem_mt.c
index 3e9182165..1f0ee5152 100644
--- a/benchmarks/vmem_mt/vmem_mt.c
+++ b/benchmarks/vmem_mt/vmem_mt.c
@@ -302,14 +302,14 @@ main(int argc, char *argv[])
 				}
 				/* suppress valgrind warnings */
 				memset(pools_data[i], 0xFF, pool_size);
-				pools[i] = vmem_pool_create_in_region(
+				pools[i] = vmem_create_in_region(
 						pools_data[i], pool_size);
 			} else {
-				pools[i] = vmem_pool_create(arguments.dir_path,
+				pools[i] = vmem_create(arguments.dir_path,
 						pool_size);
 			}
 			if (pools[i] == NULL) {
-				perror("vmem_pool_create");
+				perror("vmem_create");
 				free(allocated_mem);
 				return EXIT_FAILURE;
 			}
@@ -334,7 +334,7 @@ main(int argc, char *argv[])
 
 	if (arguments.allocator == ALLOCATOR_VMEM) {
 		for (i = 0; i < pools_count; ++i) {
-			vmem_pool_delete(pools[i]);
+			vmem_delete(pools[i]);
 			if (arguments.dir_path == NULL) {
 				if (pools_data[i] != NULL)
 					munmap(pools_data[i], pool_size);
diff --git a/doc/libvmem.3 b/doc/libvmem.3
index 68f4bc97a..f0caf42cd 100644
--- a/doc/libvmem.3
+++ b/doc/libvmem.3
@@ -116,7 +116,7 @@ Under normal usage,
 .B libvmem
 will never print messages or intentionally cause the process to exit.
 Exceptions to this are prints caused by calls to
-.BR vmem_pool_stats_print (),
+.BR vmem_stats_print (),
 or by enabling debugging as described under
 .B DEBUGGING
 below.
@@ -154,7 +154,7 @@ To use
 a
 .I memory pool
 is first created.  This is most commonly done with the
-.BR vmem_pool_create ()
+.BR vmem_create ()
 function described in this section.
 The other functions
 described in this section are for less common cases, where
@@ -167,10 +167,10 @@ of type
 which is passed to the functions for memory allocation described in
 the next section.
 .PP
-.BI "VMEM *vmem_pool_create(const char *" dir ", size_t " size );
+.BI "VMEM *vmem_create(const char *" dir ", size_t " size );
 .IP
 The
-.BR vmem_pool_create ()
+.BR vmem_create ()
 function creates a memory pool.  The resulting pool is then used with
 functions like
 .BR vmem_malloc ()
@@ -179,7 +179,7 @@ and
 to provide the familiar
 .I malloc-like
 programming model for the memory pool.
-.BR vmem_pool_create ()
+.BR vmem_create ()
 creates the pool by allocating a
 temporary file in the given directory
 .IR dir .
@@ -197,7 +197,7 @@ value allowed by the library is defined in
 as
 .BR VMEM_MIN_POOL .
 Calling
-.BR vmem_pool_create ()
+.BR vmem_create ()
 with a size smaller than that will return an error.
 The maximum allowed size is not limited by
 .BR libvmem ,
@@ -209,7 +209,7 @@ The
 passed in is the raw size of the memory pool and
 .B libvmem
 will use some of that space for its own metadata.
-.BR vmem_pool_create ()
+.BR vmem_create ()
 returns an opaque memory pool handle or NULL if an error occurred
 (in which case
 .I errno
@@ -217,28 +217,28 @@ is set appropriately).  The opaque memory pool handle
 is then used with the other functions
 described in this man page that operate on a specific memory pool.
 .PP
-.BI "VMEM *vmem_pool_create_in_region(void *" addr ", size_t " size );
+.BI "VMEM *vmem_create_in_region(void *" addr ", size_t " size );
 .IP
 The
-.BR vmem_pool_create_in_region ()
+.BR vmem_create_in_region ()
 is an alternate
 .B libvmem
 entry point for creating a memory pool.
 It is for the rare case where an application needs to create
 a memory pool from an already memory-mapped region.
 Instead of allocating space from a given file system,
-.BR vmem_pool_create_in_region ()
+.BR vmem_create_in_region ()
 is given the memory region explicitly via the
 .I addr
 and
 .I size
 arguments.
 Any data in the region is lost by calling
-.BR vmem_pool_create_in_region (),
+.BR vmem_create_in_region (),
 which will immediately store its own data structures for managing
 the pool there.
 Like
-.BR vmem_pool_create ()
+.BR vmem_create ()
 above, the minimum
 .I size
 allowed is defined as
@@ -246,26 +246,26 @@ allowed is defined as
 The
 .I addr
 argument must be page aligned.
-.BR vmem_pool_create_in_region ()
+.BR vmem_create_in_region ()
 returns an opaque memory pool handle or NULL if an error occurred
 (in which case
 .I errno
 is set appropriately).
 .PP
-.BI "void vmem_pool_delete(VMEM *" vmp );
+.BI "void vmem_delete(VMEM *" vmp );
 .IP
 The
-.BR vmem_pool_delete ()
+.BR vmem_delete ()
 function releases the memory pool
 .IR vmp .
 If the memory pool was created using
 .BR vmem_create_pool (),
 deleting it allows the space to be reclaimed.
 .PP
-.BI "int vmem_pool_check(VMEM *" vmp );
+.BI "int vmem_check(VMEM *" vmp );
 .IP
 The
-.BR vmem_pool_check ()
+.BR vmem_check ()
 function
 performs an extensive consistency check of all
 .B libvmem
@@ -281,19 +281,19 @@ is at least 1 (see
 .B DEBUGGING
 below).
 During the consistency check performed by
-.BR vmem_pool_check (),
+.BR vmem_check (),
 other operations on the same memory pool are locked out.
 The checks are all read-only;
-.BR vmem_pool_check ()
+.BR vmem_check ()
 never modifies the memory pool.
 This function is mostly useful for
 .B libvmem
 developers during testing/debugging.
 .PP
-.BI "int vmem_pool_freespace(VMEM *" vmp );
+.BI "int vmem_freespace(VMEM *" vmp );
 .IP
 The
-.BR vmem_pool_freespace ()
+.BR vmem_freespace ()
 function returns the amount of unallocated space available
 in the memory pool
 .IR vmp .
@@ -302,10 +302,10 @@ an approximation since different allocation patterns will require
 .B libvmem
 to use up different amounts of space for internal metadata.
 .PP
-.BI "void vmem_pool_stats_print(VMEM *" vmp ", const char *" opts );
+.BI "void vmem_stats_print(VMEM *" vmp ", const char *" opts );
 .IP
 The
-.BR vmem_pool_stats_print ()
+.BR vmem_stats_print ()
 function produces messages containing statistics about the
 given memory pool.
 The output is printed using
@@ -594,7 +594,7 @@ The
 function is called by
 .B libvmem
 when the
-.BR vmem_pool_stats_print ()
+.BR vmem_stats_print ()
 entry point is used, or when additional tracing is enabled
 in the debug version of the library as described in the
 .B DEBUGGING
@@ -637,7 +637,7 @@ This is the default level when
 .B VMEM_LOG_LEVEL
 is not set.
 Only statistics are logged, and then only in response to a call to
-.BR vmem_pool_stats_print ().
+.BR vmem_stats_print ().
 .IP 1
 Additional details on any errors detected are logged (in addition
 to returning the errno-based errors as usual).
@@ -688,9 +688,9 @@ main()
     char *ptr;
 	
     /* create minimum size pool of memory */
-    if ((vmp = vmem_pool_create("/pmem-fs",
+    if ((vmp = vmem_create("/pmem-fs",
                                 VMEM_MIN_POOL)) == NULL) {
-        perror("vmem_pool_create");
+        perror("vmem_create");
         exit(1);
     }
 	
diff --git a/examples/libpmemblk/assetdb/asset_checkout.c b/examples/libpmemblk/assetdb/asset_checkout.c
index 239f77b7f..f39c4c0c3 100644
--- a/examples/libpmemblk/assetdb/asset_checkout.c
+++ b/examples/libpmemblk/assetdb/asset_checkout.c
@@ -64,7 +64,7 @@ main(int argc, char *argv[])
 
 	/* open an array of atomically writable elements */
 	if ((pbp = pmemblk_open(path, sizeof (struct asset))) == NULL) {
-		perror("pmemblk_pool_open");
+		perror("pmemblk_open");
 		exit(1);
 	}
 
diff --git a/examples/libpmemblk/assetdb/asset_load.c b/examples/libpmemblk/assetdb/asset_load.c
index 9fcf01a39..c2e0b4815 100644
--- a/examples/libpmemblk/assetdb/asset_load.c
+++ b/examples/libpmemblk/assetdb/asset_load.c
@@ -113,5 +113,5 @@ main(int argc, char *argv[])
 	free(line);
 	fclose(fp);
 
-	pmemblk_pool_close(pbp);
+	pmemblk_close(pbp);
 }
diff --git a/src/blk.c b/src/blk.c
index 75dabce55..a6c95c5da 100644
--- a/src/blk.c
+++ b/src/blk.c
@@ -235,7 +235,7 @@ static const struct ns_callback ns_cb = {
 };
 
 /*
- * pmemblk_pool_map_common -- (internal) map a block memory pool
+ * pmemblk_map_common -- (internal) map a block memory pool
  *
  * This routine does all the work, but takes a rdonly flag so internal
  * calls can map a read-only pool if required.
@@ -247,7 +247,7 @@ static const struct ns_callback ns_cb = {
  * will supply the block size).
  */
 static PMEMblkpool *
-pmemblk_pool_map_common(int fd, size_t poolsize, size_t bsize, int rdonly,
+pmemblk_map_common(int fd, size_t poolsize, size_t bsize, int rdonly,
 		int empty)
 {
 	LOG(3, "fd %d poolsize %zu bsize %zu rdonly %d empty %d",
@@ -432,10 +432,10 @@ err:
 }
 
 /*
- * pmemblk_pool_create -- create a block memory pool
+ * pmemblk_create -- create a block memory pool
  */
 PMEMblkpool *
-pmemblk_pool_create(const char *path, size_t bsize, size_t poolsize,
+pmemblk_create(const char *path, size_t bsize, size_t poolsize,
 		mode_t mode)
 {
 	LOG(3, "path %s bsize %zu poolsize %zu mode %d",
@@ -452,14 +452,14 @@ pmemblk_pool_create(const char *path, size_t bsize, size_t poolsize,
 	if (fd == -1)
 		return NULL;	/* errno set by util_pool_create/open() */
 
-	return pmemblk_pool_map_common(fd, poolsize, bsize, 0, 1);
+	return pmemblk_map_common(fd, poolsize, bsize, 0, 1);
 }
 
 /*
- * pmemblk_pool_open -- open a block memory pool
+ * pmemblk_open -- open a block memory pool
  */
 PMEMblkpool *
-pmemblk_pool_open(const char *path, size_t bsize)
+pmemblk_open(const char *path, size_t bsize)
 {
 	LOG(3, "path %s bsize %zu", path, bsize);
 
@@ -469,14 +469,14 @@ pmemblk_pool_open(const char *path, size_t bsize)
 	if ((fd = util_pool_open(path, &poolsize, PMEMBLK_MIN_POOL)) == -1)
 		return NULL;	/* errno set by util_pool_open() */
 
-	return pmemblk_pool_map_common(fd, poolsize, bsize, 0, 0);
+	return pmemblk_map_common(fd, poolsize, bsize, 0, 0);
 }
 
 /*
- * pmemblk_pool_close -- close a block memory pool
+ * pmemblk_close -- close a block memory pool
  */
 void
-pmemblk_pool_close(PMEMblkpool *pbp)
+pmemblk_close(PMEMblkpool *pbp)
 {
 	LOG(3, "pbp %p", pbp);
 
@@ -605,10 +605,10 @@ pmemblk_set_error(PMEMblkpool *pbp, off_t blockno)
 }
 
 /*
- * pmemblk_pool_check -- block memory pool consistency check
+ * pmemblk_check -- block memory pool consistency check
  */
 int
-pmemblk_pool_check(const char *path)
+pmemblk_check(const char *path)
 {
 	LOG(3, "path \"%s\"", path);
 
@@ -619,14 +619,14 @@ pmemblk_pool_check(const char *path)
 		return -1;	/* errno set by util_pool_open() */
 
 	/* map the pool read-only */
-	PMEMblkpool *pbp = pmemblk_pool_map_common(fd, poolsize, 0, 1, 0);
+	PMEMblkpool *pbp = pmemblk_map_common(fd, poolsize, 0, 1, 0);
 
 	if (pbp == NULL)
-		return -1;	/* errno set by pmemblk_pool_map_common() */
+		return -1;	/* errno set by pmemblk_map_common() */
 
 	int retval = btt_check(pbp->bttp);
 	int oerrno = errno;
-	pmemblk_pool_close(pbp);
+	pmemblk_close(pbp);
 	errno = oerrno;
 
 	return retval;
diff --git a/src/include/libpmemblk.h b/src/include/libpmemblk.h
index 846f5386d..08633ef12 100644
--- a/src/include/libpmemblk.h
+++ b/src/include/libpmemblk.h
@@ -69,11 +69,11 @@ const char *pmemblk_check_version(
 #define	PMEMBLK_MIN_POOL ((size_t)(1 << 30))	/* min pool size: 1GB */
 #define	PMEMBLK_MIN_BLK ((size_t)512)
 
-PMEMblkpool *pmemblk_pool_open(const char *path, size_t bsize);
-PMEMblkpool *pmemblk_pool_create(const char *path, size_t bsize,
+PMEMblkpool *pmemblk_open(const char *path, size_t bsize);
+PMEMblkpool *pmemblk_create(const char *path, size_t bsize,
 		size_t poolsize, mode_t mode);
-void pmemblk_pool_close(PMEMblkpool *pbp);
-int pmemblk_pool_check(const char *path);
+void pmemblk_close(PMEMblkpool *pbp);
+int pmemblk_check(const char *path);
 size_t pmemblk_nblock(PMEMblkpool *pbp);
 int pmemblk_read(PMEMblkpool *pbp, void *buf, off_t blockno);
 int pmemblk_write(PMEMblkpool *pbp, const void *buf, off_t blockno);
diff --git a/src/include/libpmemlog.h b/src/include/libpmemlog.h
index 57397a6b8..223fcb1d9 100644
--- a/src/include/libpmemlog.h
+++ b/src/include/libpmemlog.h
@@ -73,11 +73,10 @@ const char *pmemlog_check_version(
  */
 #define	PMEMLOG_MIN_POOL ((size_t)(1024 * 1024 * 2)) /* min pool size: 2MB */
 
-PMEMlogpool *pmemlog_pool_open(const char *path);
-PMEMlogpool *pmemlog_pool_create(const char *path, size_t poolsize,
-		mode_t mode);
-void pmemlog_pool_close(PMEMlogpool *plp);
-int pmemlog_pool_check(const char *path);
+PMEMlogpool *pmemlog_open(const char *path);
+PMEMlogpool *pmemlog_create(const char *path, size_t poolsize, mode_t mode);
+void pmemlog_close(PMEMlogpool *plp);
+int pmemlog_check(const char *path);
 size_t pmemlog_nbyte(PMEMlogpool *plp);
 int pmemlog_append(PMEMlogpool *plp, const void *buf, size_t count);
 int pmemlog_appendv(PMEMlogpool *plp, const struct iovec *iov, int iovcnt);
diff --git a/src/include/libpmemobj.h b/src/include/libpmemobj.h
index 6d115eaf5..aa9d8611a 100644
--- a/src/include/libpmemobj.h
+++ b/src/include/libpmemobj.h
@@ -69,11 +69,11 @@ const char *pmemobj_check_version(
 #define	PMEMOBJ_MIN_POOL ((size_t)(1 << 21))	/* min pool size: 2MB */
 #define	PMEMOBJ_LAYOUT_MAX ((size_t)1024)
 
-PMEMobjpool *pmemobj_pool_open(const char *path, const char *layout);
-PMEMobjpool *pmemobj_pool_create(const char *path, const char *layout,
+PMEMobjpool *pmemobj_open(const char *path, const char *layout);
+PMEMobjpool *pmemobj_create(const char *path, const char *layout,
 		size_t poolsize, mode_t mode);
-void pmemobj_pool_close(PMEMobjpool *pop);
-int pmemobj_pool_check(const char *path, const char *layout);
+void pmemobj_close(PMEMobjpool *pop);
+int pmemobj_check(const char *path, const char *layout);
 
 /*
  * Passing NULL to pmemobj_set_funcs() tells libpmemobj to continue to use the
diff --git a/src/include/libvmem.h b/src/include/libvmem.h
index ba70969bc..c51e21afa 100644
--- a/src/include/libvmem.h
+++ b/src/include/libvmem.h
@@ -55,12 +55,12 @@ typedef struct vmem VMEM;	/* opaque type internal to libvmem */
 
 #define	VMEM_MIN_POOL ((size_t)(1024 * 1024 * 14)) /* min pool size: 14MB */
 
-VMEM *vmem_pool_create(const char *dir, size_t size);
-VMEM *vmem_pool_create_in_region(void *addr, size_t size);
-void vmem_pool_delete(VMEM *vmp);
-int vmem_pool_check(VMEM *vmp);
-size_t vmem_pool_freespace(VMEM *vmp);
-void vmem_pool_stats_print(VMEM *vmp, const char *opts);
+VMEM *vmem_create(const char *dir, size_t size);
+VMEM *vmem_create_in_region(void *addr, size_t size);
+void vmem_delete(VMEM *vmp);
+int vmem_check(VMEM *vmp);
+size_t vmem_freespace(VMEM *vmp);
+void vmem_stats_print(VMEM *vmp, const char *opts);
 
 /*
  * support for malloc and friends...
@@ -96,7 +96,7 @@ const char *vmem_check_version(
  *
  * The print_func is called by libvmem based on the environment
  * variable VMEM_LOG_LEVEL:
- * 	0 or unset: print_func is only called for vmem_pool_stats_print()
+ * 	0 or unset: print_func is only called for vmem_stats_print()
  * 	1:          additional details are logged when errors are returned
  * 	2:          basic operations (allocations/frees) are logged
  * 	3:          produce very verbose tracing of function calls in libvmem
diff --git a/src/libpmemblk.map b/src/libpmemblk.map
index 28608d7da..cf3dff099 100644
--- a/src/libpmemblk.map
+++ b/src/libpmemblk.map
@@ -36,10 +36,10 @@ libpmemblk.so {
 	global:
 		pmemblk_check_version;
 		pmemblk_set_funcs;
-		pmemblk_pool_create;
-		pmemblk_pool_open;
-		pmemblk_pool_close;
-		pmemblk_pool_check;
+		pmemblk_create;
+		pmemblk_open;
+		pmemblk_close;
+		pmemblk_check;
 		pmemblk_nblock;
 		pmemblk_read;
 		pmemblk_write;
diff --git a/src/libpmemlog.map b/src/libpmemlog.map
index cfa39da9e..bd4f46556 100644
--- a/src/libpmemlog.map
+++ b/src/libpmemlog.map
@@ -36,10 +36,10 @@ libpmemlog.so {
 	global:
 		pmemlog_check_version;
 		pmemlog_set_funcs;
-		pmemlog_pool_create;
-		pmemlog_pool_open;
-		pmemlog_pool_close;
-		pmemlog_pool_check;
+		pmemlog_create;
+		pmemlog_open;
+		pmemlog_close;
+		pmemlog_check;
 		pmemlog_nbyte;
 		pmemlog_append;
 		pmemlog_appendv;
diff --git a/src/libpmemobj.map b/src/libpmemobj.map
index cc094b0ba..f0d6a0a6c 100644
--- a/src/libpmemobj.map
+++ b/src/libpmemobj.map
@@ -36,10 +36,10 @@ libpmemobj.so {
 	global:
 		pmemobj_check_version;
 		pmemobj_set_funcs;
-		pmemobj_pool_create;
-		pmemobj_pool_open;
-		pmemobj_pool_close;
-		pmemobj_pool_check;
+		pmemobj_create;
+		pmemobj_open;
+		pmemobj_close;
+		pmemobj_check;
 	local:
 		*;
 };
diff --git a/src/libvmem.map b/src/libvmem.map
index 1853d1a13..4e3c07c0f 100644
--- a/src/libvmem.map
+++ b/src/libvmem.map
@@ -34,12 +34,12 @@
 #
 libvmem.so {
 	global:
-		vmem_pool_create;
-		vmem_pool_create_in_region;
-		vmem_pool_delete;
-		vmem_pool_check;
-		vmem_pool_freespace;
-		vmem_pool_stats_print;
+		vmem_create;
+		vmem_create_in_region;
+		vmem_delete;
+		vmem_check;
+		vmem_freespace;
+		vmem_stats_print;
 		vmem_malloc;
 		vmem_free;
 		vmem_calloc;
diff --git a/src/log.c b/src/log.c
index 4c81f9853..62c09d309 100644
--- a/src/log.c
+++ b/src/log.c
@@ -56,7 +56,7 @@
 #include "log.h"
 
 /*
- * pmemlog_pool_map_common -- (internal) map a log memory pool
+ * pmemlog_map_common -- (internal) map a log memory pool
  *
  * This routine does all the work, but takes a rdonly flag so internal
  * calls can map a read-only pool if required.
@@ -65,7 +65,7 @@
  * a new pool header is created.  Otherwise, a valid header must exist.
  */
 static PMEMlogpool *
-pmemlog_pool_map_common(int fd, size_t poolsize, int rdonly, int empty)
+pmemlog_map_common(int fd, size_t poolsize, int rdonly, int empty)
 {
 	LOG(3, "fd %d poolsize %zu rdonly %d empty %d",
 			fd, poolsize, rdonly, empty);
@@ -225,10 +225,10 @@ err:
 }
 
 /*
- * pmemlog_pool_create -- create a log memory pool
+ * pmemlog_create -- create a log memory pool
  */
 PMEMlogpool *
-pmemlog_pool_create(const char *path, size_t poolsize, mode_t mode)
+pmemlog_create(const char *path, size_t poolsize, mode_t mode)
 {
 	LOG(3, "path %s poolsize %zu mode %d", path, poolsize, mode);
 
@@ -243,14 +243,14 @@ pmemlog_pool_create(const char *path, size_t poolsize, mode_t mode)
 	if (fd == -1)
 		return NULL;	/* errno set by util_pool_create/open() */
 
-	return pmemlog_pool_map_common(fd, poolsize, 0, 1);
+	return pmemlog_map_common(fd, poolsize, 0, 1);
 }
 
 /*
- * pmemlog_pool_open -- open an existing log memory pool
+ * pmemlog_open -- open an existing log memory pool
  */
 PMEMlogpool *
-pmemlog_pool_open(const char *path)
+pmemlog_open(const char *path)
 {
 	LOG(3, "path %s", path);
 
@@ -260,14 +260,14 @@ pmemlog_pool_open(const char *path)
 	if ((fd = util_pool_open(path, &poolsize, PMEMLOG_MIN_POOL)) == -1)
 		return NULL;	/* errno set by util_pool_open() */
 
-	return pmemlog_pool_map_common(fd, poolsize, 0, 0);
+	return pmemlog_map_common(fd, poolsize, 0, 0);
 }
 
 /*
- * pmemlog_pool_close -- close a log memory pool
+ * pmemlog_close -- close a log memory pool
  */
 void
-pmemlog_pool_close(PMEMlogpool *plp)
+pmemlog_close(PMEMlogpool *plp)
 {
 	LOG(3, "plp %p", plp);
 
@@ -591,13 +591,13 @@ pmemlog_walk(PMEMlogpool *plp, size_t chunksize,
 }
 
 /*
- * pmemlog_pool_check -- log memory pool consistency check
+ * pmemlog_check -- log memory pool consistency check
  *
  * Returns true if consistent, zero if inconsistent, -1/error if checking
  * cannot happen due to other errors.
  */
 int
-pmemlog_pool_check(const char *path)
+pmemlog_check(const char *path)
 {
 	LOG(3, "path \"%s\"", path);
 
@@ -608,10 +608,10 @@ pmemlog_pool_check(const char *path)
 		return -1;	/* errno set by util_pool_open() */
 
 	/* map the pool read-only */
-	PMEMlogpool *plp = pmemlog_pool_map_common(fd, poolsize, 1, 0);
+	PMEMlogpool *plp = pmemlog_map_common(fd, poolsize, 1, 0);
 
 	if (plp == NULL)
-		return -1;	/* errno set by pmemlog_pool_map_common() */
+		return -1;	/* errno set by pmemlog_map_common() */
 
 	int consistent = 1;
 
@@ -645,7 +645,7 @@ pmemlog_pool_check(const char *path)
 		consistent = 0;
 	}
 
-	pmemlog_pool_close(plp);
+	pmemlog_close(plp);
 
 	if (consistent)
 		LOG(4, "pool consistency check OK");
diff --git a/src/obj.c b/src/obj.c
index 288f4a5da..82d79f46f 100644
--- a/src/obj.c
+++ b/src/obj.c
@@ -52,7 +52,7 @@
 #include "obj.h"
 
 /*
- * pmemobj_pool_map_common -- (internal) map a transactional memory pool
+ * pmemobj_map_common -- (internal) map a transactional memory pool
  *
  * This routine does all the work, but takes a rdonly flag so internal
  * calls can map a read-only pool if required.
@@ -61,7 +61,7 @@
  * new pool header is created.  Otherwise, a valid header must exist.
  */
 static PMEMobjpool *
-pmemobj_pool_map_common(int fd, const char *layout, size_t poolsize, int rdonly,
+pmemobj_map_common(int fd, const char *layout, size_t poolsize, int rdonly,
 		int empty)
 {
 	LOG(3, "fd %d layout %s poolsize %zu rdonly %d empty %d",
@@ -200,10 +200,10 @@ err:
 }
 
 /*
- * pmemobj_pool_create -- create a transactional memory pool
+ * pmemobj_create -- create a transactional memory pool
  */
 PMEMobjpool *
-pmemobj_pool_create(const char *path, const char *layout, size_t poolsize,
+pmemobj_create(const char *path, const char *layout, size_t poolsize,
 		mode_t mode)
 {
 	LOG(3, "path %s layout %s poolsize %zu mode %d",
@@ -220,14 +220,14 @@ pmemobj_pool_create(const char *path, const char *layout, size_t poolsize,
 	if (fd == -1)
 		return NULL;	/* errno set by util_pool_create/open() */
 
-	return pmemobj_pool_map_common(fd, layout, poolsize, 0, 1);
+	return pmemobj_map_common(fd, layout, poolsize, 0, 1);
 }
 
 /*
- * pmemobj_pool_open -- open a transactional memory pool
+ * pmemobj_open -- open a transactional memory pool
  */
 PMEMobjpool *
-pmemobj_pool_open(const char *path, const char *layout)
+pmemobj_open(const char *path, const char *layout)
 {
 	LOG(3, "path %s layout %s", path, layout);
 
@@ -237,14 +237,14 @@ pmemobj_pool_open(const char *path, const char *layout)
 	if ((fd = util_pool_open(path, &poolsize, PMEMOBJ_MIN_POOL)) == -1)
 		return NULL;	/* errno set by util_pool_open() */
 
-	return pmemobj_pool_map_common(fd, layout, poolsize, 0, 0);
+	return pmemobj_map_common(fd, layout, poolsize, 0, 0);
 }
 
 /*
- * pmemobj_pool_close -- close a transactional memory pool
+ * pmemobj_close -- close a transactional memory pool
  */
 void
-pmemobj_pool_close(PMEMobjpool *pop)
+pmemobj_close(PMEMobjpool *pop)
 {
 	LOG(3, "pop %p", pop);
 
@@ -254,10 +254,10 @@ pmemobj_pool_close(PMEMobjpool *pop)
 }
 
 /*
- * pmemobj_pool_check -- transactional memory pool consistency check
+ * pmemobj_check -- transactional memory pool consistency check
  */
 int
-pmemobj_pool_check(const char *path, const char *layout)
+pmemobj_check(const char *path, const char *layout)
 {
 	LOG(3, "path %s layout %s", path, layout);
 
@@ -268,16 +268,16 @@ pmemobj_pool_check(const char *path, const char *layout)
 		return -1;	/* errno set by util_pool_open() */
 
 	/* map the pool read-only */
-	PMEMobjpool *pop = pmemobj_pool_map_common(fd, layout, poolsize, 1, 0);
+	PMEMobjpool *pop = pmemobj_map_common(fd, layout, poolsize, 1, 0);
 
 	if (pop == NULL)
-		return -1;	/* errno set by pmemobj_pool_map_common() */
+		return -1;	/* errno set by pmemobj_map_common() */
 
 	int consistent = 1;
 
 	/* XXX validate metadata */
 
-	pmemobj_pool_close(pop);
+	pmemobj_close(pop);
 
 	if (consistent)
 		LOG(4, "pool consistency check OK");
diff --git a/src/test/Makefile b/src/test/Makefile
index 00eceaeba..aae2bba3a 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -46,7 +46,7 @@ TEST = blk_nblock\
        pmem_isa_proc\
        pmem_is_pmem\
        pmem_is_pmem_proc\
-       pmem_map_raw\
+       pmem_map\
        scope\
        traces\
        traces_custom_function\
@@ -64,10 +64,10 @@ TEST = blk_nblock\
        vmem_mix_allocations\
        vmem_multiple_pools\
        vmem_out_of_memory\
-       vmem_pool_check\
-       vmem_pool_create\
-       vmem_pool_create_error\
-       vmem_pool_create_in_region\
+       vmem_check\
+       vmem_create\
+       vmem_create_error\
+       vmem_create_in_region\
        vmem_realloc\
        vmem_stats\
        vmem_strdup\
diff --git a/src/test/blk_nblock/README b/src/test/blk_nblock/README
index e325d53aa..4dfd430ba 100644
--- a/src/test/blk_nblock/README
+++ b/src/test/blk_nblock/README
@@ -9,5 +9,5 @@ For example:
 
 	./blk_nblock 4096:file1
 
-this will call pmemblk_pool_open() on file1 and then report what pmemblk_nblock()
+this will call pmemblk_open() on file1 and then report what pmemblk_nblock()
 reports back as the usable size.
diff --git a/src/test/blk_nblock/blk_nblock.c b/src/test/blk_nblock/blk_nblock.c
index b6fbd0026..c0f2bde3c 100644
--- a/src/test/blk_nblock/blk_nblock.c
+++ b/src/test/blk_nblock/blk_nblock.c
@@ -134,19 +134,18 @@ main(int argc, char *argv[])
 		fname++;
 
 		PMEMblkpool *handle;
-		handle = pmemblk_pool_create(fname, bsize, 0, S_IWUSR);
+		handle = pmemblk_create(fname, bsize, 0, S_IWUSR);
 		if (handle == NULL) {
-			OUT("!%s: pmemblk_pool_create", fname);
+			OUT("!%s: pmemblk_create", fname);
 		} else {
 			OUT("%s: block size %zu usable blocks: %zu",
 					fname, bsize, pmemblk_nblock(handle));
-			pmemblk_pool_close(handle);
-			int result = pmemblk_pool_check(fname);
+			pmemblk_close(handle);
+			int result = pmemblk_check(fname);
 			if (result < 0)
-				OUT("!%s: pmemblk_pool_check", fname);
+				OUT("!%s: pmemblk_check", fname);
 			else if (result == 0)
-				OUT("%s: pmemblk_pool_check: not consistent",
-						fname);
+				OUT("%s: pmemblk_check: not consistent", fname);
 		}
 	}
 
diff --git a/src/test/blk_nblock/out0.log.match b/src/test/blk_nblock/out0.log.match
index 47fb2f6f5..fbd71ab73 100644
--- a/src/test/blk_nblock/out0.log.match
+++ b/src/test/blk_nblock/out0.log.match
@@ -1,8 +1,8 @@
 blk_nblock/TEST0: START: blk_nblock
  ./blk_nblock$(*) 512:$(*)/testfile1 512:$(*)/testfile2.512 4096:$(*)/testfile2.512 520:$(*)/testfile2.520 528:$(*)/testfile2.528 4096:$(*)/testfile2.4096 4160:$(*)/testfile2.4160 4224:$(*)/testfile2.4224 512:$(*)/testfile3.512 520:$(*)/testfile3.520 528:$(*)/testfile3.528 4096:$(*)/testfile3.4096 4160:$(*)/testfile3.4160 4224:$(*)/testfile3.4224 512:$(*)/testfile4.512 520:$(*)/testfile4.520 528:$(*)/testfile4.528 4096:$(*)/testfile4.4096 4160:$(*)/testfile4.4160 4224:$(*)/testfile4.4224 512:$(*)/testfile5.512 520:$(*)/testfile5.520 528:$(*)/testfile5.528 4096:$(*)/testfile5.4096 4160:$(*)/testfile5.4160 4224:$(*)/testfile5.4224 512:$(*)/testfile6.512 520:$(*)/testfile6.520 528:$(*)/testfile6.528 4096:$(*)/testfile6.4096 4160:$(*)/testfile6.4160 4224:$(*)/testfile6.4224
-$(*)/testfile1: pmemblk_pool_create: Invalid argument
+$(*)/testfile1: pmemblk_create: Invalid argument
 $(*)/testfile2.512: block size 512 usable blocks: 4161462
-$(*)/testfile2.512: pmemblk_pool_create: Invalid argument
+$(*)/testfile2.512: pmemblk_create: Invalid argument
 $(*)/testfile2.520: block size 520 usable blocks: 2781410
 $(*)/testfile2.528: block size 528 usable blocks: 2781410
 $(*)/testfile2.4096: block size 4096 usable blocks: 523511
diff --git a/src/test/blk_nblock/out1.log.match b/src/test/blk_nblock/out1.log.match
index 4ce2e52f3..f082c181f 100644
--- a/src/test/blk_nblock/out1.log.match
+++ b/src/test/blk_nblock/out1.log.match
@@ -1,22 +1,22 @@
 blk_nblock/TEST1: START: blk_nblock
  ./blk_nblock$(*) 2096896:$(*)/testfile1.2096896 2096897:$(*)/testfile1.2096897 0:$(*)/testfile2.0 1:$(*)/testfile2.1 17:$(*)/testfile2.17 511:$(*)/testfile2.511 1048576:$(*)/testfile2.1048576 2097152:$(*)/testfile2.2097152 4194304:$(*)/testfile2.4194304 8388608:$(*)/testfile2.8388608 16777216:$(*)/testfile2.16777216 33554432:$(*)/testfile2.33554432 67108864:$(*)/testfile2.67108864 134217728:$(*)/testfile2.134217728 268435456:$(*)/testfile2.268435456 536870912:$(*)/testfile2.536870912 1073741824:$(*)/testfile2.1073741824 2147483648:$(*)/testfile2.2147483648 -1:$(*)/testfile2.-1
 $(*)/testfile1.2096896: block size 2096896 usable blocks: 256
-$(*)/testfile1.2096897: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.0: pmemblk_pool_create: Invalid argument
+$(*)/testfile1.2096897: pmemblk_create: Invalid argument
+$(*)/testfile2.0: pmemblk_create: Invalid argument
 $(*)/testfile2.1: block size 1 usable blocks: 4161462
 $(*)/testfile2.17: block size 17 usable blocks: 4161462
 $(*)/testfile2.511: block size 511 usable blocks: 4161462
 $(*)/testfile2.1048576: block size 1048576 usable blocks: 1791
 $(*)/testfile2.2097152: block size 2097152 usable blocks: 767
-$(*)/testfile2.4194304: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.8388608: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.16777216: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.33554432: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.67108864: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.134217728: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.268435456: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.536870912: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.1073741824: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.2147483648: pmemblk_pool_create: Invalid argument
-$(*)/testfile2.-1: pmemblk_pool_create: Invalid argument
+$(*)/testfile2.4194304: pmemblk_create: Invalid argument
+$(*)/testfile2.8388608: pmemblk_create: Invalid argument
+$(*)/testfile2.16777216: pmemblk_create: Invalid argument
+$(*)/testfile2.33554432: pmemblk_create: Invalid argument
+$(*)/testfile2.67108864: pmemblk_create: Invalid argument
+$(*)/testfile2.134217728: pmemblk_create: Invalid argument
+$(*)/testfile2.268435456: pmemblk_create: Invalid argument
+$(*)/testfile2.536870912: pmemblk_create: Invalid argument
+$(*)/testfile2.1073741824: pmemblk_create: Invalid argument
+$(*)/testfile2.2147483648: pmemblk_create: Invalid argument
+$(*)/testfile2.-1: pmemblk_create: Invalid argument
 blk_nblock/TEST1: Done
diff --git a/src/test/blk_recovery/README b/src/test/blk_recovery/README
index ea65a9781..e0e3566d7 100644
--- a/src/test/blk_recovery/README
+++ b/src/test/blk_recovery/README
@@ -13,11 +13,11 @@ For example:
 
 	./blk_recovery 4096 file1 5 10
 
-this will call pmemblk_pool_open() on file1, call pmemblk_write() for LBA 5
+this will call pmemblk_open() on file1, call pmemblk_write() for LBA 5
 (causing all the layout to be written), then it will change the memory
 protection on the arena map area to read-only.  Next, pmemblk_write()
 is called for for LBA 10 and SIGSEGV is caught and reported.  Finally,
-pmemblk_pool_check() is called.
+pmemblk_check() is called.
 
 This is not a perfect simulation of a system interruption, but does allow
 creating a file where a write was interrupted before updating the map.
diff --git a/src/test/blk_recovery/TEST0 b/src/test/blk_recovery/TEST0
index 7715888c9..d591cd53c 100755
--- a/src/test/blk_recovery/TEST0
+++ b/src/test/blk_recovery/TEST0
@@ -51,7 +51,7 @@ rm -f $DIR/testfile1
 truncate -s 2G $DIR/testfile1
 
 #
-# Simple case, one write interrupted.  pmemblk_pool_check() should note
+# Simple case, one write interrupted.  pmemblk_check() should note
 # that testfile1 is consistent (after recovery steps were taken).
 #
 expect_normal_exit ./blk_recovery$EXESUFFIX 4096 $DIR/testfile1 5 10
diff --git a/src/test/blk_recovery/blk_recovery.c b/src/test/blk_recovery/blk_recovery.c
index 0ae50aa7e..dbd7c273c 100644
--- a/src/test/blk_recovery/blk_recovery.c
+++ b/src/test/blk_recovery/blk_recovery.c
@@ -108,8 +108,8 @@ main(int argc, char *argv[])
 	const char *path = argv[2];
 
 	PMEMblkpool *handle;
-	if ((handle = pmemblk_pool_create(path, Bsize, 0, S_IWUSR)) == NULL)
-		FATAL("!%s: pmemblk_pool_create", path);
+	if ((handle = pmemblk_create(path, Bsize, 0, S_IWUSR)) == NULL)
+		FATAL("!%s: pmemblk_create", path);
 
 	OUT("%s block size %zu usable blocks %zu",
 			argv[1], Bsize, pmemblk_nblock(handle));
@@ -151,13 +151,13 @@ main(int argc, char *argv[])
 			FATAL("write     lba %zu: %s", lba, ident(buf));
 	}
 
-	pmemblk_pool_close(handle);
+	pmemblk_close(handle);
 
-	int result = pmemblk_pool_check(path);
+	int result = pmemblk_check(path);
 	if (result < 0)
-		OUT("!%s: pmemblk_pool_check", path);
+		OUT("!%s: pmemblk_check", path);
 	else if (result == 0)
-		OUT("%s: pmemblk_pool_check: not consistent", path);
+		OUT("%s: pmemblk_check: not consistent", path);
 	else
 		OUT("%s: consistent", path);
 
diff --git a/src/test/blk_rw/README b/src/test/blk_rw/README
index e1e89e2e3..f10579997 100644
--- a/src/test/blk_rw/README
+++ b/src/test/blk_rw/README
@@ -9,7 +9,7 @@ operation:LBA pairs.  For example:
 
 	./blk_rw 4096 file1 r:0 w:5 z:9 e:100
 
-this will call pmemblk_pool_open() on file1 and then pmemblk_read() for LBA 0,
+this will call pmemblk_open() on file1 and then pmemblk_read() for LBA 0,
 pmemblk_write() for LBA 5, pmemblk_set_zero() for LBA 9, and pmem_set_error()
 for LAB 100.
 
diff --git a/src/test/blk_rw/blk_rw.c b/src/test/blk_rw/blk_rw.c
index cf04a3d6a..090cfaa90 100644
--- a/src/test/blk_rw/blk_rw.c
+++ b/src/test/blk_rw/blk_rw.c
@@ -172,14 +172,14 @@ main(int argc, char *argv[])
 	PMEMblkpool *handle;
 	switch (*argv[3]) {
 		case 'c':
-			handle = pmemblk_pool_create(path, Bsize, 0, S_IWUSR);
+			handle = pmemblk_create(path, Bsize, 0, S_IWUSR);
 			if (handle == NULL)
-				FATAL("!%s: pmemblk_pool_create", path);
+				FATAL("!%s: pmemblk_create", path);
 			break;
 		case 'o':
-			handle = pmemblk_pool_open(path, Bsize);
+			handle = pmemblk_open(path, Bsize);
 			if (handle == NULL)
-				FATAL("!%s: pmemblk_pool_open", path);
+				FATAL("!%s: pmemblk_open", path);
 			break;
 	}
 
@@ -226,13 +226,13 @@ main(int argc, char *argv[])
 		}
 	}
 
-	pmemblk_pool_close(handle);
+	pmemblk_close(handle);
 
-	int result = pmemblk_pool_check(path);
+	int result = pmemblk_check(path);
 	if (result < 0)
-		OUT("!%s: pmemblk_pool_check", path);
+		OUT("!%s: pmemblk_check", path);
 	else if (result == 0)
-		OUT("%s: pmemblk_pool_check: not consistent", path);
+		OUT("%s: pmemblk_check: not consistent", path);
 
 	DONE(NULL);
 }
diff --git a/src/test/blk_rw_mt/blk_rw_mt.c b/src/test/blk_rw_mt/blk_rw_mt.c
index cb06e331b..87e9c9e35 100644
--- a/src/test/blk_rw_mt/blk_rw_mt.c
+++ b/src/test/blk_rw_mt/blk_rw_mt.c
@@ -119,8 +119,8 @@ main(int argc, char *argv[])
 
 	const char *path = argv[2];
 
-	if ((Handle = pmemblk_pool_create(path, Bsize, 0, S_IWUSR)) == NULL)
-		FATAL("!%s: pmemblk_pool_create", path);
+	if ((Handle = pmemblk_create(path, Bsize, 0, S_IWUSR)) == NULL)
+		FATAL("!%s: pmemblk_create", path);
 
 	if (Nblock == 0)
 		Nblock = pmemblk_nblock(Handle);
@@ -140,14 +140,14 @@ main(int argc, char *argv[])
 	for (int i = 0; i < Nthread; i++)
 		PTHREAD_JOIN(threads[i], NULL);
 
-	pmemblk_pool_close(Handle);
+	pmemblk_close(Handle);
 
 	/* XXX not ready to pass this part of the test yet */
-	int result = pmemblk_pool_check(path);
+	int result = pmemblk_check(path);
 	if (result < 0)
-		OUT("!%s: pmemblk_pool_check", path);
+		OUT("!%s: pmemblk_check", path);
 	else if (result == 0)
-		OUT("%s: pmemblk_pool_check: not consistent", path);
+		OUT("%s: pmemblk_check: not consistent", path);
 
 	DONE(NULL);
 }
diff --git a/src/test/log_basic/README b/src/test/log_basic/README
index 919c5078b..74f9759f4 100644
--- a/src/test/log_basic/README
+++ b/src/test/log_basic/README
@@ -3,15 +3,15 @@ Linux NVM Library
 This is src/test/log_basic/README.
 
 This directory contains a unit test for:
-- pmemlog_pool_open
-- pmemlog_pool_close
+- pmemlog_open
+- pmemlog_close
 - pmemlog_nbyte
 - pmemlog_append
 - pmemlog_appendv
 - pmemlog_tell
 - pmemlog_rewind
 - pmemlog_walk
-- pmemlog_pool_check
+- pmemlog_check
 
 
 The program in pmemlog.c takes a file name and a list of
diff --git a/src/test/log_basic/TEST0 b/src/test/log_basic/TEST0
index cd2bab439..31f60aaec 100755
--- a/src/test/log_basic/TEST0
+++ b/src/test/log_basic/TEST0
@@ -38,9 +38,9 @@
 # - pmemlog_walk
 # - pmemlog_rewind
 # in case of empty pool and:
-# - pmemlog_pool_check
-# - pmemlog_pool_open
-# - pmemlog_pool_close
+# - pmemlog_check
+# - pmemlog_open
+# - pmemlog_close
 #
 export UNITTEST_NAME=log_basic/TEST0
 export UNITTEST_NUM=0
diff --git a/src/test/log_basic/TEST1 b/src/test/log_basic/TEST1
index b512f147e..4d7fc9e16 100755
--- a/src/test/log_basic/TEST1
+++ b/src/test/log_basic/TEST1
@@ -40,9 +40,9 @@
 # - pmemlog_walk
 # - pmemlog_rewind
 # in case of non-empty pool and
-# - pmemlog_pool_check
-# - pmemlog_pool_open
-# - pmemlog_pool_close
+# - pmemlog_check
+# - pmemlog_open
+# - pmemlog_close
 #
 export UNITTEST_NAME=log_basic/TEST1
 export UNITTEST_NUM=1
diff --git a/src/test/log_basic/TEST2 b/src/test/log_basic/TEST2
index b9615bca3..74076e0ea 100755
--- a/src/test/log_basic/TEST2
+++ b/src/test/log_basic/TEST2
@@ -40,9 +40,9 @@
 # - pmemlog_walk
 # - pmemlog_rewind
 # in case of non-empty pool and
-# - pmemlog_pool_check
-# - pmemlog_pool_open
-# - pmemlog_pool_close
+# - pmemlog_check
+# - pmemlog_open
+# - pmemlog_close
 #
 export UNITTEST_NAME=log_basic/TEST2
 export UNITTEST_NUM=2
diff --git a/src/test/log_basic/TEST3 b/src/test/log_basic/TEST3
index dd49d9ab6..2ddd831d5 100755
--- a/src/test/log_basic/TEST3
+++ b/src/test/log_basic/TEST3
@@ -41,9 +41,9 @@
 # - pmemlog_walk
 # - pmemlog_rewind
 # in case of non-empty pool and
-# - pmemlog_pool_check
-# - pmemlog_pool_open
-# - pmemlog_pool_close
+# - pmemlog_check
+# - pmemlog_open
+# - pmemlog_close
 #
 export UNITTEST_NAME=log_basic/TEST3
 export UNITTEST_NUM=3
diff --git a/src/test/log_basic/log_basic.c b/src/test/log_basic/log_basic.c
index a2121536e..f2ee587e6 100644
--- a/src/test/log_basic/log_basic.c
+++ b/src/test/log_basic/log_basic.c
@@ -205,11 +205,11 @@ main(int argc, char *argv[])
 
 	const char *path = argv[1];
 	/* check consistency */
-	result = pmemlog_pool_check(path);
+	result = pmemlog_check(path);
 	if (result < 0)
-		OUT("!%s: pmemlog_pool_check", path);
+		OUT("!%s: pmemlog_check", path);
 	else if (result == 0)
-		OUT("%s: pmemlog_pool_check: not consistent", path);
+		OUT("%s: pmemlog_check: not consistent", path);
 
 	int fd = OPEN(path, O_RDWR);
 
@@ -220,8 +220,8 @@ main(int argc, char *argv[])
 
 	CLOSE(fd);
 
-	if ((plp = pmemlog_pool_create(path, 0, S_IWUSR)) == NULL)
-		FATAL("!pmemlog_pool_create: %s", path);
+	if ((plp = pmemlog_create(path, 0, S_IWUSR)) == NULL)
+		FATAL("!pmemlog_create: %s", path);
 
 	/* go through all arguments one by one */
 	for (int arg = 2; arg < argc; arg++) {
@@ -257,14 +257,14 @@ main(int argc, char *argv[])
 		}
 	}
 
-	pmemlog_pool_close(plp);
+	pmemlog_close(plp);
 
 	/* check consistency again */
-	result = pmemlog_pool_check(path);
+	result = pmemlog_check(path);
 	if (result < 0)
-		OUT("!%s: pmemlog_pool_check", path);
+		OUT("!%s: pmemlog_check", path);
 	else if (result == 0)
-		OUT("%s: pmemlog_pool_check: not consistent", path);
+		OUT("%s: pmemlog_check: not consistent", path);
 
 	DONE(NULL);
 }
diff --git a/src/test/log_basic/out0.log.match b/src/test/log_basic/out0.log.match
index 47c5f4b28..b21758a45 100644
--- a/src/test/log_basic/out0.log.match
+++ b/src/test/log_basic/out0.log.match
@@ -1,6 +1,6 @@
 log_basic/TEST0: START: log_basic
  ./log_basic$(*) $(*)/testfile1 n t w r
-$(*)/testfile1: pmemlog_pool_check: Invalid argument
+$(*)/testfile1: pmemlog_check: Invalid argument
 usable size: 2088960
 tell 0
 
diff --git a/src/test/log_basic/out1.log.match b/src/test/log_basic/out1.log.match
index d41af3749..57ddee3aa 100644
--- a/src/test/log_basic/out1.log.match
+++ b/src/test/log_basic/out1.log.match
@@ -1,6 +1,6 @@
 log_basic/TEST1: START: log_basic
  ./log_basic$(*) $(*)/testfile1 a n t w r t w
-$(*)/testfile1: pmemlog_pool_check: Invalid argument
+$(*)/testfile1: pmemlog_check: Invalid argument
 append   str[0] 1st test string
 
 append   str[1] 2nd test string
diff --git a/src/test/log_basic/out2.log.match b/src/test/log_basic/out2.log.match
index fa7dea59b..ac8e1fb83 100644
--- a/src/test/log_basic/out2.log.match
+++ b/src/test/log_basic/out2.log.match
@@ -1,6 +1,6 @@
 log_basic/TEST2: START: log_basic
  ./log_basic$(*) $(*)/testfile1 v n t w r t w
-$(*)/testfile1: pmemlog_pool_check: Invalid argument
+$(*)/testfile1: pmemlog_check: Invalid argument
 appendv
 usable size: 2088960
 tell 144
diff --git a/src/test/log_basic/out3.log.match b/src/test/log_basic/out3.log.match
index ec55d774a..d05683a07 100644
--- a/src/test/log_basic/out3.log.match
+++ b/src/test/log_basic/out3.log.match
@@ -1,6 +1,6 @@
 log_basic/TEST3: START: log_basic
  ./log_basic$(*) $(*)/testfile1 a n t w r t w v n t w r t w
-$(*)/testfile1: pmemlog_pool_check: Invalid argument
+$(*)/testfile1: pmemlog_check: Invalid argument
 append   str[0] 1st test string
 
 append   str[1] 2nd test string
diff --git a/src/test/log_recovery/README b/src/test/log_recovery/README
index 08d5a86b7..41dee4880 100644
--- a/src/test/log_recovery/README
+++ b/src/test/log_recovery/README
@@ -12,9 +12,9 @@ pmemlog_appendv() will be used to do that. For example:
 
 	./log_recovery file1 a
 
-this will call pmemlog_pool_open() on file1, call pmemlog_append() to append
+this will call pmemlog_open() on file1, call pmemlog_append() to append
 six strings to the log and pmemlog_tell() to check the current write point,
 then it will change the memory protection on the metadata area to read-only.
 Next, pmemlog_append() is called again and SIGSEGV is caught and reported.
-Finally, pmemblk_pool_check() and pmemlog_tell() are called to make sure
-there are no partial log entries.
+Finally, pmemblk_check() and pmemlog_tell() are called to make sure there are
+no partial log entries.
diff --git a/src/test/log_recovery/log_recovery.c b/src/test/log_recovery/log_recovery.c
index 635c75ba3..2b5e51ba4 100644
--- a/src/test/log_recovery/log_recovery.c
+++ b/src/test/log_recovery/log_recovery.c
@@ -209,8 +209,8 @@ main(int argc, char *argv[])
 
 	CLOSE(fd);
 
-	if ((plp = pmemlog_pool_create(path, 0, S_IWUSR)) == NULL)
-		FATAL("!pmemlog_pool_create: %s", path);
+	if ((plp = pmemlog_create(path, 0, S_IWUSR)) == NULL)
+		FATAL("!pmemlog_create: %s", path);
 
 	/* append some data */
 	if (argv[2][0] == 'a')
@@ -238,20 +238,20 @@ main(int argc, char *argv[])
 			do_appendv(plp);
 	}
 
-	pmemlog_pool_close(plp);
+	pmemlog_close(plp);
 
 	/* check consistency */
-	result = pmemlog_pool_check(path);
+	result = pmemlog_check(path);
 	if (result < 0)
-		OUT("!%s: pmemlog_pool_check", path);
+		OUT("!%s: pmemlog_check", path);
 	else if (result == 0)
-		OUT("%s: pmemlog_pool_check: not consistent", path);
+		OUT("%s: pmemlog_check: not consistent", path);
 	else
 		OUT("%s: consistent", path);
 
 	/* map again to print out whole log */
-	if ((plp = pmemlog_pool_open(path)) == NULL)
-		FATAL("!pmemlog_pool_open: %s", path);
+	if ((plp = pmemlog_open(path)) == NULL)
+		FATAL("!pmemlog_open: %s", path);
 
 	/* print out current write point */
 	do_tell(plp);
@@ -259,7 +259,7 @@ main(int argc, char *argv[])
 	/* print out whole log */
 	do_walk(plp);
 
-	pmemlog_pool_close(plp);
+	pmemlog_close(plp);
 
 	DONE(NULL);
 }
diff --git a/src/test/log_walker/README b/src/test/log_walker/README
index 033182c24..e24ee13b1 100644
--- a/src/test/log_walker/README
+++ b/src/test/log_walker/README
@@ -9,6 +9,6 @@ The program in log_walker.c takes only a file name as an argument. For example:
 
 	./log_walker file1
 
-this calls pmemlog_pool_open() on file1 and pmemlog_append() to append six strings
+this calls pmemlog_open() on file1 and pmemlog_append() to append six strings
 to the log. Next pmemlog_walk() is called and the walk handler tries to store
 to the buffer and SIGSEGV is caught and reported.
diff --git a/src/test/log_walker/log_walker.c b/src/test/log_walker/log_walker.c
index 9964221d0..a79393f05 100644
--- a/src/test/log_walker/log_walker.c
+++ b/src/test/log_walker/log_walker.c
@@ -127,8 +127,8 @@ main(int argc, char *argv[])
 
 	CLOSE(fd);
 
-	if ((plp = pmemlog_pool_create(path, 0, S_IWUSR)) == NULL)
-		FATAL("!pmemlog_pool_create: %s", path);
+	if ((plp = pmemlog_create(path, 0, S_IWUSR)) == NULL)
+		FATAL("!pmemlog_create: %s", path);
 
 	/* append some data */
 	do_append(plp);
@@ -142,7 +142,7 @@ main(int argc, char *argv[])
 		do_walk(plp);
 	}
 
-	pmemlog_pool_close(plp);
+	pmemlog_close(plp);
 
 	DONE(NULL);
 }
diff --git a/src/test/pmem_map/.gitignore b/src/test/pmem_map/.gitignore
new file mode 100644
index 000000000..e293c6e0a
--- /dev/null
+++ b/src/test/pmem_map/.gitignore
@@ -0,0 +1 @@
+pmem_map
diff --git a/src/test/pmem_map_raw/Makefile b/src/test/pmem_map/Makefile
similarity index 92%
rename from src/test/pmem_map_raw/Makefile
rename to src/test/pmem_map/Makefile
index 4a580892b..908f0432a 100644
--- a/src/test/pmem_map_raw/Makefile
+++ b/src/test/pmem_map/Makefile
@@ -31,13 +31,13 @@
 #
 
 #
-# src/test/pmem_map_raw/Makefile -- build pmem_map() unit test
+# src/test/pmem_map/Makefile -- build pmem_map() unit test
 #
-TARGET = pmem_map_raw
-OBJS = pmem_map_raw.o
+TARGET = pmem_map
+OBJS = pmem_map.o
 
 LIBPMEM=y
 
 include ../Makefile.inc
 
-pmem_map_raw.o: pmem_map_raw.c
+pmem_map.o: pmem_map.c
diff --git a/src/test/pmem_map_raw/README b/src/test/pmem_map/README
similarity index 83%
rename from src/test/pmem_map_raw/README
rename to src/test/pmem_map/README
index de39142c7..418ef026a 100644
--- a/src/test/pmem_map_raw/README
+++ b/src/test/pmem_map/README
@@ -1,10 +1,10 @@
 Linux NVM Library
 
-This is src/test/pmem_map_raw/README.
+This is src/test/pmem_map/README.
 
 This directory contains a unit test for pmem_map().
 
-The program in pmem_map_raw.c takes a file name as an argument.
+The program in pmem_map.c takes a file name as an argument.
 
 Initially, the first 4k of the file is populated with some pattern
 using write(). The file content is verified after successful mapping
diff --git a/src/test/pmem_map_raw/TEST0 b/src/test/pmem_map/TEST0
similarity index 91%
rename from src/test/pmem_map_raw/TEST0
rename to src/test/pmem_map/TEST0
index 7ca4bf15a..1a62b9475 100755
--- a/src/test/pmem_map_raw/TEST0
+++ b/src/test/pmem_map/TEST0
@@ -32,9 +32,9 @@
 #
 
 #
-# src/test/pmem_map_raw/TEST0 -- unit test for pmem_map
+# src/test/pmem_map/TEST0 -- unit test for pmem_map
 #
-export UNITTEST_NAME=pmem_map_raw/TEST0
+export UNITTEST_NAME=pmem_map/TEST0
 export UNITTEST_NUM=0
 
 # standard unit test setup
@@ -47,7 +47,7 @@ setup
 rm -f $DIR/testfile1
 truncate -s 2G $DIR/testfile1
 
-expect_normal_exit ./pmem_map_raw$EXESUFFIX $DIR/testfile1
+expect_normal_exit ./pmem_map$EXESUFFIX $DIR/testfile1
 
 rm $DIR/testfile1
 
diff --git a/src/test/pmem_map_raw/TEST1 b/src/test/pmem_map/TEST1
similarity index 92%
rename from src/test/pmem_map_raw/TEST1
rename to src/test/pmem_map/TEST1
index 45174717f..cd8c0eb38 100755
--- a/src/test/pmem_map_raw/TEST1
+++ b/src/test/pmem_map/TEST1
@@ -32,9 +32,9 @@
 #
 
 #
-# src/test/pmem_map_raw/TEST1 -- unit test for pmem_map
+# src/test/pmem_map/TEST1 -- unit test for pmem_map
 #
-export UNITTEST_NAME=pmem_map_raw/TEST1
+export UNITTEST_NAME=pmem_map/TEST1
 export UNITTEST_NUM=1
 
 # standard unit test setup
@@ -48,7 +48,7 @@ rm -f $DIR/testfile1
 touch $DIR/testfile1
 
 # pass the file of zero length
-expect_normal_exit ./pmem_map_raw$EXESUFFIX $DIR/testfile1
+expect_normal_exit ./pmem_map$EXESUFFIX $DIR/testfile1
 
 rm $DIR/testfile1
 
diff --git a/src/test/pmem_map_raw/err0.log.match b/src/test/pmem_map/err0.log.match
similarity index 100%
rename from src/test/pmem_map_raw/err0.log.match
rename to src/test/pmem_map/err0.log.match
diff --git a/src/test/pmem_map_raw/err1.log.match b/src/test/pmem_map/err1.log.match
similarity index 100%
rename from src/test/pmem_map_raw/err1.log.match
rename to src/test/pmem_map/err1.log.match
diff --git a/src/test/pmem_map/out0.log.match b/src/test/pmem_map/out0.log.match
new file mode 100644
index 000000000..023e858ad
--- /dev/null
+++ b/src/test/pmem_map/out0.log.match
@@ -0,0 +1,3 @@
+pmem_map/TEST0: START: pmem_map
+ ./pmem_map$(*) $(*)/testfile1
+pmem_map/TEST0: Done
diff --git a/src/test/pmem_map/out1.log.match b/src/test/pmem_map/out1.log.match
new file mode 100644
index 000000000..8cbab9090
--- /dev/null
+++ b/src/test/pmem_map/out1.log.match
@@ -0,0 +1,4 @@
+pmem_map/TEST1: START: pmem_map
+ ./pmem_map$(*) $(*)/testfile1
+pmem_map: Invalid argument
+pmem_map/TEST1: Done
diff --git a/src/test/pmem_map_raw/pmem_map_raw.c b/src/test/pmem_map/pmem_map.c
similarity index 95%
rename from src/test/pmem_map_raw/pmem_map_raw.c
rename to src/test/pmem_map/pmem_map.c
index d3ec40a61..9324edbb6 100644
--- a/src/test/pmem_map_raw/pmem_map_raw.c
+++ b/src/test/pmem_map/pmem_map.c
@@ -31,9 +31,9 @@
  */
 
 /*
- * pmem_map_raw.c -- unit test for mapping persistent memory for raw access
+ * pmem_map.c -- unit test for mapping persistent memory for raw access
  *
- * usage: pmem_map_raw file
+ * usage: pmem_map file
  */
 
 #include "unittest.h"
@@ -43,7 +43,7 @@
 int
 main(int argc, char *argv[])
 {
-	START(argc, argv, "pmem_map_raw");
+	START(argc, argv, "pmem_map");
 
 	if (argc != 2)
 		FATAL("usage: %s file", argv[0]);
diff --git a/src/test/pmem_map_raw/.gitignore b/src/test/pmem_map_raw/.gitignore
deleted file mode 100644
index a288a1bb9..000000000
--- a/src/test/pmem_map_raw/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-pmem_map_raw
diff --git a/src/test/pmem_map_raw/out0.log.match b/src/test/pmem_map_raw/out0.log.match
deleted file mode 100644
index b60fcac6e..000000000
--- a/src/test/pmem_map_raw/out0.log.match
+++ /dev/null
@@ -1,3 +0,0 @@
-pmem_map_raw/TEST0: START: pmem_map_raw
- ./pmem_map_raw$(*) $(*)/testfile1
-pmem_map_raw/TEST0: Done
diff --git a/src/test/pmem_map_raw/out1.log.match b/src/test/pmem_map_raw/out1.log.match
deleted file mode 100644
index 3cfcfdded..000000000
--- a/src/test/pmem_map_raw/out1.log.match
+++ /dev/null
@@ -1,4 +0,0 @@
-pmem_map_raw/TEST1: START: pmem_map_raw
- ./pmem_map_raw$(*) $(*)/testfile1
-pmem_map: Invalid argument
-pmem_map_raw/TEST1: Done
diff --git a/src/test/scope/out0.log.match b/src/test/scope/out0.log.match
index f58741df0..27003683f 100644
--- a/src/test/scope/out0.log.match
+++ b/src/test/scope/out0.log.match
@@ -2,60 +2,60 @@ scope/TEST0:
 ../../debug/libvmem.so:
 vmem_aligned_alloc
 vmem_calloc
+vmem_check
 vmem_check_version
+vmem_create
+vmem_create_in_region
+vmem_delete
 vmem_free
+vmem_freespace
 vmem_malloc
-vmem_pool_check
-vmem_pool_create
-vmem_pool_create_in_region
-vmem_pool_delete
-vmem_pool_freespace
-vmem_pool_stats_print
 vmem_realloc
 vmem_set_funcs
+vmem_stats_print
 vmem_strdup
 ../../nondebug/libvmem.so:
 vmem_aligned_alloc
 vmem_calloc
+vmem_check
 vmem_check_version
+vmem_create
+vmem_create_in_region
+vmem_delete
 vmem_free
+vmem_freespace
 vmem_malloc
-vmem_pool_check
-vmem_pool_create
-vmem_pool_create_in_region
-vmem_pool_delete
-vmem_pool_freespace
-vmem_pool_stats_print
 vmem_realloc
 vmem_set_funcs
+vmem_stats_print
 vmem_strdup
 ../../debug/libvmem.a:
 vmem_aligned_alloc
 vmem_calloc
+vmem_check
 vmem_check_version
+vmem_create
+vmem_create_in_region
+vmem_delete
 vmem_free
+vmem_freespace
 vmem_malloc
-vmem_pool_check
-vmem_pool_create
-vmem_pool_create_in_region
-vmem_pool_delete
-vmem_pool_freespace
-vmem_pool_stats_print
 vmem_realloc
 vmem_set_funcs
+vmem_stats_print
 vmem_strdup
 ../../nondebug/libvmem.a:
 vmem_aligned_alloc
 vmem_calloc
+vmem_check
 vmem_check_version
+vmem_create
+vmem_create_in_region
+vmem_delete
 vmem_free
+vmem_freespace
 vmem_malloc
-vmem_pool_check
-vmem_pool_create
-vmem_pool_create_in_region
-vmem_pool_delete
-vmem_pool_freespace
-vmem_pool_stats_print
 vmem_realloc
 vmem_set_funcs
+vmem_stats_print
 vmem_strdup
diff --git a/src/test/scope/out2.log.match b/src/test/scope/out2.log.match
index 128678abf..a27b83c42 100644
--- a/src/test/scope/out2.log.match
+++ b/src/test/scope/out2.log.match
@@ -2,12 +2,12 @@ scope/TEST2:
 ../../debug/libpmemlog.so:
 pmemlog_append
 pmemlog_appendv
+pmemlog_check
 pmemlog_check_version
+pmemlog_close
+pmemlog_create
 pmemlog_nbyte
-pmemlog_pool_check
-pmemlog_pool_close
-pmemlog_pool_create
-pmemlog_pool_open
+pmemlog_open
 pmemlog_rewind
 pmemlog_set_funcs
 pmemlog_tell
@@ -15,12 +15,12 @@ pmemlog_walk
 ../../nondebug/libpmemlog.so:
 pmemlog_append
 pmemlog_appendv
+pmemlog_check
 pmemlog_check_version
+pmemlog_close
+pmemlog_create
 pmemlog_nbyte
-pmemlog_pool_check
-pmemlog_pool_close
-pmemlog_pool_create
-pmemlog_pool_open
+pmemlog_open
 pmemlog_rewind
 pmemlog_set_funcs
 pmemlog_tell
@@ -28,12 +28,12 @@ pmemlog_walk
 ../../debug/libpmemlog.a:
 pmemlog_append
 pmemlog_appendv
+pmemlog_check
 pmemlog_check_version
+pmemlog_close
+pmemlog_create
 pmemlog_nbyte
-pmemlog_pool_check
-pmemlog_pool_close
-pmemlog_pool_create
-pmemlog_pool_open
+pmemlog_open
 pmemlog_rewind
 pmemlog_set_funcs
 pmemlog_tell
@@ -41,12 +41,12 @@ pmemlog_walk
 ../../nondebug/libpmemlog.a:
 pmemlog_append
 pmemlog_appendv
+pmemlog_check
 pmemlog_check_version
+pmemlog_close
+pmemlog_create
 pmemlog_nbyte
-pmemlog_pool_check
-pmemlog_pool_close
-pmemlog_pool_create
-pmemlog_pool_open
+pmemlog_open
 pmemlog_rewind
 pmemlog_set_funcs
 pmemlog_tell
diff --git a/src/test/scope/out3.log.match b/src/test/scope/out3.log.match
index d33290eb4..2920db191 100644
--- a/src/test/scope/out3.log.match
+++ b/src/test/scope/out3.log.match
@@ -1,47 +1,47 @@
 scope/TEST3:
 ../../debug/libpmemblk.so:
+pmemblk_check
 pmemblk_check_version
+pmemblk_close
+pmemblk_create
 pmemblk_nblock
-pmemblk_pool_check
-pmemblk_pool_close
-pmemblk_pool_create
-pmemblk_pool_open
+pmemblk_open
 pmemblk_read
 pmemblk_set_error
 pmemblk_set_funcs
 pmemblk_set_zero
 pmemblk_write
 ../../nondebug/libpmemblk.so:
+pmemblk_check
 pmemblk_check_version
+pmemblk_close
+pmemblk_create
 pmemblk_nblock
-pmemblk_pool_check
-pmemblk_pool_close
-pmemblk_pool_create
-pmemblk_pool_open
+pmemblk_open
 pmemblk_read
 pmemblk_set_error
 pmemblk_set_funcs
 pmemblk_set_zero
 pmemblk_write
 ../../debug/libpmemblk.a:
+pmemblk_check
 pmemblk_check_version
+pmemblk_close
+pmemblk_create
 pmemblk_nblock
-pmemblk_pool_check
-pmemblk_pool_close
-pmemblk_pool_create
-pmemblk_pool_open
+pmemblk_open
 pmemblk_read
 pmemblk_set_error
 pmemblk_set_funcs
 pmemblk_set_zero
 pmemblk_write
 ../../nondebug/libpmemblk.a:
+pmemblk_check
 pmemblk_check_version
+pmemblk_close
+pmemblk_create
 pmemblk_nblock
-pmemblk_pool_check
-pmemblk_pool_close
-pmemblk_pool_create
-pmemblk_pool_open
+pmemblk_open
 pmemblk_read
 pmemblk_set_error
 pmemblk_set_funcs
diff --git a/src/test/scope/out4.log.match b/src/test/scope/out4.log.match
index b37aa40f4..731788008 100644
--- a/src/test/scope/out4.log.match
+++ b/src/test/scope/out4.log.match
@@ -1,29 +1,29 @@
 scope/TEST4:
 ../../debug/libpmemobj.so:
+pmemobj_check
 pmemobj_check_version
-pmemobj_pool_check
-pmemobj_pool_close
-pmemobj_pool_create
-pmemobj_pool_open
+pmemobj_close
+pmemobj_create
+pmemobj_open
 pmemobj_set_funcs
 ../../nondebug/libpmemobj.so:
+pmemobj_check
 pmemobj_check_version
-pmemobj_pool_check
-pmemobj_pool_close
-pmemobj_pool_create
-pmemobj_pool_open
+pmemobj_close
+pmemobj_create
+pmemobj_open
 pmemobj_set_funcs
 ../../debug/libpmemobj.a:
+pmemobj_check
 pmemobj_check_version
-pmemobj_pool_check
-pmemobj_pool_close
-pmemobj_pool_create
-pmemobj_pool_open
+pmemobj_close
+pmemobj_create
+pmemobj_open
 pmemobj_set_funcs
 ../../nondebug/libpmemobj.a:
+pmemobj_check
 pmemobj_check_version
-pmemobj_pool_check
-pmemobj_pool_close
-pmemobj_pool_create
-pmemobj_pool_open
+pmemobj_close
+pmemobj_create
+pmemobj_open
 pmemobj_set_funcs
diff --git a/src/test/unittest/unittest.h b/src/test/unittest/unittest.h
index 00f72d46c..94762bd7f 100644
--- a/src/test/unittest/unittest.h
+++ b/src/test/unittest/unittest.h
@@ -54,10 +54,10 @@
  * and the error message includes the calling context information (file:line).
  * in general, using the all-caps version of a call means you're using the
  * unittest.h version which does the most common checking for you.  so
- * calling VMEM_POOL_CREATE() instead of vmem_pool_create() returns the same
+ * calling VMEM_CREATE() instead of vmem_create() returns the same
  * thing, but can never return an error since the unit test library checks for
- * it.  * for routines like vmem_pool_delete() there is no corresponding
- * VMEM_POOL_DELETE() because there's no error to check for.
+ * it.  * for routines like vmem_delete() there is no corresponding
+ * VMEM_DELETE() because there's no error to check for.
  *
  * all unit tests should use the same initialization:
  *
diff --git a/src/test/util_pool_create/TEST0 b/src/test/util_pool_create/TEST0
index c0f96cdf1..9ef038699 100755
--- a/src/test/util_pool_create/TEST0
+++ b/src/test/util_pool_create/TEST0
@@ -57,7 +57,7 @@ rm -f $DIR/testlink4
 rm -fr $DIR/testdir1
 rm -fr $DIR/testdir2
 
-truncate -s 16M $DIR/testfile1
+truncate -s 32K $DIR/testfile1
 mkdir $DIR/testdir1
 mkdir $DIR/testdir2
 chmod -w $DIR/testdir2
diff --git a/src/test/util_pool_open/TEST0 b/src/test/util_pool_open/TEST0
index ceadbfeb9..23f712a35 100755
--- a/src/test/util_pool_open/TEST0
+++ b/src/test/util_pool_open/TEST0
@@ -57,12 +57,12 @@ rm -f $DIR/testlink4
 rm -f $DIR/testlink5
 rm -fr $DIR/testdir1
 
-truncate -s 16M $DIR/testfile1
+truncate -s 32K $DIR/testfile1
 chmod -rw $DIR/testfile1
-truncate -s 16M $DIR/testfile2
+truncate -s 32K $DIR/testfile2
 chmod -w $DIR/testfile2
 truncate -s 1K $DIR/testfile3
-truncate -s 16M $DIR/testfile4
+truncate -s 32K $DIR/testfile4
 mkdir $DIR/testdir1
 ln -s $DIR/testfile0 $DIR/testlink1
 ln -s $DIR/testfile1 $DIR/testlink2
diff --git a/src/test/util_pool_open/out0.log.match b/src/test/util_pool_open/out0.log.match
index a9507d426..e595f4704 100644
--- a/src/test/util_pool_open/out0.log.match
+++ b/src/test/util_pool_open/out0.log.match
@@ -11,5 +11,5 @@ $(*)/testfile0: util_pool_open: No such file or directory
 $(*)/testfile1: util_pool_open: Permission denied
 $(*)/testfile2: util_pool_open: Permission denied
 $(*)/testfile3: util_pool_open: Invalid argument
-$(*)/testfile4: open, len 16777216
+$(*)/testfile4: open, len 32768
 util_pool_open/TEST0: Done
diff --git a/src/test/vmem_aligned_alloc/vmem_aligned_alloc.c b/src/test/vmem_aligned_alloc/vmem_aligned_alloc.c
index b87eea5c0..0016965cc 100644
--- a/src/test/vmem_aligned_alloc/vmem_aligned_alloc.c
+++ b/src/test/vmem_aligned_alloc/vmem_aligned_alloc.c
@@ -116,7 +116,7 @@ main(int argc, char *argv[])
 		FATAL("usage: %s [directory]", argv[0]);
 	}
 
-	/* allocate memory for function vmem_pool_create_in_region() */
+	/* allocate memory for function vmem_create_in_region() */
 	void *mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 
@@ -129,14 +129,14 @@ main(int argc, char *argv[])
 
 		custom_alloc_calls = 0;
 		if (dir == NULL) {
-			vmp = vmem_pool_create_in_region(mem_pool,
+			vmp = vmem_create_in_region(mem_pool,
 				VMEM_MIN_POOL);
 			if (vmp == NULL)
-				FATAL("!vmem_pool_create_in_region");
+				FATAL("!vmem_create_in_region");
 		} else {
-			vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+			vmp = vmem_create(dir, VMEM_MIN_POOL);
 			if (vmp == NULL)
-				FATAL("!vmem_pool_create");
+				FATAL("!vmem_create");
 		}
 
 		for (i = 0; i < MAX_ALLOCS; ++i) {
@@ -160,7 +160,7 @@ main(int argc, char *argv[])
 			}
 		}
 
-		vmem_pool_delete(vmp);
+		vmem_delete(vmp);
 
 		/* check memory leaks */
 		ASSERTne(custom_alloc_calls, 0);
diff --git a/src/test/vmem_calloc/vmem_calloc.c b/src/test/vmem_calloc/vmem_calloc.c
index e9aca1f9b..a7d27bf14 100644
--- a/src/test/vmem_calloc/vmem_calloc.c
+++ b/src/test/vmem_calloc/vmem_calloc.c
@@ -55,17 +55,17 @@ main(int argc, char *argv[])
 	}
 
 	if (dir == NULL) {
-		/* allocate memory for function vmem_pool_create_in_region() */
+		/* allocate memory for function vmem_create_in_region() */
 		mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 
-		vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+		vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create_in_region");
+			FATAL("!vmem_create_in_region");
 	} else {
-		vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+		vmp = vmem_create(dir, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create");
+			FATAL("!vmem_create");
 	}
 
 	int *test = vmem_calloc(vmp, 1, sizeof (int));
@@ -84,7 +84,7 @@ main(int argc, char *argv[])
 
 	vmem_free(vmp, test);
 
-	vmem_pool_delete(vmp);
+	vmem_delete(vmp);
 
 	DONE(NULL);
 }
diff --git a/src/test/vmem_check/.gitignore b/src/test/vmem_check/.gitignore
new file mode 100644
index 000000000..f01efd5eb
--- /dev/null
+++ b/src/test/vmem_check/.gitignore
@@ -0,0 +1 @@
+vmem_check
diff --git a/src/test/vmem_pool_check/Makefile b/src/test/vmem_check/Makefile
similarity index 91%
rename from src/test/vmem_pool_check/Makefile
rename to src/test/vmem_check/Makefile
index e06abca7f..325936116 100644
--- a/src/test/vmem_pool_check/Makefile
+++ b/src/test/vmem_check/Makefile
@@ -31,16 +31,16 @@
 #
 
 #
-# src/test/vmem_pool_check/Makefile -- build vmem_pool_check unit test
+# src/test/vmem_check/Makefile -- build vmem_check unit test
 #
 
 vpath %.h ../..
-TARGET = vmem_pool_check
-OBJS = vmem_pool_check.o
+TARGET = vmem_check
+OBJS = vmem_check.o
 
 LIBVMEM=y
 
 include ../Makefile.inc
 
-vmem_pool_check.o: vmem_pool_check.c
+vmem_check.o: vmem_check.c
 
diff --git a/src/test/vmem_pool_check/TEST0 b/src/test/vmem_check/TEST0
similarity index 91%
rename from src/test/vmem_pool_check/TEST0
rename to src/test/vmem_check/TEST0
index 8f47801dc..2412de832 100755
--- a/src/test/vmem_pool_check/TEST0
+++ b/src/test/vmem_check/TEST0
@@ -32,9 +32,9 @@
 #
 
 #
-# src/test/vmem_pool_check/TEST0 -- unit test for vmem_pool_check
+# src/test/vmem_check/TEST0 -- unit test for vmem_check
 #
-export UNITTEST_NAME=vmem_pool_check/TEST0
+export UNITTEST_NAME=vmem_check/TEST0
 export UNITTEST_NUM=0
 
 # standard unit test setup
@@ -44,6 +44,6 @@ require_fs_type local
 
 setup
 
-expect_normal_exit ./vmem_pool_check$EXESUFFIX
+expect_normal_exit ./vmem_check$EXESUFFIX
 
 pass
diff --git a/src/test/vmem_pool_check/TEST1 b/src/test/vmem_check/TEST1
similarity index 91%
rename from src/test/vmem_pool_check/TEST1
rename to src/test/vmem_check/TEST1
index 552e71515..938d44a0f 100755
--- a/src/test/vmem_pool_check/TEST1
+++ b/src/test/vmem_check/TEST1
@@ -32,9 +32,9 @@
 #
 
 #
-# src/test/vmem_pool_check/TEST1 -- unit test for vmem_pool_check
+# src/test/vmem_check/TEST1 -- unit test for vmem_check
 #
-export UNITTEST_NAME=vmem_pool_check/TEST1
+export UNITTEST_NAME=vmem_check/TEST1
 export UNITTEST_NUM=1
 
 # standard unit test setup
@@ -42,6 +42,6 @@ export UNITTEST_NUM=1
 
 setup
 
-expect_normal_exit ./vmem_pool_check$EXESUFFIX $DIR
+expect_normal_exit ./vmem_check$EXESUFFIX $DIR
 
 pass
diff --git a/src/test/vmem_pool_check/vmem_pool_check.c b/src/test/vmem_check/vmem_check.c
similarity index 75%
rename from src/test/vmem_pool_check/vmem_pool_check.c
rename to src/test/vmem_check/vmem_check.c
index c785a4804..c540c6bdf 100644
--- a/src/test/vmem_pool_check/vmem_pool_check.c
+++ b/src/test/vmem_check/vmem_check.c
@@ -31,9 +31,9 @@
  */
 
 /*
- * vmem_pool_check.c -- unit test for vmem_pool_check
+ * vmem_check.c -- unit test for vmem_check
  *
- * usage: vmem_pool_check [directory]
+ * usage: vmem_check [directory]
  */
 
 #include "unittest.h"
@@ -45,7 +45,7 @@ main(int argc, char *argv[])
 	void *mem_pool = NULL;
 	VMEM *vmp;
 
-	START(argc, argv, "vmem_pool_check");
+	START(argc, argv, "vmem_check");
 
 	if (argc == 2) {
 		dir = argv[1];
@@ -54,20 +54,20 @@ main(int argc, char *argv[])
 	}
 
 	if (dir == NULL) {
-		/* allocate memory for function vmem_pool_create_in_region() */
+		/* allocate memory for function vmem_create_in_region() */
 		mem_pool = MMAP(NULL, VMEM_MIN_POOL*2, PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 
-		vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+		vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create_in_region");
+			FATAL("!vmem_create_in_region");
 	} else {
-		vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+		vmp = vmem_create(dir, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create");
+			FATAL("!vmem_create");
 	}
 
-	ASSERTeq(1, vmem_pool_check(vmp));
+	ASSERTeq(1, vmem_check(vmp));
 
 	/* create pool in this same memory region */
 	if (dir == NULL) {
@@ -75,26 +75,26 @@ main(int argc, char *argv[])
 		void *mem_pool2 = (void*)(((uintptr_t)mem_pool +
 			VMEM_MIN_POOL/2) & ~(Pagesize-1));
 
-		VMEM *vmp2 = vmem_pool_create_in_region(mem_pool2,
+		VMEM *vmp2 = vmem_create_in_region(mem_pool2,
 			VMEM_MIN_POOL);
 
 		if (vmp2 == NULL)
-			FATAL("!vmem_pool_create_in_region");
+			FATAL("!vmem_create_in_region");
 
 		/* detect memory range collision */
-		ASSERTne(1, vmem_pool_check(vmp));
-		ASSERTne(1, vmem_pool_check(vmp2));
+		ASSERTne(1, vmem_check(vmp));
+		ASSERTne(1, vmem_check(vmp2));
 
-		vmem_pool_delete(vmp2);
+		vmem_delete(vmp2);
 
-		ASSERTne(1, vmem_pool_check(vmp2));
+		ASSERTne(1, vmem_check(vmp2));
 	}
 
-	vmem_pool_delete(vmp);
+	vmem_delete(vmp);
 
-	/* for vmem_pool_create() memory unmapped after delete pool */
+	/* for vmem_create() memory unmapped after delete pool */
 	if (!dir)
-		ASSERTne(1, vmem_pool_check(vmp));
+		ASSERTne(1, vmem_check(vmp));
 
 	DONE(NULL);
 }
diff --git a/src/test/vmem_check_allocations/vmem_check_allocations.c b/src/test/vmem_check_allocations/vmem_check_allocations.c
index 137c58393..a4b351ebe 100644
--- a/src/test/vmem_check_allocations/vmem_check_allocations.c
+++ b/src/test/vmem_check_allocations/vmem_check_allocations.c
@@ -70,14 +70,14 @@ main(int argc, char *argv[])
 					PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 
-			vmp = vmem_pool_create_in_region(mem_pool,
+			vmp = vmem_create_in_region(mem_pool,
 				VMEM_MIN_POOL);
 			if (vmp == NULL)
-				FATAL("!vmem_pool_create_in_region");
+				FATAL("!vmem_create_in_region");
 		} else {
-			vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+			vmp = vmem_create(dir, VMEM_MIN_POOL);
 			if (vmp == NULL)
-				FATAL("!vmem_pool_create");
+				FATAL("!vmem_create");
 		}
 
 		memset(allocs, 0, TEST_ALLOCS_SIZE);
@@ -113,7 +113,7 @@ main(int argc, char *argv[])
 			}
 		}
 
-		vmem_pool_delete(vmp);
+		vmem_delete(vmp);
 	}
 
 	DONE(NULL);
diff --git a/src/test/vmem_create/.gitignore b/src/test/vmem_create/.gitignore
new file mode 100644
index 000000000..7abb8918d
--- /dev/null
+++ b/src/test/vmem_create/.gitignore
@@ -0,0 +1 @@
+vmem_create
diff --git a/src/test/vmem_pool_create/Makefile b/src/test/vmem_create/Makefile
similarity index 90%
rename from src/test/vmem_pool_create/Makefile
rename to src/test/vmem_create/Makefile
index caf57389e..215aac5a0 100644
--- a/src/test/vmem_pool_create/Makefile
+++ b/src/test/vmem_create/Makefile
@@ -31,13 +31,13 @@
 #
 
 #
-# src/test/vmem_pool_create/Makefile -- build vmem_pool_create unit test
+# src/test/vmem_create/Makefile -- build vmem_create unit test
 #
-TARGET = vmem_pool_create
-OBJS = vmem_pool_create.o
+TARGET = vmem_create
+OBJS = vmem_create.o
 
 LIBVMEM=y
 
 include ../Makefile.inc
 
-vmem_pool_create.o: vmem_pool_create.c
+vmem_create.o: vmem_create.c
diff --git a/src/test/vmem_pool_create/TEST0 b/src/test/vmem_create/TEST0
similarity index 91%
rename from src/test/vmem_pool_create/TEST0
rename to src/test/vmem_create/TEST0
index 37695ff53..c0c4ffa4f 100755
--- a/src/test/vmem_pool_create/TEST0
+++ b/src/test/vmem_create/TEST0
@@ -32,9 +32,9 @@
 #
 
 #
-# src/test/vmem_pool_create/TEST0 -- unit test for vmem_pool_create
+# src/test/vmem_create/TEST0 -- unit test for vmem_create
 #
-export UNITTEST_NAME=vmem_pool_create/TEST0
+export UNITTEST_NAME=vmem_create/TEST0
 export UNITTEST_NUM=0
 
 # standard unit test setup
@@ -44,7 +44,7 @@ require_fs_type local
 
 setup
 
-expect_normal_exit ./vmem_pool_create$EXESUFFIX $DIR
+expect_normal_exit ./vmem_create$EXESUFFIX $DIR
 
 check
 
diff --git a/src/test/vmem_pool_create/err0.log.match b/src/test/vmem_create/err0.log.match
similarity index 100%
rename from src/test/vmem_pool_create/err0.log.match
rename to src/test/vmem_create/err0.log.match
diff --git a/src/test/vmem_create/out0.log.match b/src/test/vmem_create/out0.log.match
new file mode 100644
index 000000000..58a6ff8c0
--- /dev/null
+++ b/src/test/vmem_create/out0.log.match
@@ -0,0 +1,4 @@
+vmem_create/TEST0: START: vmem_create
+ ./vmem_create$(*)
+signal: Segmentation fault
+vmem_create/TEST0: Done
diff --git a/src/test/vmem_pool_create/vmem_pool_create.c b/src/test/vmem_create/vmem_create.c
similarity index 90%
rename from src/test/vmem_pool_create/vmem_pool_create.c
rename to src/test/vmem_create/vmem_create.c
index 5b1b47471..ce9f9f433 100644
--- a/src/test/vmem_pool_create/vmem_pool_create.c
+++ b/src/test/vmem_create/vmem_create.c
@@ -31,9 +31,9 @@
  */
 
 /*
- * vmem_pool_create.c -- unit test for vmem_pool_create
+ * vmem_create.c -- unit test for vmem_create
  *
- * usage: vmem_pool_create directory
+ * usage: vmem_create directory
  */
 
 #include "unittest.h"
@@ -48,7 +48,7 @@ signal_handler(int sig)
 {
 	OUT("signal: %s", strsignal(sig));
 
-	vmem_pool_delete(Vmp);
+	vmem_delete(Vmp);
 
 	DONE(NULL);
 }
@@ -56,15 +56,15 @@ signal_handler(int sig)
 int
 main(int argc, char *argv[])
 {
-	START(argc, argv, "vmem_pool_create");
+	START(argc, argv, "vmem_create");
 
 	if (argc < 2 || argc > 3)
 		FATAL("usage: %s directory", argv[0]);
 
-	Vmp = vmem_pool_create(argv[1], VMEM_MIN_POOL);
+	Vmp = vmem_create(argv[1], VMEM_MIN_POOL);
 
 	if (Vmp == NULL)
-		OUT("!vmem_pool_create");
+		OUT("!vmem_create");
 	else {
 		struct sigvec v = { 0 };
 
diff --git a/src/test/vmem_create_error/.gitignore b/src/test/vmem_create_error/.gitignore
new file mode 100644
index 000000000..1849f8501
--- /dev/null
+++ b/src/test/vmem_create_error/.gitignore
@@ -0,0 +1 @@
+vmem_create_error
diff --git a/src/test/vmem_pool_create_error/Makefile b/src/test/vmem_create_error/Makefile
similarity index 88%
rename from src/test/vmem_pool_create_error/Makefile
rename to src/test/vmem_create_error/Makefile
index 5beb9a7fb..4db6014a0 100644
--- a/src/test/vmem_pool_create_error/Makefile
+++ b/src/test/vmem_create_error/Makefile
@@ -31,13 +31,13 @@
 #
 
 #
-# src/test/vmem_pool_create_error/Makefile -- build vmem_pool_create_error unit test
+# src/test/vmem_create_error/Makefile -- build vmem_create_error unit test
 #
-TARGET = vmem_pool_create_error
-OBJS = vmem_pool_create_error.o
+TARGET = vmem_create_error
+OBJS = vmem_create_error.o
 
 LIBVMEM=y
 
 include ../Makefile.inc
 
-vmem_pool_create_error.o: vmem_pool_create_error.c
+vmem_create_error.o: vmem_create_error.c
diff --git a/src/test/vmem_pool_create_error/TEST0 b/src/test/vmem_create_error/TEST0
similarity index 90%
rename from src/test/vmem_pool_create_error/TEST0
rename to src/test/vmem_create_error/TEST0
index 1f4797eac..afe2f1b74 100755
--- a/src/test/vmem_pool_create_error/TEST0
+++ b/src/test/vmem_create_error/TEST0
@@ -32,9 +32,9 @@
 #
 
 #
-# src/test/vmem_pool_create_error/TEST0 -- unit test for vmem_pool_create_error
+# src/test/vmem_create_error/TEST0 -- unit test for vmem_create_error
 #
-export UNITTEST_NAME=vmem_pool_create_error/TEST0
+export UNITTEST_NAME=vmem_create_error/TEST0
 export UNITTEST_NUM=0
 
 # standard unit test setup
@@ -45,7 +45,7 @@ require_build_type debug nondebug
 
 setup
 
-expect_normal_exit ./vmem_pool_create_error$EXESUFFIX
+expect_normal_exit ./vmem_create_error$EXESUFFIX
 
 check
 
diff --git a/src/test/vmem_pool_create_error/err0.log.match b/src/test/vmem_create_error/err0.log.match
similarity index 100%
rename from src/test/vmem_pool_create_error/err0.log.match
rename to src/test/vmem_create_error/err0.log.match
diff --git a/src/test/vmem_create_error/out0.log.match b/src/test/vmem_create_error/out0.log.match
new file mode 100644
index 000000000..4f911edd7
--- /dev/null
+++ b/src/test/vmem_create_error/out0.log.match
@@ -0,0 +1,3 @@
+vmem_create_error/TEST0: START: vmem_create_error
+ ./vmem_create_error$(*)
+vmem_create_error/TEST0: Done
diff --git a/src/test/vmem_pool_create_error/vmem_pool_create_error.c b/src/test/vmem_create_error/vmem_create_error.c
similarity index 86%
rename from src/test/vmem_pool_create_error/vmem_pool_create_error.c
rename to src/test/vmem_create_error/vmem_create_error.c
index f470bd5e3..d6bba987b 100644
--- a/src/test/vmem_pool_create_error/vmem_pool_create_error.c
+++ b/src/test/vmem_create_error/vmem_create_error.c
@@ -31,9 +31,9 @@
  */
 
 /*
- * vmem_pool_create_error.c -- unit test for vmem_pool_create_error
+ * vmem_create_error.c -- unit test for vmem_create_error
  *
- * usage: vmem_pool_create_error
+ * usage: vmem_create_error
  */
 
 #include "unittest.h"
@@ -45,23 +45,23 @@ main(int argc, char *argv[])
 {
 	VMEM *vmp;
 
-	START(argc, argv, "vmem_pool_create_error");
+	START(argc, argv, "vmem_create_error");
 
 	if (argc > 1)
 		FATAL("usage: %s", argv[0]);
 
 	errno = 0;
-	vmp = vmem_pool_create_in_region(mem_pool, 0);
+	vmp = vmem_create_in_region(mem_pool, 0);
 	ASSERTeq(vmp, NULL);
 	ASSERTeq(errno, EINVAL);
 
 	errno = 0;
-	vmp = vmem_pool_create("./", 0);
+	vmp = vmem_create("./", 0);
 	ASSERTeq(vmp, NULL);
 	ASSERTeq(errno, EINVAL);
 
 	errno = 0;
-	vmp = vmem_pool_create("invalid dir !@#$%^&*()=", VMEM_MIN_POOL);
+	vmp = vmem_create("invalid dir !@#$%^&*()=", VMEM_MIN_POOL);
 	ASSERTeq(vmp, NULL);
 	ASSERTne(errno, 0);
 
diff --git a/src/test/vmem_create_in_region/.gitignore b/src/test/vmem_create_in_region/.gitignore
new file mode 100644
index 000000000..e65fa2561
--- /dev/null
+++ b/src/test/vmem_create_in_region/.gitignore
@@ -0,0 +1 @@
+vmem_create_in_region
diff --git a/src/test/vmem_create_in_region/Makefile b/src/test/vmem_create_in_region/Makefile
new file mode 100644
index 000000000..39b4de233
--- /dev/null
+++ b/src/test/vmem_create_in_region/Makefile
@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2014, Intel Corporation
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#
+#     * Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in
+#       the documentation and/or other materials provided with the
+#       distribution.
+#
+#     * Neither the name of Intel Corporation nor the names of its
+#       contributors may be used to endorse or promote products derived
+#       from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# src/test/vmem_create_in_region/Makefile -- build vmem_create_in_region unit test
+#
+TARGET = vmem_create_in_region
+OBJS = vmem_create_in_region.o
+
+LIBVMEM=y
+
+include ../Makefile.inc
+
+vmem_create_in_region.o: vmem_create_in_region.c
diff --git a/src/test/vmem_pool_create_in_region/TEST0 b/src/test/vmem_create_in_region/TEST0
similarity index 89%
rename from src/test/vmem_pool_create_in_region/TEST0
rename to src/test/vmem_create_in_region/TEST0
index f3267ab70..7a91cb3ea 100755
--- a/src/test/vmem_pool_create_in_region/TEST0
+++ b/src/test/vmem_create_in_region/TEST0
@@ -32,9 +32,9 @@
 #
 
 #
-# src/test/vmem_pool_create_in_region/TEST0 -- unit test for vmem_pool_create_in_region
+# src/test/vmem_create_in_region/TEST0 -- unit test for vmem_create_in_region
 #
-export UNITTEST_NAME=vmem_pool_create_in_region/TEST0
+export UNITTEST_NAME=vmem_create_in_region/TEST0
 export UNITTEST_NUM=0
 
 # standard unit test setup
@@ -44,7 +44,7 @@ require_fs_type local
 
 setup
 
-expect_normal_exit ./vmem_pool_create_in_region$EXESUFFIX
+expect_normal_exit ./vmem_create_in_region$EXESUFFIX
 
 check
 
diff --git a/src/test/vmem_pool_create_in_region/err0.log.match b/src/test/vmem_create_in_region/err0.log.match
similarity index 100%
rename from src/test/vmem_pool_create_in_region/err0.log.match
rename to src/test/vmem_create_in_region/err0.log.match
diff --git a/src/test/vmem_create_in_region/out0.log.match b/src/test/vmem_create_in_region/out0.log.match
new file mode 100644
index 000000000..735e0b950
--- /dev/null
+++ b/src/test/vmem_create_in_region/out0.log.match
@@ -0,0 +1,3 @@
+vmem_create_in_region/TEST0: START: vmem_create_in_region
+ ./vmem_create_in_region$(*)
+vmem_create_in_region/TEST0: Done
diff --git a/src/test/vmem_pool_create_in_region/vmem_pool_create_in_region.c b/src/test/vmem_create_in_region/vmem_create_in_region.c
similarity index 86%
rename from src/test/vmem_pool_create_in_region/vmem_pool_create_in_region.c
rename to src/test/vmem_create_in_region/vmem_create_in_region.c
index bbaa3fb73..27b30eed9 100644
--- a/src/test/vmem_pool_create_in_region/vmem_pool_create_in_region.c
+++ b/src/test/vmem_create_in_region/vmem_create_in_region.c
@@ -31,9 +31,9 @@
  */
 
 /*
- * vmem_pool_create_in_region.c -- unit test for vmem_pool_create_in_region
+ * vmem_create_in_region.c -- unit test for vmem_create_in_region
  *
- * usage: vmem_pool_create_in_region
+ * usage: vmem_create_in_region
  */
 
 #include "unittest.h"
@@ -48,19 +48,19 @@ main(int argc, char *argv[])
 	VMEM *vmp;
 	size_t i;
 
-	START(argc, argv, "vmem_pool_create_in_region");
+	START(argc, argv, "vmem_create_in_region");
 
 	if (argc > 1)
 		FATAL("usage: %s", argv[0]);
 
-	/* allocate memory for function vmem_pool_create_in_region() */
+	/* allocate memory for function vmem_create_in_region() */
 	void *mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 
-	vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+	vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
 
 	if (vmp == NULL)
-		FATAL("!vmem_pool_create_in_region");
+		FATAL("!vmem_create_in_region");
 
 	for (i = 0; i < TEST_ALLOCATIONS; ++i) {
 		allocs[i] = vmem_malloc(vmp, sizeof (int));
@@ -75,7 +75,7 @@ main(int argc, char *argv[])
 		vmem_free(vmp, allocs[i]);
 	}
 
-	vmem_pool_delete(vmp);
+	vmem_delete(vmp);
 
 	DONE(NULL);
 }
diff --git a/src/test/vmem_custom_alloc/vmem_custom_alloc.c b/src/test/vmem_custom_alloc/vmem_custom_alloc.c
index 4be459c28..1c92c07af 100644
--- a/src/test/vmem_custom_alloc/vmem_custom_alloc.c
+++ b/src/test/vmem_custom_alloc/vmem_custom_alloc.c
@@ -125,13 +125,13 @@ pool_test(const char *dir)
 	VMEM *vmp = NULL;
 
 	if (dir != NULL) {
-		vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+		vmp = vmem_create(dir, VMEM_MIN_POOL);
 	} else {
-		/* allocate memory for function vmem_pool_create_in_region() */
+		/* allocate memory for function vmem_create_in_region() */
 		void *mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 
-		vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+		vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
 	}
 
 	if (expect_create_pool == 0) {
@@ -140,9 +140,9 @@ pool_test(const char *dir)
 	} else {
 		if (vmp == NULL) {
 			if (dir == NULL) {
-				FATAL("!vmem_pool_create_in_region");
+				FATAL("!vmem_create_in_region");
 			} else {
-				FATAL("!vmem_pool_create");
+				FATAL("!vmem_create");
 			}
 		}
 	}
@@ -155,7 +155,7 @@ pool_test(const char *dir)
 
 	vmem_free(vmp, test);
 
-	vmem_pool_delete(vmp);
+	vmem_delete(vmp);
 }
 
 int
diff --git a/src/test/vmem_freespace/vmem_freespace.c b/src/test/vmem_freespace/vmem_freespace.c
index d1edd91f7..9c317d5f4 100644
--- a/src/test/vmem_freespace/vmem_freespace.c
+++ b/src/test/vmem_freespace/vmem_freespace.c
@@ -54,20 +54,20 @@ main(int argc, char *argv[])
 	}
 
 	if (dir == NULL) {
-		/* allocate memory for function vmem_pool_create_in_region() */
+		/* allocate memory for function vmem_create_in_region() */
 		void *mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 
-		vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+		vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create_in_region");
+			FATAL("!vmem_create_in_region");
 	} else {
-		vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+		vmp = vmem_create(dir, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create");
+			FATAL("!vmem_create");
 	}
 
-	size_t total_space = vmem_pool_freespace(vmp);
+	size_t total_space = vmem_freespace(vmp);
 	size_t free_space = total_space;
 
 	/* allocate all memory */
@@ -76,7 +76,7 @@ main(int argc, char *argv[])
 	while ((next = vmem_malloc(vmp, 128)) != NULL) {
 		*next = prev;
 		prev = next;
-		size_t space = vmem_pool_freespace(vmp);
+		size_t space = vmem_freespace(vmp);
 		/* free space can only decrease */
 		ASSERT(space <= free_space);
 		free_space = space;
@@ -90,13 +90,13 @@ main(int argc, char *argv[])
 		void **act = prev;
 		prev = *act;
 		vmem_free(vmp, act);
-		size_t space = vmem_pool_freespace(vmp);
+		size_t space = vmem_freespace(vmp);
 		/* free space can only increase */
 		ASSERT(space >= free_space);
 		free_space = space;
 	}
 
-	free_space = vmem_pool_freespace(vmp);
+	free_space = vmem_freespace(vmp);
 
 	/*
 	 * Depending on the distance of the 'mem_pool' from the
@@ -106,7 +106,7 @@ main(int argc, char *argv[])
 	 */
 	ASSERT(free_space > ((total_space - 4L * MB) * 9) / 10);
 
-	vmem_pool_delete(vmp);
+	vmem_delete(vmp);
 
 	DONE(NULL);
 }
diff --git a/src/test/vmem_malloc/vmem_malloc.c b/src/test/vmem_malloc/vmem_malloc.c
index f7fdc03cd..8a55214ef 100644
--- a/src/test/vmem_malloc/vmem_malloc.c
+++ b/src/test/vmem_malloc/vmem_malloc.c
@@ -55,17 +55,17 @@ main(int argc, char *argv[])
 	}
 
 	if (dir == NULL) {
-		/* allocate memory for function vmem_pool_create_in_region() */
+		/* allocate memory for function vmem_create_in_region() */
 		mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 
-		vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+		vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create_in_region");
+			FATAL("!vmem_create_in_region");
 	} else {
-		vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+		vmp = vmem_create(dir, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create");
+			FATAL("!vmem_create");
 	}
 
 	int *test = vmem_malloc(vmp, sizeof (int));
@@ -80,7 +80,7 @@ main(int argc, char *argv[])
 
 	vmem_free(vmp, test);
 
-	vmem_pool_delete(vmp);
+	vmem_delete(vmp);
 
 	DONE(NULL);
 }
diff --git a/src/test/vmem_mix_allocations/vmem_mix_allocations.c b/src/test/vmem_mix_allocations/vmem_mix_allocations.c
index 7de8b8f57..a7ac50e16 100644
--- a/src/test/vmem_mix_allocations/vmem_mix_allocations.c
+++ b/src/test/vmem_mix_allocations/vmem_mix_allocations.c
@@ -57,17 +57,17 @@ main(int argc, char *argv[])
 	}
 
 	if (dir == NULL) {
-		/* allocate memory for function vmem_pool_create_in_region() */
+		/* allocate memory for function vmem_create_in_region() */
 		mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 
-		vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+		vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create_in_region");
+			FATAL("!vmem_create_in_region");
 	} else {
-		vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+		vmp = vmem_create(dir, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create");
+			FATAL("!vmem_create");
 	}
 
 	/* test with multiple size of allocations from 4MB to 2B */
@@ -89,7 +89,7 @@ main(int argc, char *argv[])
 	/* allocate more than half of pool size */
 	ASSERT(sum_alloc * 2 > VMEM_MIN_POOL);
 
-	vmem_pool_delete(vmp);
+	vmem_delete(vmp);
 
 	DONE(NULL);
 }
diff --git a/src/test/vmem_multiple_pools/vmem_multiple_pools.c b/src/test/vmem_multiple_pools/vmem_multiple_pools.c
index e4759ec72..b2741f413 100644
--- a/src/test/vmem_multiple_pools/vmem_multiple_pools.c
+++ b/src/test/vmem_multiple_pools/vmem_multiple_pools.c
@@ -61,7 +61,7 @@ main(int argc, char *argv[])
 	size_t pool_id;
 
 	for (pool_id = 0; pool_id < mem_pools_size; ++pool_id) {
-		/* allocate memory for function vmem_pool_create_in_region() */
+		/* allocate memory for function vmem_create_in_region() */
 		mem_pools[pool_id] = MMAP(NULL, VMEM_MIN_POOL,
 			PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 	}
@@ -71,22 +71,22 @@ main(int argc, char *argv[])
 
 			/* delete old pool with this same id if exist */
 			if (pools[pool_id] != NULL) {
-				vmem_pool_delete(pools[pool_id]);
+				vmem_delete(pools[pool_id]);
 				pools[pool_id] = NULL;
 			}
 
 			if (pool_id % 2 == 0) {
 				/* for even pool_id, create in region */
-				pools[pool_id] = vmem_pool_create_in_region(
+				pools[pool_id] = vmem_create_in_region(
 					mem_pools[pool_id / 2], VMEM_MIN_POOL);
 				if (pools[pool_id] == NULL)
-					FATAL("!vmem_pool_create_in_region");
+					FATAL("!vmem_create_in_region");
 			} else {
 				/* for odd pool_id, create in file */
-				pools[pool_id] = vmem_pool_create(dir,
+				pools[pool_id] = vmem_create(dir,
 					VMEM_MIN_POOL);
 				if (pools[pool_id] == NULL)
-					FATAL("!vmem_pool_create");
+					FATAL("!vmem_create");
 			}
 
 			void *test = vmem_malloc(pools[pool_id],
@@ -99,7 +99,7 @@ main(int argc, char *argv[])
 
 	for (pool_id = 0; pool_id < TEST_POOLS_MAX; ++pool_id) {
 		if (pools[pool_id] != NULL) {
-			vmem_pool_delete(pools[pool_id]);
+			vmem_delete(pools[pool_id]);
 			pools[pool_id] = NULL;
 		}
 	}
diff --git a/src/test/vmem_out_of_memory/vmem_out_of_memory.c b/src/test/vmem_out_of_memory/vmem_out_of_memory.c
index a25b59c6f..3593053e7 100644
--- a/src/test/vmem_out_of_memory/vmem_out_of_memory.c
+++ b/src/test/vmem_out_of_memory/vmem_out_of_memory.c
@@ -53,17 +53,17 @@ main(int argc, char *argv[])
 	}
 
 	if (dir == NULL) {
-		/* allocate memory for function vmem_pool_create_in_region() */
+		/* allocate memory for function vmem_create_in_region() */
 		mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 
-		vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+		vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create_in_region");
+			FATAL("!vmem_create_in_region");
 	} else {
-		vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+		vmp = vmem_create(dir, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create");
+			FATAL("!vmem_create");
 	}
 
 	/* allocate all memory */
@@ -93,7 +93,7 @@ main(int argc, char *argv[])
 		vmem_free(vmp, act);
 	}
 
-	vmem_pool_delete(vmp);
+	vmem_delete(vmp);
 
 	DONE(NULL);
 }
diff --git a/src/test/vmem_pages_purging/vmem_pages_purging.c b/src/test/vmem_pages_purging/vmem_pages_purging.c
index 12bda9b41..b421bb79a 100644
--- a/src/test/vmem_pages_purging/vmem_pages_purging.c
+++ b/src/test/vmem_pages_purging/vmem_pages_purging.c
@@ -79,9 +79,9 @@ main(int argc, char *argv[])
 		usage(argv[0]);
 	}
 
-	vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+	vmp = vmem_create(dir, VMEM_MIN_POOL);
 	if (vmp == NULL)
-		FATAL("!vmem_pool_create");
+		FATAL("!vmem_create");
 
 	for (i = 0; i < n; i++) {
 		int *test = NULL;
@@ -104,7 +104,7 @@ main(int argc, char *argv[])
 		vmem_free(vmp, test);
 	}
 
-	vmem_pool_delete(vmp);
+	vmem_delete(vmp);
 
 	DONE(NULL);
 }
diff --git a/src/test/vmem_pool_check/.gitignore b/src/test/vmem_pool_check/.gitignore
deleted file mode 100644
index ce80e7389..000000000
--- a/src/test/vmem_pool_check/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vmem_pool_check
diff --git a/src/test/vmem_pool_create/.gitignore b/src/test/vmem_pool_create/.gitignore
deleted file mode 100644
index 431dc90aa..000000000
--- a/src/test/vmem_pool_create/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vmem_pool_create
diff --git a/src/test/vmem_pool_create/out0.log.match b/src/test/vmem_pool_create/out0.log.match
deleted file mode 100644
index 70f089e0d..000000000
--- a/src/test/vmem_pool_create/out0.log.match
+++ /dev/null
@@ -1,4 +0,0 @@
-vmem_pool_create/TEST0: START: vmem_pool_create
- ./vmem_pool_create$(*)
-signal: Segmentation fault
-vmem_pool_create/TEST0: Done
diff --git a/src/test/vmem_pool_create_error/.gitignore b/src/test/vmem_pool_create_error/.gitignore
deleted file mode 100644
index 16c79c8dd..000000000
--- a/src/test/vmem_pool_create_error/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vmem_pool_create_error
diff --git a/src/test/vmem_pool_create_error/out0.log.match b/src/test/vmem_pool_create_error/out0.log.match
deleted file mode 100644
index 1760759a7..000000000
--- a/src/test/vmem_pool_create_error/out0.log.match
+++ /dev/null
@@ -1,3 +0,0 @@
-vmem_pool_create_error/TEST0: START: vmem_pool_create_error
- ./vmem_pool_create_error$(*)
-vmem_pool_create_error/TEST0: Done
diff --git a/src/test/vmem_pool_create_in_region/.gitignore b/src/test/vmem_pool_create_in_region/.gitignore
deleted file mode 100644
index 6e0c9297b..000000000
--- a/src/test/vmem_pool_create_in_region/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vmem_pool_create_in_region
diff --git a/src/test/vmem_pool_create_in_region/Makefile b/src/test/vmem_pool_create_in_region/Makefile
deleted file mode 100644
index 31dbfdcd2..000000000
--- a/src/test/vmem_pool_create_in_region/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright (c) 2014, Intel Corporation
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in
-#       the documentation and/or other materials provided with the
-#       distribution.
-#
-#     * Neither the name of Intel Corporation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-#
-# src/test/vmem_pool_create_in_region/Makefile -- build vmem_pool_create_in_region unit test
-#
-TARGET = vmem_pool_create_in_region
-OBJS = vmem_pool_create_in_region.o
-
-LIBVMEM=y
-
-include ../Makefile.inc
-
-vmem_pool_create_in_region.o: vmem_pool_create_in_region.c
diff --git a/src/test/vmem_pool_create_in_region/out0.log.match b/src/test/vmem_pool_create_in_region/out0.log.match
deleted file mode 100644
index 90811d757..000000000
--- a/src/test/vmem_pool_create_in_region/out0.log.match
+++ /dev/null
@@ -1,3 +0,0 @@
-vmem_pool_create_in_region/TEST0: START: vmem_pool_create_in_region
- ./vmem_pool_create_in_region$(*)
-vmem_pool_create_in_region/TEST0: Done
diff --git a/src/test/vmem_realloc/vmem_realloc.c b/src/test/vmem_realloc/vmem_realloc.c
index bf4435426..8ddd69b51 100644
--- a/src/test/vmem_realloc/vmem_realloc.c
+++ b/src/test/vmem_realloc/vmem_realloc.c
@@ -55,17 +55,17 @@ main(int argc, char *argv[])
 	}
 
 	if (dir == NULL) {
-		/* allocate memory for function vmem_pool_create_in_region() */
+		/* allocate memory for function vmem_create_in_region() */
 		mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 
-		vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+		vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create_in_region");
+			FATAL("!vmem_create_in_region");
 	} else {
-		vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+		vmp = vmem_create(dir, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create");
+			FATAL("!vmem_create");
 	}
 
 	int *test = vmem_realloc(vmp, NULL, sizeof (int));
@@ -92,7 +92,7 @@ main(int argc, char *argv[])
 
 	vmem_free(vmp, test);
 
-	vmem_pool_delete(vmp);
+	vmem_delete(vmp);
 
 	DONE(NULL);
 }
diff --git a/src/test/vmem_stats/vmem_stats.c b/src/test/vmem_stats/vmem_stats.c
index 5be85d51f..8bb0d0959 100644
--- a/src/test/vmem_stats/vmem_stats.c
+++ b/src/test/vmem_stats/vmem_stats.c
@@ -57,27 +57,27 @@ main(int argc, char *argv[])
 	mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
 				MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 
-	vmp_unused = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+	vmp_unused = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
 	if (vmp_unused == NULL)
-		FATAL("!vmem_pool_create_in_region");
+		FATAL("!vmem_create_in_region");
 
 	mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 
-	vmp_used = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+	vmp_used = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
 	if (vmp_used == NULL)
-		FATAL("!vmem_pool_create_in_region");
+		FATAL("!vmem_create_in_region");
 
 	int *test = vmem_malloc(vmp_used, sizeof (int)*100);
 	ASSERTne(test, NULL);
 
-	vmem_pool_stats_print(vmp_unused, opts);
-	vmem_pool_stats_print(vmp_used, opts);
+	vmem_stats_print(vmp_unused, opts);
+	vmem_stats_print(vmp_used, opts);
 
 	vmem_free(vmp_used, test);
 
-	vmem_pool_delete(vmp_unused);
-	vmem_pool_delete(vmp_used);
+	vmem_delete(vmp_unused);
+	vmem_delete(vmp_used);
 
 	DONE(NULL);
 }
diff --git a/src/test/vmem_strdup/vmem_strdup.c b/src/test/vmem_strdup/vmem_strdup.c
index 989fa8170..7df3c2661 100644
--- a/src/test/vmem_strdup/vmem_strdup.c
+++ b/src/test/vmem_strdup/vmem_strdup.c
@@ -56,17 +56,17 @@ main(int argc, char *argv[])
 	}
 
 	if (dir == NULL) {
-		/* allocate memory for function vmem_pool_create_in_region() */
+		/* allocate memory for function vmem_create_in_region() */
 		mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 
-		vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+		vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create_in_region");
+			FATAL("!vmem_create_in_region");
 	} else {
-		vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+		vmp = vmem_create(dir, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create");
+			FATAL("!vmem_create");
 	}
 
 	char *str1 = vmem_strdup(vmp, text);
@@ -90,7 +90,7 @@ main(int argc, char *argv[])
 	vmem_free(vmp, str1);
 	vmem_free(vmp, str2);
 
-	vmem_pool_delete(vmp);
+	vmem_delete(vmp);
 
 	DONE(NULL);
 }
diff --git a/src/test/vmem_valgrind/vmem_valgrind.c b/src/test/vmem_valgrind/vmem_valgrind.c
index 7c86fa559..2415d10f9 100644
--- a/src/test/vmem_valgrind/vmem_valgrind.c
+++ b/src/test/vmem_valgrind/vmem_valgrind.c
@@ -134,17 +134,17 @@ main(int argc, char *argv[])
 	}
 
 	if (dir == NULL) {
-		/* allocate memory for function vmem_pool_create_in_region() */
+		/* allocate memory for function vmem_create_in_region() */
 		void *mem_pool = MMAP(NULL, VMEM_MIN_POOL, PROT_READ|PROT_WRITE,
 					MAP_ANONYMOUS|MAP_PRIVATE, -1, 0);
 
-		vmp = vmem_pool_create_in_region(mem_pool, VMEM_MIN_POOL);
+		vmp = vmem_create_in_region(mem_pool, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create_in_region");
+			FATAL("!vmem_create_in_region");
 	} else {
-		vmp = vmem_pool_create(dir, VMEM_MIN_POOL);
+		vmp = vmem_create(dir, VMEM_MIN_POOL);
 		if (vmp == NULL)
-			FATAL("!vmem_pool_create");
+			FATAL("!vmem_create");
 	}
 
 	switch (test_case) {
@@ -155,7 +155,7 @@ main(int argc, char *argv[])
 				FATAL("!vmem_malloc");
 
 			vmem_free(vmp, ptr);
-			vmem_pool_delete(vmp);
+			vmem_delete(vmp);
 			break;
 		}
 		case 1: {
@@ -173,7 +173,7 @@ main(int argc, char *argv[])
 			if (ptr == NULL)
 				FATAL("!vmem_malloc");
 
-			vmem_pool_delete(vmp);
+			vmem_delete(vmp);
 
 			/* prevent reporting leaked memory as still reachable */
 			ptr = NULL;
@@ -199,7 +199,7 @@ main(int argc, char *argv[])
 			ptr[12] = 7;
 
 			vmem_free(vmp, ptr);
-			vmem_pool_delete(vmp);
+			vmem_delete(vmp);
 			break;
 		}
 		default: {
diff --git a/src/vmem.c b/src/vmem.c
index a2739caae..55aed5488 100644
--- a/src/vmem.c
+++ b/src/vmem.c
@@ -98,10 +98,10 @@ vmem_init(void)
 }
 
 /*
- * vmem_pool_create -- create a memory pool in a temp file
+ * vmem_create -- create a memory pool in a temp file
  */
 VMEM *
-vmem_pool_create(const char *dir, size_t size)
+vmem_create(const char *dir, size_t size)
 {
 	LOG(3, "dir \"%s\" size %zu", dir, size);
 
@@ -147,10 +147,10 @@ vmem_pool_create(const char *dir, size_t size)
 }
 
 /*
- * vmem_pool_create_in_region -- create a memory pool in a given range
+ * vmem_create_in_region -- create a memory pool in a given range
  */
 VMEM *
-vmem_pool_create_in_region(void *addr, size_t size)
+vmem_create_in_region(void *addr, size_t size)
 {
 	LOG(3, "addr %p size %zu", addr, size);
 
@@ -194,10 +194,10 @@ vmem_pool_create_in_region(void *addr, size_t size)
 }
 
 /*
- * vmem_pool_delete -- delete a memory pool
+ * vmem_delete -- delete a memory pool
  */
 void
-vmem_pool_delete(VMEM *vmp)
+vmem_delete(VMEM *vmp)
 {
 	LOG(3, "vmp %p", vmp);
 
@@ -209,10 +209,10 @@ vmem_pool_delete(VMEM *vmp)
 }
 
 /*
- * vmem_pool_check -- memory pool consistency check
+ * vmem_check -- memory pool consistency check
  */
 int
-vmem_pool_check(VMEM *vmp)
+vmem_check(VMEM *vmp)
 {
 	LOG(3, "vmp %p", vmp);
 
@@ -220,10 +220,10 @@ vmem_pool_check(VMEM *vmp)
 }
 
 /*
- * vmem_pool_freespace -- return current freespace in memory pool
+ * vmem_freespace -- return current freespace in memory pool
  */
 size_t
-vmem_pool_freespace(VMEM *vmp)
+vmem_freespace(VMEM *vmp)
 {
 	LOG(3, "vmp %p", vmp);
 
@@ -231,10 +231,10 @@ vmem_pool_freespace(VMEM *vmp)
 }
 
 /*
- * vmem_pool_stats_print -- spew memory allocator stats for a pool
+ * vmem_stats_print -- spew memory allocator stats for a pool
  */
 void
-vmem_pool_stats_print(VMEM *vmp, const char *opts)
+vmem_stats_print(VMEM *vmp, const char *opts)
 {
 	LOG(3, "vmp %p opts \"%s\"", vmp, opts);
 
-- 
GitLab