diff --git a/MQTTSNGateway/predefinedTopic.conf b/MQTTSNGateway/predefinedTopic.conf
index 4ace6b1..cca2ada 100644
--- a/MQTTSNGateway/predefinedTopic.conf
+++ b/MQTTSNGateway/predefinedTopic.conf
@@ -16,13 +16,13 @@
 #
 #     ClientID, TopicName, TopicID
 #
-#     Topics is common to all clients, ClientID should be COMMON.
+#     Topics is common to all clients, ClientID should be *.
 
 #
 #  pre-defined-topics for Clients
 #
 
-COMMON,ty4tw/predefinedTopic1, 1
+*,ty4tw/predefinedTopic1, 1
 GatewayTestClient,ty4tw/predefinedTopic2, 2
 GatewayTestClient,ty4tw/predefinedTopic3, 3
 
diff --git a/MQTTSNGateway/src/MQTTSNGWClientList.cpp b/MQTTSNGateway/src/MQTTSNGWClientList.cpp
index 2e4bf92..e4e0bb9 100644
--- a/MQTTSNGateway/src/MQTTSNGWClientList.cpp
+++ b/MQTTSNGateway/src/MQTTSNGWClientList.cpp
@@ -24,7 +24,7 @@ extern Gateway* theGateway;
 /*=====================================
  Class ClientList
  =====================================*/
-const char* common_topic = "COMMON";
+const char* common_topic = "*";
 
 ClientList::ClientList()
 {