diff --git a/lib/nvmf/request.c b/lib/nvmf/request.c
index e253be953..e6c717119 100644
--- a/lib/nvmf/request.c
+++ b/lib/nvmf/request.c
@@ -131,7 +131,7 @@ nvmf_process_property_get(struct spdk_nvmf_request *req)
 	cmd = &req->cmd->prop_get_cmd;
 	response = &req->rsp->prop_get_rsp;
 
-	nvmf_property_get(req->conn->sess, cmd, response);
+	spdk_nvmf_property_get(req->conn->sess, cmd, response);
 
 	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;
 }
@@ -143,7 +143,7 @@ nvmf_process_property_set(struct spdk_nvmf_request *req)
 
 	cmd = &req->cmd->prop_set_cmd;
 
-	nvmf_property_set(req->conn->sess, cmd, &req->rsp->nvme_cpl);
+	spdk_nvmf_property_set(req->conn->sess, cmd, &req->rsp->nvme_cpl);
 
 	return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;
 }
diff --git a/lib/nvmf/session.c b/lib/nvmf/session.c
index 3a92887a0..2830f692f 100644
--- a/lib/nvmf/session.c
+++ b/lib/nvmf/session.c
@@ -477,9 +477,9 @@ find_prop(uint32_t ofst)
 }
 
 void
-nvmf_property_get(struct nvmf_session *session,
-		  struct spdk_nvmf_fabric_prop_get_cmd *cmd,
-		  struct spdk_nvmf_fabric_prop_get_rsp *response)
+spdk_nvmf_property_get(struct nvmf_session *session,
+		       struct spdk_nvmf_fabric_prop_get_cmd *cmd,
+		       struct spdk_nvmf_fabric_prop_get_rsp *response)
 {
 	const struct nvmf_prop *prop;
 
@@ -515,9 +515,9 @@ nvmf_property_get(struct nvmf_session *session,
 }
 
 void
-nvmf_property_set(struct nvmf_session *session,
-		  struct spdk_nvmf_fabric_prop_set_cmd *cmd,
-		  struct spdk_nvme_cpl *response)
+spdk_nvmf_property_set(struct nvmf_session *session,
+		       struct spdk_nvmf_fabric_prop_set_cmd *cmd,
+		       struct spdk_nvme_cpl *response)
 {
 	const struct nvmf_prop *prop;
 	uint64_t value;
diff --git a/lib/nvmf/session.h b/lib/nvmf/session.h
index 684544882..21f7f7ea0 100644
--- a/lib/nvmf/session.h
+++ b/lib/nvmf/session.h
@@ -97,14 +97,14 @@ void
 spdk_nvmf_session_disconnect(struct spdk_nvmf_conn *conn);
 
 void
-nvmf_property_get(struct nvmf_session *session,
-		  struct spdk_nvmf_fabric_prop_get_cmd *cmd,
-		  struct spdk_nvmf_fabric_prop_get_rsp *response);
+spdk_nvmf_property_get(struct nvmf_session *session,
+		       struct spdk_nvmf_fabric_prop_get_cmd *cmd,
+		       struct spdk_nvmf_fabric_prop_get_rsp *response);
 
 void
-nvmf_property_set(struct nvmf_session *session,
-		  struct spdk_nvmf_fabric_prop_set_cmd *cmd,
-		  struct spdk_nvme_cpl *rsp);
+spdk_nvmf_property_set(struct nvmf_session *session,
+		       struct spdk_nvmf_fabric_prop_set_cmd *cmd,
+		       struct spdk_nvme_cpl *rsp);
 
 int spdk_nvmf_session_poll(struct nvmf_session *session);
 
diff --git a/test/lib/nvmf/nvmf/nvmf_ut.c b/test/lib/nvmf/nvmf/nvmf_ut.c
index a0e105e2d..e6c4d2011 100644
--- a/test/lib/nvmf/nvmf/nvmf_ut.c
+++ b/test/lib/nvmf/nvmf/nvmf_ut.c
@@ -704,7 +704,7 @@ nvmf_test_process_admin_cmd(void)
 
 #define RUN_AND_CHECK_PROPERTY_RESULT(fsts, cmd_cid) \
 	do { \
-		nvmf_property_get(sess, &cmd, &response); \
+		spdk_nvmf_property_get(sess, &cmd, &response); \
 		CU_ASSERT_EQUAL(response.status.sc, fsts); \
 	} while (0)
 
@@ -792,7 +792,7 @@ nvmf_test_property_get(void)
 	cmd.ofst = 0xffff;
 	cmd.attrib = 0;
 	cmd.cid = 29;
-	nvmf_property_get(sess, &cmd, &response);
+	spdk_nvmf_property_get(sess, &cmd, &response);
 	CU_ASSERT_EQUAL(response.status.sc, SPDK_NVMF_FABRIC_SC_INVALID_PARAM);
 }
 
@@ -815,7 +815,7 @@ nvmf_test_property_set(void)
 		BUILD_PROPERTY_CMD(property_name, attr, c_id); \
 		property_name = (union union_name *)&cmd.value.u32.low; \
 		property_name->bits.bits_attr = val; \
-		nvmf_property_set(sess, &cmd, &response, &shutdown); \
+		spdk_nvmf_property_set(sess, &cmd, &response, &shutdown); \
 		CU_ASSERT_EQUAL(response.status.sc, 0); \
 		CU_ASSERT_EQUAL(sess->vcprop.property_name.bits.bits_attr, val); \
 	} while (0)
