diff --git a/apps/emqx/src/emqx_cm.erl b/apps/emqx/src/emqx_cm.erl
index f286a5056..c795f7a33 100644
--- a/apps/emqx/src/emqx_cm.erl
+++ b/apps/emqx/src/emqx_cm.erl
@@ -415,7 +415,7 @@ discard_session(ClientId) when is_binary(ClientId) ->
 %% benefits nobody.
 -spec request_stepdown(Action, module(), pid()) ->
     ok
-    | {ok, emqx_session:session() | list(emqx_type:deliver())}
+    | {ok, emqx_session:session() | list(emqx_types:deliver())}
     | {error, term()}
 when
     Action :: kick | discard | {takeover, 'begin'} | {takeover, 'end'}.
diff --git a/apps/emqx/src/proto/emqx_cm_proto_v2.erl b/apps/emqx/src/proto/emqx_cm_proto_v2.erl
index 9458ba1be..b1eebd2d4 100644
--- a/apps/emqx/src/proto/emqx_cm_proto_v2.erl
+++ b/apps/emqx/src/proto/emqx_cm_proto_v2.erl
@@ -70,8 +70,8 @@ takeover_session(ClientId, ChanPid) ->
     rpc:call(node(ChanPid), emqx_cm, takeover_session, [ClientId, ChanPid], ?T_TAKEOVER * 2).
 
 -spec takeover_finish(module(), emqx_cm:chan_pid()) ->
-    {ok, emqx_type:takeover_data()}
-    | {ok, list(emqx_type:deliver()), emqx_type:takeover_data()}
+    {ok, emqx_types:takeover_data()}
+    | {ok, list(emqx_types:deliver())}
     | {error, term()}
     | {badrpc, _}.
 takeover_finish(ConnMod, ChanPid) ->
diff --git a/apps/emqx_gateway/src/emqx_gateway_cm.erl b/apps/emqx_gateway/src/emqx_gateway_cm.erl
index e52c81856..3c9e487bc 100644
--- a/apps/emqx_gateway/src/emqx_gateway_cm.erl
+++ b/apps/emqx_gateway/src/emqx_gateway_cm.erl
@@ -568,7 +568,7 @@ do_kick_session(GwName, Action, ClientId, ChanPid) ->
 %% benefits nobody.
 -spec request_stepdown(Action, module(), pid()) ->
     ok
-    | {ok, emqx_session:session() | list(emqx_type:deliver())}
+    | {ok, emqx_session:session() | list(emqx_types:deliver())}
     | {error, term()}
 when
     Action :: kick | discard | {takeover, 'begin'} | {takeover, 'end'}.