diff --git a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_cli.erl b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_cli.erl
index d206f3e07..b05c3c155 100644
--- a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_cli.erl
+++ b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia_cli.erl
@@ -58,7 +58,7 @@ insert_user(User = #emqx_user{login = Login}) ->
         [_|_] -> mnesia:abort(existed)
     end.
 
--spec(add_default_user(clientid | username, tuple(), binary()) -> ok | {error, any()}).
+-spec(add_default_user(clientid | username, binary(), binary()) -> ok | {error, any()}).
 add_default_user(Type, Key, Password) ->
     Login = {Type, Key},
     case add_user(Login, Password) of
diff --git a/src/emqx_connection.erl b/src/emqx_connection.erl
index ccf4430a9..7938ada74 100644
--- a/src/emqx_connection.erl
+++ b/src/emqx_connection.erl
@@ -122,7 +122,7 @@
                     , 'recv_msg.qos1'
                     , 'recv_msg.qos2'
                     , 'recv_msg.dropped'
-                    , 'recv_msg.dropped.expired'
+                    , 'recv_msg.dropped.await_pubrel_timeout'
                     , send_pkt
                     , send_msg
                     , 'send_msg.qos0'
diff --git a/src/emqx_session.erl b/src/emqx_session.erl
index 5741b2753..bb5e84ac4 100644
--- a/src/emqx_session.erl
+++ b/src/emqx_session.erl
@@ -687,7 +687,7 @@ inc_delivery_expired_cnt(N) ->
 
 inc_await_pubrel_timeout(N) ->
     ok = inc_pd('recv_msg.dropped', N),
-    ok = inc_pd('recv_msg.dropped.expired', N),
+    ok = inc_pd('recv_msg.dropped.await_pubrel_timeout', N),
     ok = emqx_metrics:inc('messages.dropped', N),
     emqx_metrics:inc('messages.dropped.await_pubrel_timeout', N).