@@ -827,7 +827,7 @@ nvmf_test_property_set(void)
 	cmd.attrib = 0;
 	cmd.cid = 34;
 	cmd.value.u32.low = nssr;
-	nvmf_property_set(sess, &cmd, &response, &shutdown);
+	spdk_nvmf_property_set(sess, &cmd, &response, &shutdown);
 	CU_ASSERT_EQUAL(response.status.sc, 0);
 	CU_ASSERT_EQUAL(sess->vcprop.nssr, nssr);
 
@@ -837,7 +837,7 @@ nvmf_test_property_set(void)
 		BUILD_PROPERTY_CMD(property_name, attr, c_id); \
 		property_name = (union union_name *)&cmd.value.u32.low; \
 		property_name->bits.bits_attr = val; \
-		nvmf_property_set(sess, &cmd, &response, &shutdown); \
+		spdk_nvmf_property_set(sess, &cmd, &response, &shutdown); \
 		CU_ASSERT_EQUAL(response.status.sc, SPDK_NVMF_FABRIC_SC_INVALID_PARAM); \
 		CU_ASSERT_NOT_EQUAL(sess->vcprop.property_name.bits.bits_attr, val); \
 	} while (0)
@@ -850,14 +850,14 @@ nvmf_test_property_set(void)
 	cmd.attrib = 1;
 	cmd.cid = 37;
 	cmd.value.u32.low = nssr;
-	nvmf_property_set(sess, &cmd, &response, &shutdown);
+	spdk_nvmf_property_set(sess, &cmd, &response, &shutdown);
 	CU_ASSERT_EQUAL(response.status.sc, SPDK_NVMF_FABRIC_SC_INVALID_PARAM);
 
 	cmd.ofst = 0xffff;
 	cmd.attrib = 0;
 	cmd.value.u32.low = 20;
 	cmd.cid = 35;
-	nvmf_property_set(sess, &cmd, &response, &shutdown);
+	spdk_nvmf_property_set(sess, &cmd, &response, &shutdown);
 	CU_ASSERT_EQUAL(response.status.sc, SPDK_NVMF_FABRIC_SC_INVALID_PARAM);
 }
 
diff --git a/test/lib/nvmf/request/request_ut.c b/test/lib/nvmf/request/request_ut.c
index dc00a9f34..195e2bce0 100644
--- a/test/lib/nvmf/request/request_ut.c
+++ b/test/lib/nvmf/request/request_ut.c
@@ -116,16 +116,16 @@ spdk_nvmf_session_disconnect(struct spdk_nvmf_conn *conn)
 }
 
 void
-nvmf_property_get(struct nvmf_session *session,
-		  struct spdk_nvmf_fabric_prop_get_cmd *cmd,
-		  struct spdk_nvmf_fabric_prop_get_rsp *response)
+spdk_nvmf_property_get(struct nvmf_session *session,
+		       struct spdk_nvmf_fabric_prop_get_cmd *cmd,
+		       struct spdk_nvmf_fabric_prop_get_rsp *response)
 {
 }
 
 void
-nvmf_property_set(struct nvmf_session *session,
-		  struct spdk_nvmf_fabric_prop_set_cmd *cmd,
-		  struct spdk_nvme_cpl *rsp)
+spdk_nvmf_property_set(struct nvmf_session *session,
+		       struct spdk_nvmf_fabric_prop_set_cmd *cmd,
+		       struct spdk_nvme_cpl *rsp)
 {
 }