diff --git a/OpenMQTTGateway.ino b/OpenMQTTGateway.ino
index bed9ee0..7d36859 100644
--- a/OpenMQTTGateway.ino
+++ b/OpenMQTTGateway.ino
@@ -93,7 +93,7 @@ boolean reconnect() {
     // Once connected, publish an announcement...
       client.publish(will_Topic,Gateway_AnnouncementMsg,will_Retain);
       // publish version
-      client.publish(version_Topic,VERSION,will_Retain);
+      client.publish(version_Topic,OMG_VERSION,will_Retain);
       //Subscribing to topic
       if (client.subscribe(subjectMQTTtoX)) {
         #ifdef ZgatewayRF
diff --git a/User_config.h b/User_config.h
index 57ba74d..35821b5 100644
--- a/User_config.h
+++ b/User_config.h
@@ -29,13 +29,14 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*-------------------VERSION----------------------*/
-#define VERSION "0.5"
+#define OMG_VERSION "0.5"
 /*-------------DEFINE YOUR NETWORK PARAMETERS BELOW----------------*/
 //MQTT Parameters definition
 #define mqtt_server "192.168.1.17"
 //#define mqtt_user "your_username" // not compulsory only if your broker needs authentication
 #define mqtt_password "your_password" // not compulsory only if your broker needs authentication
 #define mqtt_port 1883
+#define Gateway_Name "OpenMQTTGateway"
 #define version_Topic "home/" Gateway_Name "/version"
 #define will_Topic "home/" Gateway_Name "/LWT"
 #define will_QoS 0