diff --git a/.ci/fvt_tests/relup.lux b/.ci/fvt_tests/relup.lux
index d7ed957d9..b6491e9fa 100644
--- a/.ci/fvt_tests/relup.lux
+++ b/.ci/fvt_tests/relup.lux
@@ -29,7 +29,7 @@
     !export EMQX_LOG__LEVEL=debug
 
     !./bin/emqx start
-    ?EMQ X .* is started successfully!
+    ?EMQX .* is started successfully!
     ?SH-PROMPT
 
 [shell emqx2]
@@ -43,7 +43,7 @@
     !export EMQX_LOG__LEVEL=debug
 
     !./bin/emqx start
-    ?EMQ X .* is started successfully!
+    ?EMQX .* is started successfully!
     ?SH-PROMPT
 
     !./bin/emqx_ctl cluster join emqx@127.0.0.1
diff --git a/CHANGES-4.4.md b/CHANGES-4.4.md
index 47d37d0a3..11c3c83da 100644
--- a/CHANGES-4.4.md
+++ b/CHANGES-4.4.md
@@ -235,8 +235,8 @@ This patch release is only to fix windows build which failed on v4.4.0.
 
 ### Important changes
 
-- **For Debian/Ubuntu users**, Debian/Ubuntu package (deb) installed EMQ X is now started from systemd.
-  This is to use systemd's supervision functionality to ensure that EMQ X service restarts after a crash.
+- **For Debian/Ubuntu users**, Debian/Ubuntu package (deb) installed EMQX is now started from systemd.
+  This is to use systemd's supervision functionality to ensure that EMQX service restarts after a crash.
   The package installation service upgrade from init.d to systemd has been verified,
   it is still recommended that you verify and confirm again before deploying to the production environment,
   at least to ensure that systemd is available in your system
@@ -280,7 +280,7 @@ This patch release is only to fix windows build which failed on v4.4.0.
 - Improve the error log content when the Proxy Protocol message is received without `proxy_protocol` configured.
 
 - Add additional message attributes to the message reported by the gateway.
-  Messages from gateways such as CoAP, LwM2M, Stomp, ExProto, etc., when converted to EMQ X messages,
+  Messages from gateways such as CoAP, LwM2M, Stomp, ExProto, etc., when converted to EMQX messages,
   add fields such as protocol name, protocol version, user name, client IP, etc.,
   which can be used for multi-language hook extension (ExHook)
 
