diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c
index 03a0555a5..b904d8bf9 100644
--- a/lib/vhost/vhost.c
+++ b/lib/vhost/vhost.c
@@ -1538,7 +1538,7 @@ out:
 }
 
 static void
-_spdk_vhost_fini(void *arg1)
+vhost_fini(void *arg1)
 {
 	struct spdk_vhost_dev *vdev, *tmp;
 
@@ -1571,7 +1571,7 @@ session_shutdown(void *arg)
 	}
 
 	SPDK_INFOLOG(SPDK_LOG_VHOST, "Exiting\n");
-	spdk_thread_send_msg(g_vhost_init_thread, _spdk_vhost_fini, NULL);
+	spdk_thread_send_msg(g_vhost_init_thread, vhost_fini, NULL);
 	return NULL;
 }
 
diff --git a/module/bdev/error/vbdev_error.c b/module/bdev/error/vbdev_error.c
index 0c8df65d8..643d0d8a1 100644
--- a/module/bdev/error/vbdev_error.c
+++ b/module/bdev/error/vbdev_error.c
@@ -255,7 +255,7 @@ vbdev_error_base_bdev_hotremove_cb(void *_part_base)
 }
 
 static int
-_spdk_vbdev_error_create(struct spdk_bdev *base_bdev)
+_vbdev_error_create(struct spdk_bdev *base_bdev)
 {
 	struct spdk_bdev_part_base *base = NULL;
 	struct error_disk *disk = NULL;
@@ -321,7 +321,7 @@ vbdev_error_create(const char *base_bdev_name)
 		return 0;
 	}
 
-	rc = _spdk_vbdev_error_create(base_bdev);
+	rc = _vbdev_error_create(base_bdev);
 	if (rc != 0) {
 		vbdev_error_config_remove(base_bdev_name);
 		SPDK_ERRLOG("Could not create ErrorInjection bdev %s (rc=%d)\n",
@@ -478,7 +478,7 @@ vbdev_error_examine(struct spdk_bdev *bdev)
 
 	cfg = vbdev_error_config_find_by_base_name(bdev->name);
 	if (cfg != NULL) {
-		rc = _spdk_vbdev_error_create(bdev);
+		rc = _vbdev_error_create(bdev);
 		if (rc != 0) {
 			SPDK_ERRLOG("could not create error vbdev for bdev %s at examine\n",
 				    bdev->name);
diff --git a/module/bdev/lvol/vbdev_lvol.c b/module/bdev/lvol/vbdev_lvol.c
index d0dd2a601..275d68e6a 100644
--- a/module/bdev/lvol/vbdev_lvol.c
+++ b/module/bdev/lvol/vbdev_lvol.c
@@ -887,7 +887,7 @@ static struct spdk_bdev_fn_table vbdev_lvol_fn_table = {
 };
 
 static void
-_spdk_lvol_destroy_cb(void *cb_arg, int bdeverrno)
+lvol_destroy_cb(void *cb_arg, int bdeverrno)
 {
 }
 
@@ -902,7 +902,7 @@ _create_lvol_disk_destroy_cb(void *cb_arg, int bdeverrno)
 		return;
 	}
 
-	spdk_lvol_destroy(lvol, _spdk_lvol_destroy_cb, NULL);
+	spdk_lvol_destroy(lvol, lvol_destroy_cb, NULL);
 }
 
 static void