diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile
index 8d7b41686..8cebfa6ff 100644
--- a/app/iscsi_tgt/Makefile
+++ b/app/iscsi_tgt/Makefile
@@ -57,7 +57,7 @@ SPDK_LIBS = \
 	$(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \
 	$(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
 	$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
+	$(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 	$(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
 	$(SPDK_ROOT_DIR)/lib/log/rpc/libspdk_log_rpc.a \
 	$(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \
diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile
index 7187129ba..aead5c06e 100644
--- a/app/nvmf_tgt/Makefile
+++ b/app/nvmf_tgt/Makefile
@@ -53,7 +53,7 @@ SPDK_LIBS = \
 	$(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \
 	$(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
 	$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	$(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
+	$(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 	$(SPDK_ROOT_DIR)/lib/bdev/libspdk_bdev.a \
 	$(SPDK_ROOT_DIR)/lib/copy/libspdk_copy.a \
 	$(SPDK_ROOT_DIR)/lib/rpc/libspdk_rpc.a \
diff --git a/autotest.sh b/autotest.sh
index a613c9b61..a8b51da21 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -75,7 +75,7 @@ time test/lib/bdev/blockdev.sh
 time test/lib/event/event.sh
 time test/lib/nvme/nvme.sh
 time test/lib/nvmf/nvmf.sh
-time test/lib/memory/memory.sh
+time test/lib/env/vtophys.sh
 time test/lib/ioat/ioat.sh
 time test/lib/json/json.sh
 time test/lib/jsonrpc/jsonrpc.sh
diff --git a/examples/ioat/perf/Makefile b/examples/ioat/perf/Makefile
index 6284d3d0c..4dc8da92b 100644
--- a/examples/ioat/perf/Makefile
+++ b/examples/ioat/perf/Makefile
@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 
diff --git a/examples/ioat/verify/Makefile b/examples/ioat/verify/Makefile
index 15511f781..5cc3c998b 100644
--- a/examples/ioat/verify/Makefile
+++ b/examples/ioat/verify/Makefile
@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 
diff --git a/examples/nvme/arbitration/Makefile b/examples/nvme/arbitration/Makefile
index 0057530b5..2643f1835 100644
--- a/examples/nvme/arbitration/Makefile
+++ b/examples/nvme/arbitration/Makefile
@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 
diff --git a/examples/nvme/fio_plugin/Makefile b/examples/nvme/fio_plugin/Makefile
index d127fd696..cb6ad04de 100644
--- a/examples/nvme/fio_plugin/Makefile
+++ b/examples/nvme/fio_plugin/Makefile
@@ -46,8 +46,8 @@ LDFLAGS += -shared -rdynamic
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 
diff --git a/examples/nvme/hello_world/Makefile b/examples/nvme/hello_world/Makefile
index a91aae4c5..987ce902f 100644
--- a/examples/nvme/hello_world/Makefile
+++ b/examples/nvme/hello_world/Makefile
@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 
diff --git a/examples/nvme/identify/Makefile b/examples/nvme/identify/Makefile
index 038f8fe31..eccbe3d6c 100644
--- a/examples/nvme/identify/Makefile
+++ b/examples/nvme/identify/Makefile
@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 
diff --git a/examples/nvme/nvme_manage/Makefile b/examples/nvme/nvme_manage/Makefile
index 333893a62..eaf0efdb2 100644
--- a/examples/nvme/nvme_manage/Makefile
+++ b/examples/nvme/nvme_manage/Makefile
@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 
diff --git a/examples/nvme/perf/Makefile b/examples/nvme/perf/Makefile
index 5d9a62b5a..caea7e7ea 100644
--- a/examples/nvme/perf/Makefile
+++ b/examples/nvme/perf/Makefile
@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 
diff --git a/examples/nvme/reserve/Makefile b/examples/nvme/reserve/Makefile
index 450263cbd..06c1b3de9 100644
--- a/examples/nvme/reserve/Makefile
+++ b/examples/nvme/reserve/Makefile
@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 
diff --git a/include/spdk/vtophys.h b/include/spdk/env.h
similarity index 95%
rename from include/spdk/vtophys.h
rename to include/spdk/env.h
index b4ee8bcf6..3bc6723de 100644
--- a/include/spdk/vtophys.h
+++ b/include/spdk/env.h
@@ -32,11 +32,11 @@
  */
 
 /** \file
- * Virtual to physical address translation
+ * Encapsulated third-party dependencies
  */
 
-#ifndef SPDK_VTOPHYS_H
-#define SPDK_VTOPHYS_H
+#ifndef SPDK_ENV_H
+#define SPDK_ENV_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/Makefile b/lib/Makefile
index 5c3c812d3..edcc44f9d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 DIRS-y += bdev conf copy cunit event json jsonrpc \
-          log memory net rpc trace util nvme nvmf scsi ioat
+          log env net rpc trace util nvme nvmf scsi ioat
 ifeq ($(OS),Linux)
 DIRS-y += iscsi
 endif
diff --git a/lib/copy/ioat/copy_engine_ioat.c b/lib/copy/ioat/copy_engine_ioat.c
index 71016b4c4..f9b980a46 100644
--- a/lib/copy/ioat/copy_engine_ioat.c
+++ b/lib/copy/ioat/copy_engine_ioat.c
@@ -41,7 +41,7 @@
 #include <rte_lcore.h>
 
 #include "spdk/copy_engine.h"
-#include "spdk/vtophys.h"
+#include "spdk/env.h"
 #include "spdk/conf.h"
 #include "spdk/log.h"
 #include "spdk/event.h"
diff --git a/lib/memory/Makefile b/lib/env/Makefile
similarity index 99%
rename from lib/memory/Makefile
rename to lib/env/Makefile
index 367a40e05..146f02b87 100644
--- a/lib/memory/Makefile
+++ b/lib/env/Makefile
@@ -36,6 +36,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
 CFLAGS += $(DPDK_INC)
 C_SRCS = vtophys.c
-LIBNAME = memory
+LIBNAME = env
 
 include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
diff --git a/lib/memory/vtophys.c b/lib/env/vtophys.c
similarity index 98%
rename from lib/memory/vtophys.c
rename to lib/env/vtophys.c
index 4b10a073c..2711e81f3 100644
--- a/lib/memory/vtophys.c
+++ b/lib/env/vtophys.c
@@ -37,10 +37,11 @@
 #include <string.h>
 #include <pthread.h>
 
-#include "rte_config.h"
-#include "rte_eal.h"
-#include "rte_eal_memconfig.h"
-#include "spdk/vtophys.h"
+#include <rte_config.h>
+#include <rte_eal.h>
+#include <rte_eal_memconfig.h>
+
+#include "spdk/env.h"
 
 /* x86-64 userspace virtual addresses use only the low 47 bits [0..46],
  * which is enough to cover 128 TB.
diff --git a/lib/ioat/ioat_impl.h b/lib/ioat/ioat_impl.h
index 7d0e07ba9..efb822810 100644
--- a/lib/ioat/ioat_impl.h
+++ b/lib/ioat/ioat_impl.h
@@ -12,7 +12,7 @@
 
 #include "spdk/assert.h"
 #include "spdk/pci.h"
-#include "spdk/vtophys.h"
+#include "spdk/env.h"
 
 #include <rte_pci.h>
 
diff --git a/lib/nvme/nvme_impl.h b/lib/nvme/nvme_impl.h
index 53bef1f7b..ccb839443 100644
--- a/lib/nvme/nvme_impl.h
+++ b/lib/nvme/nvme_impl.h
@@ -45,7 +45,7 @@
 #ifndef __NVME_IMPL_H__
 #define __NVME_IMPL_H__
 
-#include "spdk/vtophys.h"
+#include "spdk/env.h"
 #include "spdk/pci.h"
 #include "spdk/nvme_spec.h"
 #include <assert.h>
diff --git a/test/lib/Makefile b/test/lib/Makefile
index 4337d9b7a..e9970f9f6 100644
--- a/test/lib/Makefile
+++ b/test/lib/Makefile
@@ -34,7 +34,7 @@
 SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
 include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 
-DIRS-y = bdev event log iscsi json jsonrpc nvme nvmf memory scsi ioat util
+DIRS-y = bdev env event log iscsi json jsonrpc nvme nvmf scsi ioat util
 
 .PHONY: all clean $(DIRS-y)
 
diff --git a/test/lib/bdev/bdevio/Makefile b/test/lib/bdev/bdevio/Makefile
index 11c40e03b..2312e52a8 100644
--- a/test/lib/bdev/bdevio/Makefile
+++ b/test/lib/bdev/bdevio/Makefile
@@ -48,7 +48,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/bdev/libspdk_bdev.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
 	     $(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 	     $(SPDK_ROOT_DIR)/lib/rpc/libspdk_rpc.a \
 	     $(SPDK_ROOT_DIR)/lib/jsonrpc/libspdk_jsonrpc.a \
 	     $(SPDK_ROOT_DIR)/lib/json/libspdk_json.a
diff --git a/test/lib/bdev/bdevperf/Makefile b/test/lib/bdev/bdevperf/Makefile
index e182b2462..63aae7d0e 100644
--- a/test/lib/bdev/bdevperf/Makefile
+++ b/test/lib/bdev/bdevperf/Makefile
@@ -48,7 +48,7 @@ SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/bdev/libspdk_bdev.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
 	     $(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 	     $(SPDK_ROOT_DIR)/lib/rpc/libspdk_rpc.a \
 	     $(SPDK_ROOT_DIR)/lib/jsonrpc/libspdk_jsonrpc.a \
 	     $(SPDK_ROOT_DIR)/lib/json/libspdk_json.a
diff --git a/test/lib/memory/.gitignore b/test/lib/env/.gitignore
similarity index 100%
rename from test/lib/memory/.gitignore
rename to test/lib/env/.gitignore
diff --git a/test/lib/memory/Makefile b/test/lib/env/Makefile
similarity index 97%
rename from test/lib/memory/Makefile
rename to test/lib/env/Makefile
index 9d1ae0392..6a85970c4 100644
--- a/test/lib/memory/Makefile
+++ b/test/lib/env/Makefile
@@ -40,7 +40,7 @@ C_SRCS = vtophys.c
 
 CFLAGS += $(DPDK_INC)
 
-SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a
+SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 
diff --git a/test/lib/memory/vtophys.c b/test/lib/env/vtophys.c
similarity index 99%
rename from test/lib/memory/vtophys.c
rename to test/lib/env/vtophys.c
index 27adcf503..a9dbd3db5 100644
--- a/test/lib/memory/vtophys.c
+++ b/test/lib/env/vtophys.c
@@ -40,7 +40,7 @@
 #include <rte_mempool.h>
 #include <rte_malloc.h>
 
-#include "spdk/vtophys.h"
+#include "spdk/env.h"
 
 static const char *ealargs[] = {
 	"vtophys",
diff --git a/test/lib/memory/memory.sh b/test/lib/env/vtophys.sh
similarity index 83%
rename from test/lib/memory/memory.sh
rename to test/lib/env/vtophys.sh
index c695bbe16..3b79d23f8 100755
--- a/test/lib/memory/memory.sh
+++ b/test/lib/env/vtophys.sh
@@ -6,10 +6,10 @@ testdir=$(readlink -f $(dirname $0))
 rootdir="$testdir/../../.."
 source $rootdir/scripts/autotest_common.sh
 
-timing_enter memory
+timing_enter env
 
 timing_enter vtophys
 $testdir/vtophys
 timing_exit vtophys
 
-timing_exit memory
+timing_exit env
diff --git a/test/lib/nvme/aer/Makefile b/test/lib/nvme/aer/Makefile
index fcae5a2c4..7e1310a12 100644
--- a/test/lib/nvme/aer/Makefile
+++ b/test/lib/nvme/aer/Makefile
@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 
diff --git a/test/lib/nvme/e2edp/Makefile b/test/lib/nvme/e2edp/Makefile
index 602b489ad..15ca95d24 100644
--- a/test/lib/nvme/e2edp/Makefile
+++ b/test/lib/nvme/e2edp/Makefile
@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 
diff --git a/test/lib/nvme/overhead/Makefile b/test/lib/nvme/overhead/Makefile
index ed22bae27..8da9b9900 100644
--- a/test/lib/nvme/overhead/Makefile
+++ b/test/lib/nvme/overhead/Makefile
@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 
diff --git a/test/lib/nvme/reset/Makefile b/test/lib/nvme/reset/Makefile
index 7fd1d1eb9..0f88d5bbe 100644
--- a/test/lib/nvme/reset/Makefile
+++ b/test/lib/nvme/reset/Makefile
@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)
 
diff --git a/test/lib/nvme/sgl/Makefile b/test/lib/nvme/sgl/Makefile
index 328e7f0f5..3304cff91 100644
--- a/test/lib/nvme/sgl/Makefile
+++ b/test/lib/nvme/sgl/Makefile
@@ -42,8 +42,8 @@ CFLAGS += -I. $(DPDK_INC)
 
 SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \
 	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \
-	     $(SPDK_ROOT_DIR)/lib/memory/libspdk_memory.a \
 	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \
+	     $(SPDK_ROOT_DIR)/lib/env/libspdk_env.a \
 
 LIBS += $(SPDK_LIBS) $(DPDK_LIB)