diff --git a/apps/emqx_auth_http/src/emqx_auth_http.app.src b/apps/emqx_auth_http/src/emqx_auth_http.app.src
index a870575ce..c34a21107 100644
--- a/apps/emqx_auth_http/src/emqx_auth_http.app.src
+++ b/apps/emqx_auth_http/src/emqx_auth_http.app.src
@@ -1,5 +1,5 @@
 {application, emqx_auth_http,
- [{description, "EMQ X Authentication/ACL with HTTP API"},
+ [{description, "EMQX Authentication/ACL with HTTP API"},
   {vsn, "4.3.11"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_auth_http_sup]},
@@ -7,7 +7,7 @@
   {mod, {emqx_auth_http_app, []}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-auth-http"}
           ]}
diff --git a/apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src b/apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src
index ab6dd53e7..1a71f6d73 100644
--- a/apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src
+++ b/apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src
@@ -1,5 +1,5 @@
 {application, emqx_auth_jwt,
- [{description, "EMQ X Authentication with JWT"},
+ [{description, "EMQX Authentication with JWT"},
   {vsn, "4.4.9"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_auth_jwt_sup]},
diff --git a/apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src b/apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src
index 4bee1aefa..3035fd6dc 100644
--- a/apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src
+++ b/apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src
@@ -1,5 +1,5 @@
 {application, emqx_auth_ldap,
- [{description, "EMQ X Authentication/ACL with LDAP"},
+ [{description, "EMQX Authentication/ACL with LDAP"},
   {vsn, "4.3.7"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_auth_ldap_sup]},
@@ -7,7 +7,7 @@
   {mod, {emqx_auth_ldap_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-auth-ldap"}
           ]}
diff --git a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src
index c8298c146..1ff3127ee 100644
--- a/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src
+++ b/apps/emqx_auth_mnesia/src/emqx_auth_mnesia.app.src
@@ -1,5 +1,5 @@
 {application, emqx_auth_mnesia,
- [{description, "EMQ X Authentication with Mnesia"},
+ [{description, "EMQX Authentication with Mnesia"},
   {vsn, "4.3.11"}, % strict semver, bump manually
   {modules, []},
   {registered, []},
@@ -7,7 +7,7 @@
   {mod, {emqx_auth_mnesia_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-auth-mnesia"}
           ]}
diff --git a/apps/emqx_auth_mongo/src/emqx_auth_mongo.app.src b/apps/emqx_auth_mongo/src/emqx_auth_mongo.app.src
index 0677f118b..274a40a16 100644
--- a/apps/emqx_auth_mongo/src/emqx_auth_mongo.app.src
+++ b/apps/emqx_auth_mongo/src/emqx_auth_mongo.app.src
@@ -1,5 +1,5 @@
 {application, emqx_auth_mongo,
- [{description, "EMQ X Authentication/ACL with MongoDB"},
+ [{description, "EMQX Authentication/ACL with MongoDB"},
   {vsn, "4.4.6"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_auth_mongo_sup]},
@@ -7,7 +7,7 @@
   {mod, {emqx_auth_mongo_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-auth-mongo"}
           ]}
diff --git a/apps/emqx_auth_mysql/src/emqx_auth_mysql.app.src b/apps/emqx_auth_mysql/src/emqx_auth_mysql.app.src
index abfa86c5f..8ab6e5262 100644
--- a/apps/emqx_auth_mysql/src/emqx_auth_mysql.app.src
+++ b/apps/emqx_auth_mysql/src/emqx_auth_mysql.app.src
@@ -1,5 +1,5 @@
 {application, emqx_auth_mysql,
- [{description, "EMQ X Authentication/ACL with MySQL"},
+ [{description, "EMQX Authentication/ACL with MySQL"},
   {vsn, "4.3.5"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_auth_mysql_sup]},
@@ -7,7 +7,7 @@
   {mod, {emqx_auth_mysql_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-auth-mysql"}
           ]}
diff --git a/apps/emqx_auth_pgsql/src/emqx_auth_pgsql.app.src b/apps/emqx_auth_pgsql/src/emqx_auth_pgsql.app.src
index 96a810d7c..90e81425e 100644
--- a/apps/emqx_auth_pgsql/src/emqx_auth_pgsql.app.src
+++ b/apps/emqx_auth_pgsql/src/emqx_auth_pgsql.app.src
@@ -1,5 +1,5 @@
 {application, emqx_auth_pgsql,
- [{description, "EMQ X Authentication/ACL with PostgreSQL"},
+ [{description, "EMQX Authentication/ACL with PostgreSQL"},
   {vsn, "4.4.5"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_auth_pgsql_sup]},
@@ -7,7 +7,7 @@
   {mod, {emqx_auth_pgsql_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-auth-pgsql"}
           ]}
diff --git a/apps/emqx_auth_redis/src/emqx_auth_redis.app.src b/apps/emqx_auth_redis/src/emqx_auth_redis.app.src
index 0fb0ecaff..591e03d28 100644
--- a/apps/emqx_auth_redis/src/emqx_auth_redis.app.src
+++ b/apps/emqx_auth_redis/src/emqx_auth_redis.app.src
@@ -1,5 +1,5 @@
 {application, emqx_auth_redis,
- [{description, "EMQ X Authentication/ACL with Redis"},
+ [{description, "EMQX Authentication/ACL with Redis"},
   {vsn, "4.3.5"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_auth_redis_sup]},
@@ -7,7 +7,7 @@
   {mod, {emqx_auth_redis_app, []}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-auth-redis"}
           ]}
diff --git a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src
index b58be5d2e..8d19e32fb 100644
--- a/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src
+++ b/apps/emqx_bridge_mqtt/src/emqx_bridge_mqtt.app.src
@@ -1,5 +1,5 @@
 {application, emqx_bridge_mqtt,
- [{description, "EMQ X Bridge to MQTT Broker"},
+ [{description, "EMQX Bridge to MQTT Broker"},
   {vsn, "4.3.8"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
@@ -7,7 +7,7 @@
   {mod, {emqx_bridge_mqtt_app, []}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-bridge-mqtt"}
           ]}
diff --git a/apps/emqx_coap/src/emqx_coap.app.src b/apps/emqx_coap/src/emqx_coap.app.src
index c0648d715..856255b23 100644
--- a/apps/emqx_coap/src/emqx_coap.app.src
+++ b/apps/emqx_coap/src/emqx_coap.app.src
@@ -1,5 +1,5 @@
 {application, emqx_coap,
- [{description, "EMQ X CoAP Gateway"},
+ [{description, "EMQX CoAP Gateway"},
   {vsn, "4.3.3"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
@@ -7,7 +7,7 @@
   {mod, {emqx_coap_app, []}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-coap"}
           ]}
diff --git a/apps/emqx_exhook/src/emqx_exhook.app.src b/apps/emqx_exhook/src/emqx_exhook.app.src
index 839d83b96..8bb6559d1 100644
--- a/apps/emqx_exhook/src/emqx_exhook.app.src
+++ b/apps/emqx_exhook/src/emqx_exhook.app.src
@@ -1,6 +1,6 @@
 %% -*- mode: erlang -*-
 {application, emqx_exhook,
- [{description, "EMQ X Extension for Hook"},
+ [{description, "EMQX Extension for Hook"},
   {vsn, "4.4.6"},
   {modules, []},
   {registered, []},
@@ -8,6 +8,6 @@
   {applications, [kernel,stdlib,grpc]},
   {env,[]},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"}]}
  ]}.
diff --git a/apps/emqx_exproto/src/emqx_exproto.app.src b/apps/emqx_exproto/src/emqx_exproto.app.src
index ef4f7a8ff..898233c9a 100644
--- a/apps/emqx_exproto/src/emqx_exproto.app.src
+++ b/apps/emqx_exproto/src/emqx_exproto.app.src
@@ -1,5 +1,5 @@
 {application, emqx_exproto,
- [{description, "EMQ X Extension for Protocol"},
+ [{description, "EMQX Extension for Protocol"},
   {vsn, "4.3.15"}, %% 4.3.3 is used by ee
   {modules, []},
   {registered, []},
@@ -7,6 +7,6 @@
   {applications, [kernel,stdlib,grpc]},
   {env,[]},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"}]}
  ]}.
diff --git a/apps/emqx_lua_hook/src/emqx_lua_hook.app.src b/apps/emqx_lua_hook/src/emqx_lua_hook.app.src
index 550981b70..e9212029a 100644
--- a/apps/emqx_lua_hook/src/emqx_lua_hook.app.src
+++ b/apps/emqx_lua_hook/src/emqx_lua_hook.app.src
@@ -1,5 +1,5 @@
 {application, emqx_lua_hook,
- [{description, "EMQ X Lua Hooks"},
+ [{description, "EMQX Lua Hooks"},
   {vsn, "4.3.2"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
@@ -7,7 +7,7 @@
   {mod, {emqx_lua_hook_app,[]}},
   {env,[]},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-lua-hook"}
           ]}
diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m.app.src b/apps/emqx_lwm2m/src/emqx_lwm2m.app.src
index 6b0e6bd92..e62fd544e 100644
--- a/apps/emqx_lwm2m/src/emqx_lwm2m.app.src
+++ b/apps/emqx_lwm2m/src/emqx_lwm2m.app.src
@@ -1,5 +1,5 @@
 {application,emqx_lwm2m,
- [{description,"EMQ X LwM2M Gateway"},
+ [{description,"EMQX LwM2M Gateway"},
   {vsn, "4.3.8"}, % strict semver, bump manually!
   {modules,[]},
   {registered,[emqx_lwm2m_sup]},
diff --git a/apps/emqx_management/src/emqx_management.app.src b/apps/emqx_management/src/emqx_management.app.src
index b505e2c69..3b75d8587 100644
--- a/apps/emqx_management/src/emqx_management.app.src
+++ b/apps/emqx_management/src/emqx_management.app.src
@@ -1,5 +1,5 @@
 {application, emqx_management,
- [{description, "EMQ X Management API and CLI"},
+ [{description, "EMQX Management API and CLI"},
   {vsn, "4.4.13"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_management_sup]},
@@ -7,7 +7,7 @@
   {mod, {emqx_mgmt_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-management"}
           ]}
diff --git a/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src b/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src
index 39eb2f0fe..2fc942c4b 100644
--- a/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src
+++ b/apps/emqx_plugin_libs/src/emqx_plugin_libs.app.src
@@ -1,5 +1,5 @@
 {application, emqx_plugin_libs,
- [{description, "EMQ X Plugin utility libs"},
+ [{description, "EMQX Plugin utility libs"},
   {vsn, "4.4.7"},
   {modules, []},
   {applications, [kernel,stdlib]},
diff --git a/apps/emqx_prometheus/src/emqx_prometheus.app.src b/apps/emqx_prometheus/src/emqx_prometheus.app.src
index 6e7d7400f..231e23e90 100644
--- a/apps/emqx_prometheus/src/emqx_prometheus.app.src
+++ b/apps/emqx_prometheus/src/emqx_prometheus.app.src
@@ -1,5 +1,5 @@
 {application, emqx_prometheus,
- [{description, "Prometheus for EMQ X"},
+ [{description, "Prometheus for EMQX"},
   {vsn, "4.3.2"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_prometheus_sup]},
@@ -7,7 +7,7 @@
   {mod, {emqx_prometheus_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-prometheus"}
           ]}
diff --git a/apps/emqx_psk_file/src/emqx_psk_file.app.src b/apps/emqx_psk_file/src/emqx_psk_file.app.src
index ef18c8b69..e87307d0c 100644
--- a/apps/emqx_psk_file/src/emqx_psk_file.app.src
+++ b/apps/emqx_psk_file/src/emqx_psk_file.app.src
@@ -7,7 +7,7 @@
   {mod,{emqx_psk_file_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-psk-file"}
           ]}
diff --git a/apps/emqx_recon/src/emqx_recon.app.src b/apps/emqx_recon/src/emqx_recon.app.src
index 061ed8e93..55b3e31bb 100644
--- a/apps/emqx_recon/src/emqx_recon.app.src
+++ b/apps/emqx_recon/src/emqx_recon.app.src
@@ -1,5 +1,5 @@
 {application, emqx_recon,
- [{description, "EMQ X Recon Plugin"},
+ [{description, "EMQX Recon Plugin"},
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
@@ -7,7 +7,7 @@
   {mod, {emqx_recon,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-recon"}
           ]}
diff --git a/apps/emqx_retainer/src/emqx_retainer.app.src b/apps/emqx_retainer/src/emqx_retainer.app.src
index 941038d73..76abc5935 100644
--- a/apps/emqx_retainer/src/emqx_retainer.app.src
+++ b/apps/emqx_retainer/src/emqx_retainer.app.src
@@ -1,5 +1,5 @@
 {application, emqx_retainer,
- [{description, "EMQ X Retainer"},
+ [{description, "EMQX Retainer"},
   {vsn, "4.4.4"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_retainer_sup]},
@@ -7,7 +7,7 @@
   {mod, {emqx_retainer_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-retainer"}
           ]}
diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src
index af8276a86..0bed9cc70 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src
+++ b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src
@@ -1,5 +1,5 @@
 {application, emqx_rule_engine,
- [{description, "EMQ X Rule Engine"},
+ [{description, "EMQX Rule Engine"},
   {vsn, "4.4.15"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_rule_engine_sup, emqx_rule_registry, emqx_rule_engine_jwt_sup]},
@@ -7,7 +7,7 @@
   {mod, {emqx_rule_engine_app, []}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-rule-engine"}
           ]}
diff --git a/apps/emqx_sasl/src/emqx_sasl.app.src b/apps/emqx_sasl/src/emqx_sasl.app.src
index b079376d9..dbf1291f2 100644
--- a/apps/emqx_sasl/src/emqx_sasl.app.src
+++ b/apps/emqx_sasl/src/emqx_sasl.app.src
@@ -1,5 +1,5 @@
 {application, emqx_sasl,
- [{description, "EMQ X SASL"},
+ [{description, "EMQX SASL"},
   {vsn, "4.3.0"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_sasl_sup]},
@@ -7,7 +7,7 @@
   {mod, {emqx_sasl_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-sasl"}
           ]}
diff --git a/apps/emqx_sn/src/emqx_sn.app.src b/apps/emqx_sn/src/emqx_sn.app.src
index 46c2df084..2fa72acd8 100644
--- a/apps/emqx_sn/src/emqx_sn.app.src
+++ b/apps/emqx_sn/src/emqx_sn.app.src
@@ -1,5 +1,5 @@
 {application, emqx_sn,
- [{description, "EMQ X MQTT-SN Plugin"},
+ [{description, "EMQX MQTT-SN Plugin"},
   {vsn, "4.3.8"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
@@ -7,7 +7,7 @@
   {mod, {emqx_sn_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-sn"}
           ]}
diff --git a/apps/emqx_stomp/src/emqx_stomp.app.src b/apps/emqx_stomp/src/emqx_stomp.app.src
index 13afb9e67..60c42221d 100644
--- a/apps/emqx_stomp/src/emqx_stomp.app.src
+++ b/apps/emqx_stomp/src/emqx_stomp.app.src
@@ -1,5 +1,5 @@
 {application, emqx_stomp,
- [{description, "EMQ X Stomp Protocol Plugin"},
+ [{description, "EMQX Stomp Protocol Plugin"},
   {vsn, "4.3.7"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_stomp_sup]},
@@ -7,7 +7,7 @@
   {mod, {emqx_stomp,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-stomp"}
           ]}
diff --git a/apps/emqx_web_hook/src/emqx_web_hook.app.src b/apps/emqx_web_hook/src/emqx_web_hook.app.src
index b3ac93ef2..43b9e060c 100644
--- a/apps/emqx_web_hook/src/emqx_web_hook.app.src
+++ b/apps/emqx_web_hook/src/emqx_web_hook.app.src
@@ -1,5 +1,5 @@
 {application, emqx_web_hook,
- [{description, "EMQ X WebHook Plugin"},
+ [{description, "EMQX WebHook Plugin"},
   {vsn, "4.3.17"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_web_hook_sup]},
@@ -7,7 +7,7 @@
   {mod, {emqx_web_hook_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-web-hook"}
           ]}
diff --git a/build b/build
index 59a237c46..febceafa2 100755
--- a/build
+++ b/build
@@ -304,7 +304,7 @@ make_docker() {
 
 ## This function accepts any base docker image,
 ## a emqx zip-image, and a image tag (for the image to be built),
-## to build a docker image which runs EMQ X
+## to build a docker image which runs EMQX
 ##
 ## Export below variables to quickly build an image
 ##
diff --git a/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src b/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src
index 53a7e3a77..ce59a046c 100644
--- a/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src
+++ b/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src
@@ -7,7 +7,7 @@
   {mod, {emqx_dashboard_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-dashboard"}
           ]}
diff --git a/lib-ce/emqx_modules/src/emqx_modules.app.src b/lib-ce/emqx_modules/src/emqx_modules.app.src
index a2694a5e6..cc05b7e00 100644
--- a/lib-ce/emqx_modules/src/emqx_modules.app.src
+++ b/lib-ce/emqx_modules/src/emqx_modules.app.src
@@ -1,5 +1,5 @@
 {application, emqx_modules,
- [{description, "EMQ X Module Management"},
+ [{description, "EMQX Module Management"},
   {vsn, "4.4.9"},
   {modules, []},
   {applications, [kernel,stdlib]},
diff --git a/lib-ce/emqx_telemetry/src/emqx_telemetry.app.src b/lib-ce/emqx_telemetry/src/emqx_telemetry.app.src
index 27852ba7b..d88bc2742 100644
--- a/lib-ce/emqx_telemetry/src/emqx_telemetry.app.src
+++ b/lib-ce/emqx_telemetry/src/emqx_telemetry.app.src
@@ -1,5 +1,5 @@
 {application, emqx_telemetry,
- [{description, "EMQ X Telemetry"},
+ [{description, "EMQX Telemetry"},
   {vsn, "4.3.5"}, % strict semver, bump manually!
   {modules, []},
   {registered, [emqx_telemetry_sup]},
@@ -7,7 +7,7 @@
   {mod, {emqx_telemetry_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx-telemetry"}
           ]}
diff --git a/rebar.config.erl b/rebar.config.erl
index 9485bb38e..b3e4bf5bb 100644
--- a/rebar.config.erl
+++ b/rebar.config.erl
@@ -186,9 +186,9 @@ distro() ->
         _ -> false
     end.
 
-emqx_description(cloud, true) -> "EMQ X Enterprise";
-emqx_description(cloud, false) -> "EMQ X Broker";
-emqx_description(edge, _) -> "EMQ X Edge".
+emqx_description(cloud, true) -> "EMQX Enterprise";
+emqx_description(cloud, false) -> "EMQX Broker";
+emqx_description(edge, _) -> "EMQX Edge".
 
 overlay_vars(_RelType, PkgType, true) ->
     ee_overlay_vars(PkgType);
diff --git a/scripts/buildx.sh b/scripts/buildx.sh
index 5df4cc3fe..b1134b964 100755
--- a/scripts/buildx.sh
+++ b/scripts/buildx.sh
@@ -15,10 +15,10 @@ set -euo pipefail
 help() {
     echo
     echo "-h|--help:           To display this usage information"
-    echo "--profile <PROFILE>: EMQ X profile to build, e.g. emqx, emqx-edge"
+    echo "--profile <PROFILE>: EMQX profile to build, e.g. emqx, emqx-edge"
     echo "--pkgtype zip|pkg:   Specify which package to build, zip for .zip and pkg for .rpm or .deb"
-    echo "--arch amd64|arm64:  Target arch to build the EMQ X package for"
-    echo "--src_dir <SRC_DIR>: EMQ X source ode in this dir, default to PWD"
+    echo "--arch amd64|arm64:  Target arch to build the EMQX package for"
+    echo "--src_dir <SRC_DIR>: EMQX source ode in this dir, default to PWD"
     echo "--builder <BUILDER>: Builder image to pull"
     echo "                     E.g. ghcr.io/emqx/emqx-builder/4.4-20:24.3.4.2-1-debian11"
     echo "--ssh:               Pass ssh agent to the builder."
diff --git a/src/emqx.app.src b/src/emqx.app.src
index 5c59f8957..715d9d554 100644
--- a/src/emqx.app.src
+++ b/src/emqx.app.src
@@ -1,6 +1,6 @@
 {application, emqx,
  [{id, "emqx"},
-  {description, "EMQ X"},
+  {description, "EMQX"},
   %% Note: this version is not the same as the release version!  This
   %% is simply the emqx `application' version, which is separate from
   %% the emqx `release' version, which in turn is comprised of several
@@ -21,7 +21,7 @@
   {mod, {emqx_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},
-  {maintainers, ["EMQ X Team <contact@emqx.io>"]},
+  {maintainers, ["EMQX Team <contact@emqx.io>"]},
   {links, [{"Homepage", "https://emqx.io/"},
            {"Github", "https://github.com/emqx/emqx"}
           ]}
diff --git a/src/emqx.appup.src b/src/emqx.appup.src
index 002878638..8dc543d4d 100644
--- a/src/emqx.appup.src
+++ b/src/emqx.appup.src
@@ -2,7 +2,8 @@
 %% Unless you know what you are doing, DO NOT edit manually!!
 {VSN,
   [{"4.4.15",
-    [{load_module,emqx_packet,brutal_purge,soft_purge,[]},
+    [{load_module,emqx,brutal_purge,soft_purge,[]},
+     {load_module,emqx_packet,brutal_purge,soft_purge,[]},
      {load_module,emqx_relup,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
    {"4.4.14",
@@ -499,7 +500,8 @@
                          [gen_rpc,insecure_auth_fallback_allowed,true]}}]},
    {<<".*">>,[]}],
   [{"4.4.15",
-    [{load_module,emqx_packet,brutal_purge,soft_purge,[]},
+    [{load_module,emqx,brutal_purge,soft_purge,[]},
+     {load_module,emqx_packet,brutal_purge,soft_purge,[]},
      {load_module,emqx_relup,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
    {"4.4.14",
diff --git a/src/emqx.erl b/src/emqx.erl
index 85d154023..2d6894374 100644
--- a/src/emqx.erl
+++ b/src/emqx.erl
@@ -20,7 +20,7 @@
 -include("logger.hrl").
 -include("types.hrl").
 
--logger_header("[EMQ X]").
+-logger_header("[EMQX]").
 
 %% Start/Stop the application
 -export([ start/0
diff --git a/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin.app.src b/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin.app.src
index 413b4e1fd..28a7ae5cb 100644
--- a/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin.app.src
+++ b/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin.app.src
@@ -1,5 +1,5 @@
 {application, emqx_mini_plugin,
- [{description, "An EMQ X plugin for testcase"},
+ [{description, "An EMQX plugin for testcase"},
   {vsn, "0.1"},
   {modules, []},
   {registered, []},