diff --git a/apps/emqx/include/emqx.hrl b/apps/emqx/include/emqx.hrl
index 3e484ae5a..916eda533 100644
--- a/apps/emqx/include/emqx.hrl
+++ b/apps/emqx/include/emqx.hrl
@@ -14,8 +14,8 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--ifndef(EMQ_X_HRL).
--define(EMQ_X_HRL, true).
+-ifndef(EMQX_HRL).
+-define(EMQX_HRL, true).
 
 %% Shard
 %%--------------------------------------------------------------------
diff --git a/apps/emqx/include/emqx_mqtt.hrl b/apps/emqx/include/emqx_mqtt.hrl
index 4354d34fb..2e30cf31c 100644
--- a/apps/emqx/include/emqx_mqtt.hrl
+++ b/apps/emqx/include/emqx_mqtt.hrl
@@ -14,8 +14,8 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--ifndef(EMQ_X_MQTT_HRL).
--define(EMQ_X_MQTT_HRL, true).
+-ifndef(EMQX_MQTT_HRL).
+-define(EMQX_MQTT_HRL, true).
 
 -define(UINT_MAX, 16#FFFFFFFF).
 
diff --git a/apps/emqx/include/emqx_placeholder.hrl b/apps/emqx/include/emqx_placeholder.hrl
index d9eea7fc3..0d743565b 100644
--- a/apps/emqx/include/emqx_placeholder.hrl
+++ b/apps/emqx/include/emqx_placeholder.hrl
@@ -14,8 +14,8 @@
 %% limitations under the License.
 %%--------------------------------------------------------------------
 
--ifndef(EMQ_X_PLACEHOLDER_HRL).
--define(EMQ_X_PLACEHOLDER_HRL, true).
+-ifndef(EMQX_PLACEHOLDER_HRL).
+-define(EMQX_PLACEHOLDER_HRL, true).
 
 -define(PH(Type),                   <<"${", Type/binary, "}">>  ).
 
diff --git a/apps/emqx_conf/include/emqx_conf.hrl b/apps/emqx_conf/include/emqx_conf.hrl
index d0206ec9e..87c457f40 100644
--- a/apps/emqx_conf/include/emqx_conf.hrl
+++ b/apps/emqx_conf/include/emqx_conf.hrl
@@ -1,6 +1,6 @@
 
--ifndef(EMQ_X_CONF_HRL).
--define(EMQ_X_CONF_HRL, true).
+-ifndef(EMQX_CONF_HRL).
+-define(EMQX_CONF_HRL, true).
 
 -define(CLUSTER_RPC_SHARD, emqx_cluster_rpc_shard).