diff --git a/NOTICE b/NOTICE
index e891b5745..2f70ed114 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-EMQ X, a highly scalable, highly available distributed MQTT messaging broker for IoT.
+EMQX, a highly scalable, highly available distributed MQTT messaging broker for IoT.
 Copyright (c) 2017-2021 EMQ Technologies Co., Ltd. All Rights Reserved.
 
 This product contains code developed at EMQ Technologies Co., Ltd.
diff --git a/bin/emqx b/bin/emqx
index 40cb7701d..a2a488474 100755
--- a/bin/emqx
+++ b/bin/emqx
@@ -44,7 +44,7 @@ if ! check_eralng_start >/dev/null 2>&1; then
         echoerr "FATAL: Unable to start Erlang."
         echoerr "Please make sure openssl-1.1.1 (libcrypto) and libncurses are installed."
         echoerr "Also ensure it's running on the correct platform,"
-        echoerr "this EMQ X release is built for $BUILT_ON"
+        echoerr "this EMQX release is built for $BUILT_ON"
         exit 1
     fi
     echoerr "WARNING: There seem to be missing dynamic libs from the OS. Using libs from ${DYNLIBS_DIR}"
diff --git a/bin/node_dump b/bin/node_dump
index c8f76841b..83b41332b 100755
--- a/bin/node_dump
+++ b/bin/node_dump
@@ -24,7 +24,7 @@ collect() {
 }
 
 show_help() {
-    echo "Collect information about the EMQ X node
+    echo "Collect information about the EMQX node
 
 USAGE:
 
diff --git a/deploy/charts/emqx/Chart.yaml b/deploy/charts/emqx/Chart.yaml
index 0bafd6780..3f24cc699 100644
--- a/deploy/charts/emqx/Chart.yaml
+++ b/deploy/charts/emqx/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: emqx
-description: A Helm chart for EMQ X
+description: A Helm chart for EMQX
 # A chart can be either an 'application' or a 'library' chart.
 #
 # Application charts are a collection of templates that can be packaged into versioned archives
diff --git a/deploy/charts/emqx/values.yaml b/deploy/charts/emqx/values.yaml
index f630f3d25..d78f19a8e 100644
--- a/deploy/charts/emqx/values.yaml
+++ b/deploy/charts/emqx/values.yaml
@@ -62,13 +62,13 @@ resources: {}
   #   cpu: 500m
   #   memory: 512Mi
 
-# Containers that run before the creation of EMQ X containers. They can contain utilities or setup scripts.
+# Containers that run before the creation of EMQX containers. They can contain utilities or setup scripts.
 initContainers: {}
   # - name: mysql-probe
   #   image: alpine
   #   command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 mysql 3306 && exit 0 || sleep 3; done; exit 1"]
 
-## EMQ X configuration item, see the documentation (https://hub.docker.com/r/emqx/emqx)
+## EMQX configuration item, see the documentation (https://hub.docker.com/r/emqx/emqx)
 emqxConfig:
   EMQX_CLUSTER__K8S__APISERVER: "https://kubernetes.default.svc:443"
   ## The address type is used to extract host from k8s service.
@@ -119,7 +119,7 @@ emqxLoadedModules: >
   {emqx_mod_subscription, false}.
   {emqx_mod_topic_metrics, false}.
 
-## EMQ X Enterprise Edition requires manual creation of a Secret containing the licensed content. Write the name of Secret to the value of "emqxLicenseSecretName"
+## EMQX Enterprise Edition requires manual creation of a Secret containing the licensed content. Write the name of Secret to the value of "emqxLicenseSecretName"
 ## Example:
 ##   kubectl create secret generic emqx-license-secret-name --from-file=/path/to/emqx.lic
 emqxLicenseSecretName:
@@ -188,7 +188,7 @@ ingress:
   ## Ingress shared annotations
   annotations: {}
 
-  ## ingress for EMQ X Dashboard
+  ## ingress for EMQX Dashboard
   dashboard:
     enabled: false
     annotations: {}
@@ -199,7 +199,7 @@ ingress:
     - dashboard.emqx.local
     tls: []
 
-  ## ingress for EMQ X Mgmt API
+  ## ingress for EMQX Mgmt API
   mgmt:
     enabled: false
     annotations: {}
@@ -210,7 +210,7 @@ ingress:
     - api.emqx.local
     tls: []
 
-  ## ingress for EMQ X Mgmt API
+  ## ingress for EMQX Mgmt API
   wss:
     enabled: false
     # ingressClassName: nginx
diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile
index c79508ec1..8e6e7c84a 100644
--- a/deploy/docker/Dockerfile
+++ b/deploy/docker/Dockerfile
@@ -38,7 +38,7 @@ LABEL org.label-schema.docker.dockerfile="Dockerfile" \
     org.label-schema.url="https://emqx.io" \
     org.label-schema.vcs-type="Git" \
     org.label-schema.vcs-url="https://github.com/emqx/emqx" \
-    maintainer="EMQ X Team <support@emqx.io>"
+    maintainer="EMQX Team <support@emqx.io>"
 
 ARG EMQX_NAME=emqx
 
diff --git a/deploy/docker/docker-entrypoint.sh b/deploy/docker/docker-entrypoint.sh
index 0776f957b..9c7fab4dc 100755
--- a/deploy/docker/docker-entrypoint.sh
+++ b/deploy/docker/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 ## EMQ docker image start script
 # Huang Rui <vowstar@gmail.com>
-# EMQ X Team <support@emqx.io>
+# EMQX Team <support@emqx.io>
 
 ## Shell setting
 if [[ -n "$DEBUG" ]]; then
diff --git a/etc/emqx_cloud/vm.args b/etc/emqx_cloud/vm.args
index 1e6b0b4cb..a199091c7 100644
--- a/etc/emqx_cloud/vm.args
+++ b/etc/emqx_cloud/vm.args
@@ -1,5 +1,5 @@
 ######################################################################
-## Erlang VM Args for EMQ X Broker
+## Erlang VM Args
 ######################################################################
 
 ## NOTE:
diff --git a/etc/emqx_edge/vm.args b/etc/emqx_edge/vm.args
index ef9749738..2f61faa2d 100644
--- a/etc/emqx_edge/vm.args
+++ b/etc/emqx_edge/vm.args
@@ -1,5 +1,5 @@
 ######################################################################
-## Erlang VM Args for EMQ X Edge
+## Erlang VM Args
 ######################################################################
 
 ## NOTE:
diff --git a/scripts/relup-base-vsns.sh b/scripts/relup-base-vsns.sh
index 65d755994..0a52a1b61 100755
--- a/scripts/relup-base-vsns.sh
+++ b/scripts/relup-base-vsns.sh
@@ -2,7 +2,7 @@
 set -euo pipefail
 
 ## This script prints the relup upgrade base versions
-## for the given EMQ X edition (specified as first arg)
+## for the given EMQX edition (specified as first arg)
 ##
 ## The second argument is the current release version
 ## if not provided, it's taken from pkg-vsn.sh