diff --git a/module/event/subsystems/bdev/Makefile b/module/event/subsystems/bdev/Makefile
index f8a54f7b1..5392abef3 100644
--- a/module/event/subsystems/bdev/Makefile
+++ b/module/event/subsystems/bdev/Makefile
@@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR)
 C_SRCS = bdev.c
 LIBNAME = event_bdev
 
+SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map
+
 include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
diff --git a/module/event/subsystems/bdev/bdev.c b/module/event/subsystems/bdev/bdev.c
index 28099531b..a7926f936 100644
--- a/module/event/subsystems/bdev/bdev.c
+++ b/module/event/subsystems/bdev/bdev.c
@@ -41,41 +41,41 @@
 #include "spdk/env.h"
 
 static void
-spdk_bdev_initialize_complete(void *cb_arg, int rc)
+bdev_initialize_complete(void *cb_arg, int rc)
 {
 	spdk_subsystem_init_next(rc);
 }
 
 static void
-spdk_bdev_subsystem_initialize(void)
+bdev_subsystem_initialize(void)
 {
-	spdk_bdev_initialize(spdk_bdev_initialize_complete, NULL);
+	spdk_bdev_initialize(bdev_initialize_complete, NULL);
 }
 
 static void
-spdk_bdev_subsystem_finish_done(void *cb_arg)
+bdev_subsystem_finish_done(void *cb_arg)
 {
 	spdk_subsystem_fini_next();
 }
 
 static void
-spdk_bdev_subsystem_finish(void)
+bdev_subsystem_finish(void)
 {
-	spdk_bdev_finish(spdk_bdev_subsystem_finish_done, NULL);
+	spdk_bdev_finish(bdev_subsystem_finish_done, NULL);
 }
 
 static void
-_spdk_bdev_subsystem_config_json(struct spdk_json_write_ctx *w)
+bdev_subsystem_config_json(struct spdk_json_write_ctx *w)
 {
 	spdk_bdev_subsystem_config_json(w);
 }
 
 static struct spdk_subsystem g_spdk_subsystem_bdev = {
 	.name = "bdev",
-	.init = spdk_bdev_subsystem_initialize,
-	.fini = spdk_bdev_subsystem_finish,
+	.init = bdev_subsystem_initialize,
+	.fini = bdev_subsystem_finish,
 	.config = spdk_bdev_config_text,
-	.write_config_json = _spdk_bdev_subsystem_config_json,
+	.write_config_json = bdev_subsystem_config_json,
 };
 
 SPDK_SUBSYSTEM_REGISTER(g_spdk_subsystem_bdev);