diff --git a/.gitignore b/.gitignore
index 3946586..63bf988 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@ erl_crash.dump
 # rebar 2.x
 .rebar
 rel/example_project
-ebin/*.beam
+ebin/
 deps
 
 # rebar 3
diff --git a/etc/emqx.conf b/etc/emqx.conf
index beb3e01..054fac8 100644
--- a/etc/emqx.conf
+++ b/etc/emqx.conf
@@ -1,5 +1,5 @@
 ##====================================================================
-## EMQ X Configuration v5.0
+## EMQX Configuration v5.0
 ##====================================================================
 
 listener.tcp {
diff --git a/etc/emqx.cuttlefish.conf b/etc/emqx.cuttlefish.conf
index 97fb094..dbc50ed 100644
--- a/etc/emqx.cuttlefish.conf
+++ b/etc/emqx.cuttlefish.conf
@@ -1,4 +1,4 @@
-## EMQ X Configuration 4.3
+## EMQX Configuration 4.3
 
 ## NOTE: Do not change format of CONFIG_SECTION_{BGN,END} comments!
 
@@ -1099,7 +1099,7 @@ listener.tcp.external.zone = external
 ## Example: allow 192.168.0.0/24
 listener.tcp.external.access.1 = 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/
@@ -1107,7 +1107,7 @@ listener.tcp.external.access.1 = allow all
 ## Value: on | off
 ## listener.tcp.external.proxy_protocol = on
 
-## 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.
 ##
 ## Value: Duration
@@ -1610,13 +1610,13 @@ listener.ws.external.access.1 = allow all
 ## Default: mqtt, mqtt-v3, mqtt-v3.1.1, mqtt-v5
 ## listener.ws.external.supported_subprotocols = mqtt, mqtt-v3, mqtt-v3.1.1, mqtt-v5
 
-## 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.
 ##
 ## Default: X-Forwarded-For
 ## listener.ws.external.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.
 ##
 ## Default: X-Forwarded-Port
@@ -1879,13 +1879,13 @@ listener.wss.external.access.1 = allow all
 ## Default: mqtt, mqtt-v3, mqtt-v3.1.1, mqtt-v5
 ## listener.wss.external.supported_subprotocols = mqtt, mqtt-v3, mqtt-v3.1.1, mqtt-v5
 
-## 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.
 ##
 ## Default: X-Forwarded-For
 ## listener.wss.external.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.
 ##
 ## Default: X-Forwarded-Port
diff --git a/sample-schemas/emqx.schema b/sample-schemas/emqx.schema
index f92ab92..b256427 100644
--- a/sample-schemas/emqx.schema
+++ b/sample-schemas/emqx.schema
@@ -1,5 +1,5 @@
 %%-*- mode: erlang -*-
-%% EMQ X R4.0 config mapping
+%% EMQX R4.0 config mapping
 
 %%--------------------------------------------------------------------
 %% Cluster