diff --git a/apps/emqx/priv/bpapi.versions b/apps/emqx/priv/bpapi.versions
index b6a4c6e7a..68d42ee01 100644
--- a/apps/emqx/priv/bpapi.versions
+++ b/apps/emqx/priv/bpapi.versions
@@ -15,7 +15,6 @@
 {emqx_conf,3}.
 {emqx_dashboard,1}.
 {emqx_delayed,1}.
-{emqx_ds,1}.
 {emqx_eviction_agent,1}.
 {emqx_exhook,1}.
 {emqx_ft_storage_exporter_fs,1}.
@@ -42,6 +41,7 @@
 {emqx_node_rebalance_evacuation,1}.
 {emqx_node_rebalance_status,1}.
 {emqx_persistent_session,1}.
+{emqx_persistent_session_ds,1}.
 {emqx_plugins,1}.
 {emqx_prometheus,1}.
 {emqx_resource,1}.
diff --git a/apps/emqx/src/emqx_persistent_session_ds.erl b/apps/emqx/src/emqx_persistent_session_ds.erl
index 7e9db4707..7d118ccb4 100644
--- a/apps/emqx/src/emqx_persistent_session_ds.erl
+++ b/apps/emqx/src/emqx_persistent_session_ds.erl
@@ -106,7 +106,7 @@ add_subscription(TopicFilterBin, DSSessionID) ->
 -spec open_iterator_on_all_nodes(emqx_topic:words(), emqx_ds:time(), emqx_ds:iterator_id()) -> ok.
 open_iterator_on_all_nodes(TopicFilter, StartMS, IteratorID) ->
     Nodes = emqx:running_nodes(),
-    Results = emqx_ds_proto_v1:open_iterator(Nodes, TopicFilter, StartMS, IteratorID),
+    Results = emqx_persistent_session_ds_proto_v1:open_iterator(Nodes, TopicFilter, StartMS, IteratorID),
     %% TODO: handle errors
     true = lists:all(fun(Res) -> Res =:= {ok, ok} end, Results),
     ok.
diff --git a/apps/emqx/src/proto/emqx_ds_proto_v1.erl b/apps/emqx/src/proto/emqx_persistent_session_ds_proto_v1.erl
similarity index 96%
rename from apps/emqx/src/proto/emqx_ds_proto_v1.erl
rename to apps/emqx/src/proto/emqx_persistent_session_ds_proto_v1.erl
index 2283b7e4e..cd348cc2c 100644
--- a/apps/emqx/src/proto/emqx_ds_proto_v1.erl
+++ b/apps/emqx/src/proto/emqx_persistent_session_ds_proto_v1.erl
@@ -14,7 +14,7 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--module(emqx_ds_proto_v1).
+-module(emqx_persistent_session_ds_proto_v1).
 
 -behaviour(emqx_bpapi).