diff --git a/include/emqx.hrl b/include/emqx.hrl
index ee048f1fa..0a9bd646e 100644
--- a/include/emqx.hrl
+++ b/include/emqx.hrl
@@ -154,7 +154,7 @@
 %% Banned
 %%--------------------------------------------------------------------
 
--type(banned_who() ::  {client_id,  binary()}
+-type(banned_who() ::  {clientid,  binary()}
                      | {username,   binary()}
                      | {ip_address, inet:ip_address()}).
 
diff --git a/priv/emqx.schema b/priv/emqx.schema
index 2c43ad577..5e408ef38 100644
--- a/priv/emqx.schema
+++ b/priv/emqx.schema
@@ -524,10 +524,10 @@ end}.
     Formatter = {emqx_logger_formatter,
                   #{template =>
                       [time," [",level,"] ",
-                       {client_id,
+                       {clientid,
                           [{peername,
-                              [client_id,"@",peername," "],
-                              [client_id, " "]}],
+                              [clientid,"@",peername," "],
+                              [clientid, " "]}],
                           [{peername,
                               [peername," "],
                               []}]},
diff --git a/test/emqx_SUITE.erl b/test/emqx_SUITE.erl
index 563683bf1..0a6ef4d0a 100644
--- a/test/emqx_SUITE.erl
+++ b/test/emqx_SUITE.erl
@@ -43,7 +43,7 @@ t_get_env(_) ->
 t_emqx_pubsub_api(_) ->
     emqx:start(),
     true = emqx:is_running(node()),
-    {ok, C} = emqtt:start_link([{host, "localhost"}, {client_id, "myclient"}]),
+    {ok, C} = emqtt:start_link([{host, "localhost"}, {clientid, "myclient"}]),
     {ok, _} = emqtt:connect(C),
     ClientId = <<"myclient">>,
     Topic = <<"mytopic">>,
diff --git a/test/emqx_request_responser_SUITE.erl b/test/emqx_request_responser_SUITE.erl
index d603f2b96..7d66c7760 100644
--- a/test/emqx_request_responser_SUITE.erl
+++ b/test/emqx_request_responser_SUITE.erl
@@ -42,7 +42,7 @@ request_response_per_qos(QoS) ->
     RspTopic = <<"response_topic">>,
     {ok, Requester} = emqx_request_sender:start_link(RspTopic, QoS,
                                                      [{proto_ver, v5},
-                                                      {client_id, <<"requester">>},
+                                                      {clientid, <<"requester">>},
                                                       {properties, #{ 'Request-Response-Information' => 1}}]),
     %% This is a square service
     Square = fun(_CorrData, ReqBin) ->
@@ -51,7 +51,7 @@ request_response_per_qos(QoS) ->
               end,
     {ok, Responser} = emqx_request_handler:start_link(ReqTopic, QoS, Square,
                                                       [{proto_ver, v5},
-                                                       {client_id, <<"responser">>}
+                                                       {clientid, <<"responser">>}
                                                       ]),
     ok = emqx_request_sender:send(Requester, ReqTopic, RspTopic, <<"corr-1">>, <<"2">>, QoS),
     receive