diff --git a/app/iscsi_tgt/iscsi_tgt.c b/app/iscsi_tgt/iscsi_tgt.c
index 69827d6ab..58911982d 100644
--- a/app/iscsi_tgt/iscsi_tgt.c
+++ b/app/iscsi_tgt/iscsi_tgt.c
@@ -140,13 +140,13 @@ main(int argc, char **argv)
 			opts.reactor_mask = optarg;
 			break;
 		case 'n':
-			opts.dpdk_mem_channel = atoi(optarg);
+			opts.mem_channel = atoi(optarg);
 			break;
 		case 'p':
-			opts.dpdk_master_core = atoi(optarg);
+			opts.master_core = atoi(optarg);
 			break;
 		case 's':
-			opts.dpdk_mem_size = atoi(optarg);
+			opts.mem_size = atoi(optarg);
 			break;
 		case 'b':
 			daemon_mode = 1;
diff --git a/app/nvmf_tgt/nvmf_main.c b/app/nvmf_tgt/nvmf_main.c
index a05bbc700..1342740b3 100644
--- a/app/nvmf_tgt/nvmf_main.c
+++ b/app/nvmf_tgt/nvmf_main.c
@@ -113,13 +113,13 @@ main(int argc, char **argv)
 			opts.reactor_mask = optarg;
 			break;
 		case 'n':
-			opts.dpdk_mem_channel = atoi(optarg);
+			opts.mem_channel = atoi(optarg);
 			break;
 		case 'p':
-			opts.dpdk_master_core = atoi(optarg);
+			opts.master_core = atoi(optarg);
 			break;
 		case 's':
-			opts.dpdk_mem_size = atoi(optarg);
+			opts.mem_size = atoi(optarg);
 			break;
 		case 'e':
 			opts.tpoint_group_mask = optarg;
diff --git a/app/vhost/vhost.c b/app/vhost/vhost.c
index ad3fb1442..37ae14de9 100644
--- a/app/vhost/vhost.c
+++ b/app/vhost/vhost.c
@@ -50,7 +50,7 @@ vhost_app_opts_init(struct spdk_app_opts *opts)
 	spdk_app_opts_init(opts);
 	opts->name = "vhost";
 	opts->config_file = SPDK_VHOST_DEFAULT_CONFIG;
-	opts->dpdk_mem_size = SPDK_VHOST_DEFAULT_MEM_SIZE;
+	opts->mem_size = SPDK_VHOST_DEFAULT_MEM_SIZE;
 }
 
 static void
@@ -68,7 +68,7 @@ usage(char *executable_name)
 	printf(" -l facility use specific syslog facility (default: %s)\n", defaults.log_facility);
 	printf(" -n channel number of memory channels used for DPDK\n");
 	printf(" -p core    master (primary) core for DPDK\n");
-	printf(" -s size    memory size in MB for DPDK (default: %dMB)\n", defaults.dpdk_mem_size);
+	printf(" -s size    memory size in MB for DPDK (default: %dMB)\n", defaults.mem_size);
 	printf(" -S dir     directory where to create vhost sockets (default: pwd)\n");
 	spdk_tracelog_usage(stdout, "-t");
 	printf(" -h         show this usage\n");
@@ -107,13 +107,13 @@ main(int argc, char *argv[])
 			opts.reactor_mask = optarg;
 			break;
 		case 'p':
-			opts.dpdk_master_core = strtoul(optarg, NULL, 10);
+			opts.master_core = strtoul(optarg, NULL, 10);
 			break;
 		case 'q':
 			spdk_g_notice_stderr_flag = 0;
 			break;
 		case 's':
-			opts.dpdk_mem_size = strtoul(optarg, NULL, 10);
+			opts.mem_size = strtoul(optarg, NULL, 10);
 			break;
 		case 'S':
 			socket_path = optarg;
