diff --git a/core/class/AbeilleCmdProcess.class.php b/core/class/AbeilleCmdProcess.class.php
index 3c5f73e6ab..718afe2ce1 100755
--- a/core/class/AbeilleCmdProcess.class.php
+++ b/core/class/AbeilleCmdProcess.class.php
@@ -2538,7 +2538,7 @@ function processCmd($Command) {
                 }
 
                 // Zigate specific command
-                else if (($cmdName == 'zgSetPermitMode') || ($cmdName == 'setZgPermitMode')) {
+                else if ($cmdName == 'zgSetPermitMode') {
                     $mode = $Command['mode'];
                     if ($mode == "start") {
                         $cmd = "0049";
@@ -2618,7 +2618,7 @@ function processCmd($Command) {
                 }
 
                 // Zigate specific command: Requests FW version
-                else if (($cmdName == 'zgGetVersion') || ($cmdName == 'getZgVersion') || ($cmdName == 'getVersion')) {
+                else if ($cmdName == 'zgGetVersion') {
                     $this->addCmdToQueue2(PRIO_NORM, $dest, "0010");
                     return;
                 }
@@ -2630,12 +2630,12 @@ function processCmd($Command) {
                 }
 
                 // Zigate specific command: Set Time server (v3.0f)
-                else if (($cmdName == 'zgSetTimeServer') || ($cmdName == 'setZgTimeServer') || ($cmdName == 'setTimeServer')) {
+                else if ($cmdName == 'zgSetTimeServer') {
                     if (!isset($Command['time'])) {
                         $zgRef = mktime(0, 0, 0, 1, 1, 2000); // 2000-01-01 00:00:00
                         $Command['time'] = time() - $zgRef;
                     }
-                    cmdLog('debug', "    setZgTimeServer, time=".$Command['time'], $this->debug['processCmd']);
+                    cmdLog('debug', "    zgSetTimeServer, time=".$Command['time'], $this->debug['processCmd']);
 
                     /* Cmd 0016 reminder
                     payload = <timestamp UTC: uint32_t> from 2000-01-01 00:00:00
@@ -2648,7 +2648,7 @@ function processCmd($Command) {
                 }
 
                 // Zigate specific command
-                else if (($cmdName == 'zgGetTimeServer') || ($cmdName == 'getZgTimeServer') || ($cmdName == 'getTimeServer')) {
+                else if ($cmdName == 'zgGetTimeServer') {
                     // $data = "";
                     // $length = sprintf("%04s", dechex(strlen($data) / 2));
                     $this->addCmdToQueue2(PRIO_NORM, $dest, "0017");
@@ -2666,7 +2666,7 @@ function processCmd($Command) {
                 }
 
                 // Zigate specific command
-                else if (($cmdName == 'zgStartNetwork') || ($cmdName == 'startZgNetwork')) {
+                else if ($cmdName == 'zgStartNetwork') {
                     $this->addCmdToQueue2(PRIO_NORM, $dest, "0024");
                     return;
                 }
diff --git a/core/php/AbeilleTest.php b/core/php/AbeilleTest.php
index fc7523f732..a684901f65 100755
--- a/core/php/AbeilleTest.php
+++ b/core/php/AbeilleTest.php
@@ -340,13 +340,13 @@ function cmdLog($loglevel = 'NONE', $message = "", $isEnable = 1) {
 
         if ($test==132) {
             echo "Set Time to Zigate\n";
-            $msg['topic']   = 'CmdAbeille' . $argv[2] . '/0000/setZgTimeServer';
+            $msg['topic']   = 'CmdAbeille' . $argv[2] . '/0000/zgSetTimeServer';
             $msg['payload'] = '';
         }
 
         if ($test==133) {
             echo "Get Time from Zigate\n";
-            $msg['topic']   = 'CmdAbeille' . $argv[2] . '/0000/getZgTimeServer';
+            $msg['topic']   = 'CmdAbeille' . $argv[2] . '/0000/zgGetTimeServer';
             $msg['payload'] = '';
         }
 
diff --git a/desktop/js/Abeille.js b/desktop/js/Abeille.js
index c9e486f31d..c228a4b1b8 100755
--- a/desktop/js/Abeille.js
+++ b/desktop/js/Abeille.js
@@ -1377,7 +1377,7 @@ function sendToCmd(action, param1 = "", param2 = "", param3 = "", param4 = "") {
         case "startPermitJoin":
             zgId = param1;
             sendCmd(
-                "CmdAbeille" + zgId + "/0000/setZgPermitMode",
+                "CmdAbeille" + zgId + "/0000/zgSetPermitMode",
                 "mode=start"
             );
             location.reload(true);
@@ -1391,7 +1391,7 @@ function sendToCmd(action, param1 = "", param2 = "", param3 = "", param4 = "") {
             break;
         case "stopPermitJoin":
             zgId = param1;
-            sendCmd("CmdAbeille" + zgId + "/0000/setZgPermitMode", "mode=stop");
+            sendCmd("CmdAbeille" + zgId + "/0000/zgSetPermitMode", "mode=stop");
             location.reload(true);
             $("#div_alert").showAlert({
                 message:
diff --git a/desktop/php/AbeilleFormAction.php b/desktop/php/AbeilleFormAction.php
index d1e9289dd0..0ddc784843 100755
--- a/desktop/php/AbeilleFormAction.php
+++ b/desktop/php/AbeilleFormAction.php
@@ -166,22 +166,6 @@ function sendMessageFromFormToCmd($topic, $payload) {
             }
         }
 
-        // Set Time
-        foreach ( $zigateIds as $zigateId ) {
-            if ( $_POST['submitButton'] == 'SetTime Z'.$zigateId ) {
-                echo "SetTime request processing";
-                sendMessageFromFormToCmd('CmdAbeille'.$zigateId.'/0000/setZgTimeServer', "time=".time() );
-            }
-        }
-
-        // Get Time
-        foreach ( $zigateIds as $zigateId ) {
-            if ( $_POST['submitButton'] == 'getTime Z'.$zigateId ) {
-                echo "getTime request processing";
-                sendMessageFromFormToCmd('CmdAbeille'.$zigateId.'/0000/getZgTimeServer', "");
-            }
-        }
-
         // Set Certification CE
         foreach ( $zigateIds as $zigateId ) {
             if ( $_POST['submitButton'] == 'Set Certification CE Z'.$zigateId ) {