diff --git a/apps/emqx/src/emqx.app.src b/apps/emqx/src/emqx.app.src
index 97769fe1f..3d26c63ed 100644
--- a/apps/emqx/src/emqx.app.src
+++ b/apps/emqx/src/emqx.app.src
@@ -18,7 +18,7 @@
         sasl,
         lc,
         hocon,
-        emqx_durable_storage,
+        emqx_ds_backends,
         bcrypt,
         pbkdf2,
         emqx_http_lib,
diff --git a/apps/emqx/src/emqx_ds_schema.erl b/apps/emqx/src/emqx_ds_schema.erl
index 5902bcfb7..2fd4752bd 100644
--- a/apps/emqx/src/emqx_ds_schema.erl
+++ b/apps/emqx/src/emqx_ds_schema.erl
@@ -62,7 +62,7 @@ translate_builtin(
                 {emqx_ds_storage_reference, #{}}
         end,
     #{
-        backend => builtin,
+        backend => builtin_raft,
         n_shards => NShards,
         n_sites => NSites,
         replication_factor => ReplFactor,
diff --git a/apps/emqx/test/emqx_persistent_messages_SUITE.erl b/apps/emqx/test/emqx_persistent_messages_SUITE.erl
index 0b54c2c55..951d72c8d 100644
--- a/apps/emqx/test/emqx_persistent_messages_SUITE.erl
+++ b/apps/emqx/test/emqx_persistent_messages_SUITE.erl
@@ -570,7 +570,7 @@ wait_shards_online(Nodes = [Node | _]) ->
     ?retry(500, 10, [?assertEqual(NShards, shards_online(N)) || N <- Nodes]).
 
 shards_online(Node) ->
-    length(erpc:call(Node, emqx_ds_builtin_db_sup, which_shards, [?PERSISTENT_MESSAGE_DB])).
+    length(erpc:call(Node, emqx_ds_builtin_raft_db_sup, which_shards, [?PERSISTENT_MESSAGE_DB])).
 
 get_mqtt_port(Node, Type) ->
     {_IP, Port} = erpc:call(Node, emqx_config, get, [[listeners, Type, default, bind]]),
diff --git a/apps/emqx_durable_storage/src/emqx_ds_builtin_metrics.erl b/apps/emqx_durable_storage/src/emqx_ds_builtin_metrics.erl
index 06bf7f045..a69ae22c2 100644
--- a/apps/emqx_durable_storage/src/emqx_ds_builtin_metrics.erl
+++ b/apps/emqx_durable_storage/src/emqx_ds_builtin_metrics.erl
@@ -180,7 +180,7 @@ prometheus_per_db(NodeOrAggr) ->
             prometheus_per_db(NodeOrAggr, DB, Acc)
         end,
         #{},
-        emqx_ds_builtin_db_sup:which_dbs()
+        emqx_ds_builtin_raft_db_sup:which_dbs()
     ).
 
 %% This function returns the data in the following format:
@@ -246,7 +246,7 @@ prometheus_per_shard(NodeOrAggr) ->
             )
         end,
         #{},
-        emqx_ds_builtin_db_sup:which_dbs()
+        emqx_ds_builtin_raft_db_sup:which_dbs()
     ).
 
 prometheus_per_shard(NodeOrAggr, DB, Shard, Acc0) ->