diff --git a/include/spdk/nvmf.h b/include/spdk/nvmf.h
index 778c5a886..91387351b 100644
--- a/include/spdk/nvmf.h
+++ b/include/spdk/nvmf.h
@@ -150,7 +150,7 @@ int spdk_nvmf_subsystem_start(struct spdk_nvmf_subsystem *subsystem);
 
 void spdk_nvmf_delete_subsystem(struct spdk_nvmf_subsystem *subsystem);
 
-struct spdk_nvmf_subsystem *nvmf_find_subsystem(const char *subnqn);
+struct spdk_nvmf_subsystem *spdk_nvmf_find_subsystem(const char *subnqn);
 
 bool spdk_nvmf_subsystem_exists(const char *subnqn);
 
diff --git a/lib/nvmf/request.c b/lib/nvmf/request.c
index e8fb885ac..bd5c9ca6f 100644
--- a/lib/nvmf/request.c
+++ b/lib/nvmf/request.c
@@ -160,7 +160,7 @@ nvmf_process_connect(struct spdk_nvmf_request *req)
 		return SPDK_NVMF_REQUEST_EXEC_STATUS_COMPLETE;
 	}
 
-	subsystem = nvmf_find_subsystem(data->subnqn);
+	subsystem = spdk_nvmf_find_subsystem(data->subnqn);
 	if (subsystem == NULL) {
 		SPDK_ERRLOG("Could not find subsystem '%s'\n", data->subnqn);
 		INVALID_CONNECT_DATA(subnqn);
diff --git a/lib/nvmf/session.c b/lib/nvmf/session.c
index 499241fc2..096d24c15 100644
--- a/lib/nvmf/session.c
+++ b/lib/nvmf/session.c
@@ -255,7 +255,7 @@ spdk_nvmf_session_connect(struct spdk_nvmf_conn *conn,
 	SPDK_TRACELOG(SPDK_TRACE_NVMF, "  subnqn: \"%s\"\n", data->subnqn);
 	SPDK_TRACELOG(SPDK_TRACE_NVMF, "  hostnqn: \"%s\"\n", data->hostnqn);
 
-	subsystem = nvmf_find_subsystem(data->subnqn);
+	subsystem = spdk_nvmf_find_subsystem(data->subnqn);
 	if (subsystem == NULL) {
 		SPDK_ERRLOG("Could not find subsystem '%s'\n", data->subnqn);
 		INVALID_CONNECT_DATA(subnqn);
diff --git a/lib/nvmf/subsystem.c b/lib/nvmf/subsystem.c
index 48c933fb2..2cdd49939 100644
--- a/lib/nvmf/subsystem.c
+++ b/lib/nvmf/subsystem.c
@@ -64,7 +64,7 @@ spdk_nvmf_subsystem_exists(const char *subnqn)
 }
 
 struct spdk_nvmf_subsystem *
-nvmf_find_subsystem(const char *subnqn)
+spdk_nvmf_find_subsystem(const char *subnqn)
 {
 	struct spdk_nvmf_subsystem	*subsystem;
 
diff --git a/test/lib/nvmf/request/request_ut.c b/test/lib/nvmf/request/request_ut.c
index 6de838aa0..eb8741a44 100644
--- a/test/lib/nvmf/request/request_ut.c
+++ b/test/lib/nvmf/request/request_ut.c
@@ -121,7 +121,7 @@ spdk_nvmf_get_discovery_log_page(void *buffer, uint64_t offset, uint32_t length)
 }
 
 struct spdk_nvmf_subsystem *
-nvmf_find_subsystem(const char *subnqn)
+spdk_nvmf_find_subsystem(const char *subnqn)
 {
 	return NULL;
 }
diff --git a/test/lib/nvmf/session/session_ut.c b/test/lib/nvmf/session/session_ut.c
index d330d70f9..a535f8e47 100644
--- a/test/lib/nvmf/session/session_ut.c
+++ b/test/lib/nvmf/session/session_ut.c
@@ -48,7 +48,7 @@ spdk_nvmf_find_subsystem_with_cntlid(uint16_t cntlid)
 }
 
 struct spdk_nvmf_subsystem *
-nvmf_find_subsystem(const char *subnqn)
+spdk_nvmf_find_subsystem(const char *subnqn)
 {
 	return NULL;
 }
diff --git a/test/lib/nvmf/subsystem/subsystem_ut.c b/test/lib/nvmf/subsystem/subsystem_ut.c
index ccb169726..f5aa9d43c 100644
--- a/test/lib/nvmf/subsystem/subsystem_ut.c
+++ b/test/lib/nvmf/subsystem/subsystem_ut.c
@@ -240,8 +240,8 @@ nvmf_test_create_subsystem(void)
 static void
 nvmf_test_find_subsystem(void)
 {
-	CU_ASSERT_PTR_NULL(nvmf_find_subsystem(NULL));
-	CU_ASSERT_PTR_NULL(nvmf_find_subsystem("fake"));
+	CU_ASSERT_PTR_NULL(spdk_nvmf_find_subsystem(NULL));
+	CU_ASSERT_PTR_NULL(spdk_nvmf_find_subsystem("fake"));
 }
 
 int main(int argc, char **argv)