diff --git a/README.md b/README.md
index 84d777b..4e52561 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 
-EMQ X Retainer
+EMQX Retainer
 ==============
 
 The retainer plugin is responsible for storing retained MQTT messages.
@@ -55,5 +55,5 @@ Apache License Version 2.0
 Author
 ------
 
-EMQ X Team
+EMQX Team
 
diff --git a/etc/emqx_retainer.conf b/etc/emqx_retainer.conf
index 0a883ce..fe980ae 100644
--- a/etc/emqx_retainer.conf
+++ b/etc/emqx_retainer.conf
@@ -1,5 +1,5 @@
 ##--------------------------------------------------------------------
-## EMQ X Retainer
+## EMQX Retainer
 ##--------------------------------------------------------------------
 
 ## Where to store the retained messages.
diff --git a/src/emqx_retainer.app.src b/src/emqx_retainer.app.src
index 3b70acb..e02051c 100644
--- a/src/emqx_retainer.app.src
+++ b/src/emqx_retainer.app.src
@@ -1,5 +1,5 @@
 {application, emqx_retainer,
- [{description, "EMQ X Retainer"},
+ [{description, "EMQX Retainer"},
   {vsn, "git"},
   {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"}
           ]}