diff --git a/examples/nvme/fio_plugin/fio_plugin.c b/examples/nvme/fio_plugin/fio_plugin.c
index f4bb8b6ea..7e29eb3ed 100644
--- a/examples/nvme/fio_plugin/fio_plugin.c
+++ b/examples/nvme/fio_plugin/fio_plugin.c
@@ -231,7 +231,7 @@ static int spdk_fio_setup(struct thread_data *td)
 	if (!spdk_env_initialized) {
 		spdk_env_opts_init(&opts);
 		opts.name = "fio";
-		opts.dpdk_mem_size = 512;
+		opts.mem_size = 512;
 		spdk_env_init(&opts);
 		spdk_env_initialized = true;
 		cpu_core_unaffinitized();
diff --git a/examples/nvme/identify/identify.c b/examples/nvme/identify/identify.c
index 2995ba294..ce4ed962d 100644
--- a/examples/nvme/identify/identify.c
+++ b/examples/nvme/identify/identify.c
@@ -1073,9 +1073,9 @@ int main(int argc, char **argv)
 	spdk_env_opts_init(&opts);
 	opts.name = "identify";
 	opts.shm_id = g_shm_id;
-	opts.dpdk_mem_size = g_dpdk_mem;
-	opts.dpdk_mem_channel = 1;
-	opts.dpdk_master_core = g_master_core;
+	opts.mem_size = g_dpdk_mem;
+	opts.mem_channel = 1;
+	opts.master_core = g_master_core;
 	opts.core_mask = g_core_mask;
 	if (g_trid.trtype != SPDK_NVME_TRANSPORT_PCIE) {
 		opts.no_pci = true;
diff --git a/examples/nvme/perf/perf.c b/examples/nvme/perf/perf.c
index d003e8317..82fd1ba93 100644
--- a/examples/nvme/perf/perf.c
+++ b/examples/nvme/perf/perf.c
@@ -1344,7 +1344,7 @@ int main(int argc, char **argv)
 	}
 
 	if (g_dpdk_mem) {
-		opts.dpdk_mem_size = g_dpdk_mem;
+		opts.mem_size = g_dpdk_mem;
 	}
 	if (g_no_pci) {
 		opts.no_pci = g_no_pci;
diff --git a/include/spdk/env.h b/include/spdk/env.h
index 878cb260d..ac8eaaa42 100644
--- a/include/spdk/env.h
+++ b/include/spdk/env.h
@@ -56,9 +56,9 @@ struct spdk_env_opts {
 	const char 		*name;
 	const char 		*core_mask;
 	int 			shm_id;
-	int	 		dpdk_mem_channel;
-	int	 		dpdk_master_core;
-	int			dpdk_mem_size;
+	int	 		mem_channel;
+	int	 		master_core;
+	int			mem_size;
 	bool			no_pci;
 };
 
diff --git a/include/spdk/event.h b/include/spdk/event.h
index b155a9ac0..2a65f8de4 100644
--- a/include/spdk/event.h
+++ b/include/spdk/event.h
@@ -78,9 +78,9 @@ struct spdk_app_opts {
 	spdk_sighandler_t	usr1_handler;
 
 	bool			enable_coredump;
-	int			dpdk_mem_channel;
-	int	 		dpdk_master_core;
-	int			dpdk_mem_size;
+	int			mem_channel;
+	int	 		master_core;
+	int			mem_size;
 	bool			no_pci;
 
 	/* The maximum latency allowed when passing an event
diff --git a/lib/env_dpdk/init.c b/lib/env_dpdk/init.c
index 20b4a6361..f84c2c81b 100644
--- a/lib/env_dpdk/init.c
+++ b/lib/env_dpdk/init.c
@@ -107,9 +107,9 @@ spdk_env_opts_init(struct spdk_env_opts *opts)
 	opts->name = SPDK_ENV_DPDK_DEFAULT_NAME;
 	opts->core_mask = SPDK_ENV_DPDK_DEFAULT_CORE_MASK;
 	opts->shm_id = SPDK_ENV_DPDK_DEFAULT_SHM_ID;
-	opts->dpdk_mem_size = SPDK_ENV_DPDK_DEFAULT_MEM_SIZE;
-	opts->dpdk_master_core = SPDK_ENV_DPDK_DEFAULT_MASTER_CORE;
-	opts->dpdk_mem_channel = SPDK_ENV_DPDK_DEFAULT_MEM_CHANNEL;
+	opts->mem_size = SPDK_ENV_DPDK_DEFAULT_MEM_SIZE;
+	opts->master_core = SPDK_ENV_DPDK_DEFAULT_MASTER_CORE;
+	opts->mem_channel = SPDK_ENV_DPDK_DEFAULT_MEM_CHANNEL;
 }
 
 static void
@@ -174,25 +174,25 @@ spdk_build_eal_cmdline(const struct spdk_env_opts *opts, char **out[])
 	}
 
 	/* set the memory channel number */
-	if (opts->dpdk_mem_channel > 0) {
-		args = spdk_push_arg(args, &argcount, _sprintf_alloc("-n %d", opts->dpdk_mem_channel));
+	if (opts->mem_channel > 0) {
+		args = spdk_push_arg(args, &argcount, _sprintf_alloc("-n %d", opts->mem_channel));
 		if (args == NULL) {
 			return -1;
 		}
 	}
 
 	/* set the memory size */
-	if (opts->dpdk_mem_size > 0) {
-		args = spdk_push_arg(args, &argcount, _sprintf_alloc("-m %d", opts->dpdk_mem_size));
+	if (opts->mem_size > 0) {
+		args = spdk_push_arg(args, &argcount, _sprintf_alloc("-m %d", opts->mem_size));
 		if (args == NULL) {
 			return -1;
 		}
 	}
 
 	/* set the master core */
-	if (opts->dpdk_master_core > 0) {
+	if (opts->master_core > 0) {
 		args = spdk_push_arg(args, &argcount, _sprintf_alloc("--master-lcore=%d",
-				     opts->dpdk_master_core));
+				     opts->master_core));
 		if (args == NULL) {
 			return -1;
 		}
diff --git a/lib/event/app.c b/lib/event/app.c
index c873a03ce..27ba18ff2 100644
--- a/lib/event/app.c
+++ b/lib/event/app.c
@@ -209,9 +209,9 @@ spdk_app_opts_init(struct spdk_app_opts *opts)
 	opts->log_facility = SPDK_APP_DEFAULT_LOG_FACILITY;
 	opts->enable_coredump = true;
 	opts->shm_id = -1;
-	opts->dpdk_mem_size = SPDK_APP_DPDK_DEFAULT_MEM_SIZE;
-	opts->dpdk_master_core = SPDK_APP_DPDK_DEFAULT_MASTER_CORE;
-	opts->dpdk_mem_channel = SPDK_APP_DPDK_DEFAULT_MEM_CHANNEL;
+	opts->mem_size = SPDK_APP_DPDK_DEFAULT_MEM_SIZE;
+	opts->master_core = SPDK_APP_DPDK_DEFAULT_MASTER_CORE;
+	opts->mem_channel = SPDK_APP_DPDK_DEFAULT_MEM_CHANNEL;
 	opts->reactor_mask = NULL;
 	opts->max_delay_us = 0;
 }
@@ -314,9 +314,9 @@ spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn,
 	env_opts.name = opts->name;
 	env_opts.core_mask = opts->reactor_mask;
 	env_opts.shm_id = opts->shm_id;
-	env_opts.dpdk_mem_channel = opts->dpdk_mem_channel;
-	env_opts.dpdk_master_core = opts->dpdk_master_core;
-	env_opts.dpdk_mem_size = opts->dpdk_mem_size;
+	env_opts.mem_channel = opts->mem_channel;
+	env_opts.master_core = opts->master_core;
+	env_opts.mem_size = opts->mem_size;
 	env_opts.no_pci = opts->no_pci;
 
 	spdk_env_init(&env_opts);
diff --git a/lib/rocksdb/env_spdk.cc b/lib/rocksdb/env_spdk.cc
index dd2bc4f2f..bbdbd6dc2 100644
--- a/lib/rocksdb/env_spdk.cc
+++ b/lib/rocksdb/env_spdk.cc
@@ -527,7 +527,7 @@ SpdkEnv::SpdkEnv(const std::string &dir, const std::string &conf,
 	opts->name = "rocksdb";
 	opts->config_file = mConfig.c_str();
 	opts->reactor_mask = "0x1";
-	opts->dpdk_mem_size = 1024 + cache_size_in_mb;
+	opts->mem_size = 1024 + cache_size_in_mb;
 	opts->shutdown_cb = spdk_rocksdb_shutdown;
 
 	spdk_fs_set_cache_size(cache_size_in_mb);
diff --git a/test/app/stub/stub.c b/test/app/stub/stub.c
index 2a2bac840..7ffb8940d 100644
--- a/test/app/stub/stub.c
+++ b/test/app/stub/stub.c
@@ -84,13 +84,13 @@ main(int argc, char **argv)
 			opts.core_mask = optarg;
 			break;
 		case 'n':
-			opts.dpdk_mem_channel = atoi(optarg);
+			opts.mem_channel = atoi(optarg);
 			break;
 		case 'p':
-			opts.dpdk_master_core = atoi(optarg);
+			opts.master_core = atoi(optarg);
 			break;
 		case 's':
-			opts.dpdk_mem_size = atoi(optarg);
+			opts.mem_size = atoi(optarg);
 			break;
 		case 'H':
 		default:
diff --git a/test/lib/blobfs/fuse/fuse.c b/test/lib/blobfs/fuse/fuse.c
index a75ca73ec..fa35f16a1 100644
--- a/test/lib/blobfs/fuse/fuse.c
+++ b/test/lib/blobfs/fuse/fuse.c
@@ -333,7 +333,7 @@ int main(int argc, char **argv)
 	opts.name = "spdk_fuse";
 	opts.config_file = argv[1];
 	opts.reactor_mask = "0x3";
-	opts.dpdk_mem_size = 6144;
+	opts.mem_size = 6144;
 	opts.shutdown_cb = spdk_fuse_shutdown;
 
 	g_bdev_name = argv[2];
diff --git a/test/lib/blobfs/mkfs/mkfs.c b/test/lib/blobfs/mkfs/mkfs.c
index 86cc0d8be..f6b197889 100644
--- a/test/lib/blobfs/mkfs/mkfs.c
+++ b/test/lib/blobfs/mkfs/mkfs.c
@@ -104,7 +104,7 @@ int main(int argc, char **argv)
 	opts.name = "spdk_mkfs";
 	opts.config_file = argv[1];
 	opts.reactor_mask = "0x3";
-	opts.dpdk_mem_size = 1024;
+	opts.mem_size = 1024;
 	opts.shutdown_cb = NULL;
 
 	spdk_fs_set_cache_size(512);