diff --git a/module/bdev/null/bdev_null_rpc.c b/module/bdev/null/bdev_null_rpc.c
index 40da6239e..f3a433e75 100644
--- a/module/bdev/null/bdev_null_rpc.c
+++ b/module/bdev/null/bdev_null_rpc.c
@@ -67,8 +67,8 @@ static const struct spdk_json_object_decoder rpc_construct_null_decoders[] = {
 };
 
 static void
-spdk_rpc_bdev_null_create(struct spdk_jsonrpc_request *request,
-			  const struct spdk_json_val *params)
+rpc_bdev_null_create(struct spdk_jsonrpc_request *request,
+		     const struct spdk_json_val *params)
 {
 	struct rpc_construct_null req = {};
 	struct spdk_json_write_ctx *w;
@@ -143,7 +143,7 @@ spdk_rpc_bdev_null_create(struct spdk_jsonrpc_request *request,
 cleanup:
 	free_rpc_construct_null(&req);
 }
-SPDK_RPC_REGISTER("bdev_null_create", spdk_rpc_bdev_null_create, SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER("bdev_null_create", rpc_bdev_null_create, SPDK_RPC_RUNTIME)
 SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_null_create, construct_null_bdev)
 
 struct rpc_delete_null {
@@ -161,7 +161,7 @@ static const struct spdk_json_object_decoder rpc_delete_null_decoders[] = {
 };
 
 static void
-_spdk_rpc_bdev_null_delete_cb(void *cb_arg, int bdeverrno)
+rpc_bdev_null_delete_cb(void *cb_arg, int bdeverrno)
 {
 	struct spdk_jsonrpc_request *request = cb_arg;
 	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);
@@ -171,8 +171,8 @@ _spdk_rpc_bdev_null_delete_cb(void *cb_arg, int bdeverrno)
 }
 
 static void
-spdk_rpc_bdev_null_delete(struct spdk_jsonrpc_request *request,
-			  const struct spdk_json_val *params)
+rpc_bdev_null_delete(struct spdk_jsonrpc_request *request,
+		     const struct spdk_json_val *params)
 {
 	struct rpc_delete_null req = {NULL};
 	struct spdk_bdev *bdev;
@@ -191,7 +191,7 @@ spdk_rpc_bdev_null_delete(struct spdk_jsonrpc_request *request,
 		goto cleanup;
 	}
 
-	bdev_null_delete(bdev, _spdk_rpc_bdev_null_delete_cb, request);
+	bdev_null_delete(bdev, rpc_bdev_null_delete_cb, request);
 
 	free_rpc_delete_null(&req);
 
@@ -200,5 +200,5 @@ spdk_rpc_bdev_null_delete(struct spdk_jsonrpc_request *request,
 cleanup:
 	free_rpc_delete_null(&req);
 }
-SPDK_RPC_REGISTER("bdev_null_delete", spdk_rpc_bdev_null_delete, SPDK_RPC_RUNTIME)
+SPDK_RPC_REGISTER("bdev_null_delete", rpc_bdev_null_delete, SPDK_RPC_RUNTIME)
 SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_null_delete, delete_null_bdev)