diff --git a/ZgatewayRF2.ino b/ZgatewayRF2.ino
index 129d1a7..1032664 100644
--- a/ZgatewayRF2.ino
+++ b/ZgatewayRF2.ino
@@ -220,10 +220,10 @@ void rf2Callback(unsigned int period, unsigned long address, unsigned long group
       if (boolSWITCHTYPE != 99) {
         trc(F("MQTTtoRF2 switch type ok"));
         bool isDimCommand = boolSWITCHTYPE == 2;
-        unsigned long valueCODE = RF2data["adress"];
+        unsigned long valueCODE = RF2data["address"];
         int valueUNIT = RF2data["unit"] | -1;
         int valuePERIOD = RF2data["period"];
-        int valueGROUP  = RF2data["groupBit"];
+        int valueGROUP  = RF2data["group"];
         int valueDIM  = RF2data["dim"] | -1;
         if ((valueCODE != 0) || (valueUNIT  != -1)|| (valuePERIOD  != 0)){
           trc(F("MQTTtoRF2"));
diff --git a/config_RF.h b/config_RF.h
index d35a4bb..5417b90 100644
--- a/config_RF.h
+++ b/config_RF.h
@@ -53,7 +53,7 @@ RF supported protocols
 #define subjectMQTTtoRF2  Base_Topic Gateway_Name "/commands/MQTTtoRF2"
 #define subjectRF2toMQTT  Base_Topic Gateway_Name "/RF2toMQTT"
 #define subjectGTWRF2toMQTT  Base_Topic Gateway_Name "/433toMQTT"
-#define RF2codeKey "CODE_" // code will be defined if a subject contains RF2codeKey followed by a value of 7 digits
+#define RF2codeKey "ADDRESS_" // code will be defined if a subject contains RF2codeKey followed by a value of 7 digits
 #define RF2periodKey "PERIOD_" // period  will be defined if a subject contains RF2periodKey followed by a value of 3 digits
 #define RF2unitKey "UNIT_"  // number of your unit value  will be defined if a subject contains RF2unitKey followed by a value of 1-2 digits
 #define RF2groupKey "GROUP_"  // number of your group value  will be defined if a subject contains RF2groupKey followed by a value of 1 digit