diff --git a/apps/emqx/etc/emqx.conf b/apps/emqx/etc/emqx.conf
index 1fee36ee3..161c05a12 100644
--- a/apps/emqx/etc/emqx.conf
+++ b/apps/emqx/etc/emqx.conf
@@ -53,7 +53,7 @@ listeners.tcp.default {
     "allow all"
   ]
 
-  ## Enable the Proxy Protocol V1/2 if the EMQ X cluster is deployed
+  ## Enable the Proxy Protocol V1/2 if the EMQX cluster is deployed
   ## behind HAProxy or Nginx.
   ##
   ## See: https://www.haproxy.com/blog/haproxy/proxy-protocol/
@@ -63,7 +63,7 @@ listeners.tcp.default {
   ## Default: false
   proxy_protocol = false
 
-  ## Sets the timeout for proxy protocol. EMQ X will close the TCP connection
+  ## Sets the timeout for proxy protocol. EMQX will close the TCP connection
   ## if no proxy protocol packet received within the timeout.
   ##
   ## @doc listeners.tcp.<name>.proxy_protocol_timeout
@@ -152,7 +152,7 @@ listeners.ssl.default {
     "allow all"
   ]
 
-  ## Enable the Proxy Protocol V1/2 if the EMQ X cluster is deployed
+  ## Enable the Proxy Protocol V1/2 if the EMQX cluster is deployed
   ## behind HAProxy or Nginx.
   ##
   ## See: https://www.haproxy.com/blog/haproxy/proxy-protocol/
@@ -162,7 +162,7 @@ listeners.ssl.default {
   ## Default: true
   proxy_protocol = false
 
-  ## Sets the timeout for proxy protocol. EMQ X will close the TCP connection
+  ## Sets the timeout for proxy protocol. EMQX will close the TCP connection
   ## if no proxy protocol packet received within the timeout.
   ##
   ## @doc listeners.ssl.<name>.proxy_protocol_timeout
@@ -339,7 +339,7 @@ listeners.ws.default {
     "allow all"
   ]
 
-  ## Enable the Proxy Protocol V1/2 if the EMQ X cluster is deployed
+  ## Enable the Proxy Protocol V1/2 if the EMQX cluster is deployed
   ## behind HAProxy or Nginx.
   ##
   ## See: https://www.haproxy.com/blog/haproxy/proxy-protocol/
@@ -349,7 +349,7 @@ listeners.ws.default {
   ## Default: true
   proxy_protocol = false
 
-  ## Sets the timeout for proxy protocol. EMQ X will close the TCP connection
+  ## Sets the timeout for proxy protocol. EMQX will close the TCP connection
   ## if no proxy protocol packet received within the timeout.
   ##
   ## @doc listeners.ws.<name>.proxy_protocol_timeout
@@ -442,7 +442,7 @@ listeners.wss.default {
     "allow all"
   ]
 
-  ## Enable the Proxy Protocol V1/2 if the EMQ X cluster is deployed
+  ## Enable the Proxy Protocol V1/2 if the EMQX cluster is deployed
   ## behind HAProxy or Nginx.
   ##
   ## See: https://www.haproxy.com/blog/haproxy/proxy-protocol/
@@ -452,7 +452,7 @@ listeners.wss.default {
   ## Default: true
   proxy_protocol = false
 
-  ## Sets the timeout for proxy protocol. EMQ X will close the TCP connection
+  ## Sets the timeout for proxy protocol. EMQX will close the TCP connection
   ## if no proxy protocol packet received within the timeout.
   ##
   ## @doc listeners.wss.<name>.proxy_protocol_timeout
@@ -1567,7 +1567,7 @@ example_common_websocket_options {
   ## Default: ""
   websocket.check_origins = "http://localhost:18083, http://127.0.0.1:18083"
 
-  ## Specify which HTTP header for real source IP if the EMQ X cluster is
+  ## Specify which HTTP header for real source IP if the EMQX cluster is
   ## deployed behind NGINX or HAProxy.
   ##
   ## @doc listeners.<name>.websocket.proxy_address_header
@@ -1575,7 +1575,7 @@ example_common_websocket_options {
   ## Default: X-Forwarded-For
   websocket.proxy_address_header = X-Forwarded-For
 
-  ## Specify which HTTP header for real source port if the EMQ X cluster is
+  ## Specify which HTTP header for real source port if the EMQX cluster is
   ## deployed behind NGINX or HAProxy.
   ##
   ## @doc listeners.<name>.websocket.proxy_port_header
diff --git a/apps/emqx_bridge/etc/emqx_bridge.conf b/apps/emqx_bridge/etc/emqx_bridge.conf
index de931ae12..93442b573 100644
--- a/apps/emqx_bridge/etc/emqx_bridge.conf
+++ b/apps/emqx_bridge/etc/emqx_bridge.conf
@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X Bridge
+## EMQX Bridge
 ##--------------------------------------------------------------------
 
 ## MQTT bridges to/from another MQTT broker
diff --git a/apps/emqx_conf/etc/emqx_conf.conf b/apps/emqx_conf/etc/emqx_conf.conf
index 5aff85b86..a7cabb9da 100644
--- a/apps/emqx_conf/etc/emqx_conf.conf
+++ b/apps/emqx_conf/etc/emqx_conf.conf
@@ -5,7 +5,7 @@
 ## 3. File {{ platform_data_dir }}/configs/local-override.conf
 ##
 ## The *-override.conf files are overwritten at runtime when changes
-## are made from EMQ X dashboard UI, management HTTP API, or CLI.
+## are made from EMQX dashboard UI, management HTTP API, or CLI.
 
 ##==================================================================
 ## Node
diff --git a/apps/emqx_dashboard/etc/emqx_dashboard.conf b/apps/emqx_dashboard/etc/emqx_dashboard.conf
index 862c95d07..1c5a757d7 100644
--- a/apps/emqx_dashboard/etc/emqx_dashboard.conf
+++ b/apps/emqx_dashboard/etc/emqx_dashboard.conf
@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X Dashboard
+## EMQX Dashboard
 ##--------------------------------------------------------------------
 
 dashboard {
diff --git a/apps/emqx_exhook/etc/emqx_exhook.conf b/apps/emqx_exhook/etc/emqx_exhook.conf
index fcdb0de96..22a6401dd 100644
--- a/apps/emqx_exhook/etc/emqx_exhook.conf
+++ b/apps/emqx_exhook/etc/emqx_exhook.conf
@@ -1,5 +1,5 @@
 ##====================================================================
-## EMQ X Hooks
+## EMQX Hooks
 ##====================================================================
 
 exhook {
diff --git a/apps/emqx_gateway/etc/emqx_gateway.conf b/apps/emqx_gateway/etc/emqx_gateway.conf
index f6b0aaa37..4ca58ea9c 100644
--- a/apps/emqx_gateway/etc/emqx_gateway.conf
+++ b/apps/emqx_gateway/etc/emqx_gateway.conf
@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X Gateway configurations
+## EMQX Gateway configurations
 ##--------------------------------------------------------------------
 
 ## No gateway by default.
diff --git a/apps/emqx_prometheus/etc/emqx_prometheus.conf b/apps/emqx_prometheus/etc/emqx_prometheus.conf
index 19b88dd84..5a20e5c47 100644
--- a/apps/emqx_prometheus/etc/emqx_prometheus.conf
+++ b/apps/emqx_prometheus/etc/emqx_prometheus.conf
@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## emqx_prometheus for EMQ X
+## emqx_prometheus for EMQX
 ##--------------------------------------------------------------------
 prometheus {
     push_gateway_server = "http://127.0.0.1:9091"
diff --git a/apps/emqx_psk/etc/emqx_psk.conf b/apps/emqx_psk/etc/emqx_psk.conf
index ff9265fe1..9f63d1574 100644
--- a/apps/emqx_psk/etc/emqx_psk.conf
+++ b/apps/emqx_psk/etc/emqx_psk.conf
@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X PSK
+## EMQX PSK
 ##--------------------------------------------------------------------
 
 psk_authentication {
diff --git a/apps/emqx_retainer/etc/emqx_retainer.conf b/apps/emqx_retainer/etc/emqx_retainer.conf
index f7ba44be3..18643d7cf 100644
--- a/apps/emqx_retainer/etc/emqx_retainer.conf
+++ b/apps/emqx_retainer/etc/emqx_retainer.conf
@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X Retainer
+## EMQX Retainer
 ##--------------------------------------------------------------------
 
 ## Where to store the retained messages.
diff --git a/apps/emqx_rule_engine/etc/emqx_rule_engine.conf b/apps/emqx_rule_engine/etc/emqx_rule_engine.conf
index aff89b77e..b502fa039 100644
--- a/apps/emqx_rule_engine/etc/emqx_rule_engine.conf
+++ b/apps/emqx_rule_engine/etc/emqx_rule_engine.conf
@@ -1,5 +1,5 @@
 ##====================================================================
-## Rule Engine for EMQ X R5.0
+## Rule Engine for EMQX R5.0
 ##====================================================================
 rule_engine {
     ignore_sys_message = true
diff --git a/apps/emqx_slow_subs/etc/emqx_slow_subs.conf b/apps/emqx_slow_subs/etc/emqx_slow_subs.conf
index db7f1594d..4323126ad 100644
--- a/apps/emqx_slow_subs/etc/emqx_slow_subs.conf
+++ b/apps/emqx_slow_subs/etc/emqx_slow_subs.conf
@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X Slow Subscribers Statistics
+## EMQX Slow Subscribers Statistics
 ##--------------------------------------------------------------------
 
 slow_subs {
diff --git a/apps/emqx_statsd/etc/emqx_statsd.conf b/apps/emqx_statsd/etc/emqx_statsd.conf
index e3ecfcc2b..7c316b829 100644
--- a/apps/emqx_statsd/etc/emqx_statsd.conf
+++ b/apps/emqx_statsd/etc/emqx_statsd.conf
@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## Statsd for EMQ X
+## Statsd for EMQX
 ##--------------------------------------------------------------------
 
 statsd {