diff --git a/core/config/devices/RWL021/RWL021.json b/core/config/devices/RWL021/RWL021.json
index 13388bfd4..c611b0f67 100755
--- a/core/config/devices/RWL021/RWL021.json
+++ b/core/config/devices/RWL021/RWL021.json
@@ -57,49 +57,25 @@
             "Up": {
                 "use": "upGroup"
             },
-            "EventButtonI": {
-                "use": "boutonStateRWL021_1"
-            },
-            "DureeButtonI": {
-                "use": "boutonStateRWL021_2"
-            },
-            "EventButtonLumPlus": {
-                "use": "boutonStateRWL021_3"
-            },
-            "DureeButtonLumPlus": {
-                "use": "boutonStateRWL021_4"
-            },
-            "EventButtonLumMoins": {
-                "use": "boutonStateRWL021_5"
-            },
-            "DureeButtonLumMoins": {
-                "use": "boutonStateRWL021_6"
-            },
-            "EventButtonO": {
-                "use": "boutonStateRWL021_7"
-            },
-            "DureeButtonO": {
-                "use": "boutonStateRWL021_8"
-            },
-            "I": {
+            "Button ON": {
                 "comment": "Button I/On, value=short-press/long-press/short-release/long-release",
                 "use": "inf_generic-String",
                 "logicalId": "philipsFC00-00-01",
                 "isVisible": 1
             },
-            "B+": {
+            "Button B+": {
                 "comment": "Button Bightness +, value=short-press/long-press/short-release/long-release",
                 "use": "inf_generic-String",
                 "logicalId": "philipsFC00-00-02",
                 "isVisible": 1
             },
-            "B-": {
+            "Button B-": {
                 "comment": "Button Bightness -, value=short-press/long-press/short-release/long-release",
                 "use": "inf_generic-String",
                 "logicalId": "philipsFC00-00-03",
                 "isVisible": 1
             },
-            "0": {
+            "Button OFF": {
                 "comment": "Button 0/Off, value=short-press/long-press/short-release/long-release",
                 "use": "inf_generic-String",
                 "logicalId": "philipsFC00-00-04",
diff --git a/core/php/AbeilleParser-Philips.php b/core/php/AbeilleParser-Philips.php
index 57d811727..579473c0f 100644
--- a/core/php/AbeilleParser-Philips.php
+++ b/core/php/AbeilleParser-Philips.php
@@ -65,10 +65,10 @@ function philipsDecodeCmdFC00($net, $addr, $ep, $clustId, $cmdId, $pl) {
         // $unknown2 = substr($pl, 7, 2);
         $time = substr($pl, 9, 2);
         $typeTxt = isset($buttonTypeTxt[$type]) ? $buttonTypeTxt[$type] : "?";
-        parserLog2("debug", $addr, "  Philips private: Cluster=$clustId, Cmd=$cmd, Button=$button, Type=$type/$typeTxt, Time=$time");
+        parserLog2("debug", $addr, "  Philips private: Cluster=$clustId, Cmd=$cmdId, Button=$button, Type=$type/$typeTxt, Time=$time");
 
         $attrReportN = [];
-        $attrReportN[] = Array( "name" => "$philipsFC00-$cmdId-$button", "value" => $typeTxt );
+        $attrReportN[] = Array( "name" => "philipsFC00-$cmdId-$button", "value" => $typeTxt );
 
         // OBSOLETE SUPPORT
         // $attrReportN[] = Array( "name" => $clustId."-".$ep."-".$attrId."-Event", "value" => $buttonEvent );
diff --git a/docs/fr_FR/Changelog.md b/docs/fr_FR/Changelog.md
index 40a5ba940..1197efa85 100644
--- a/docs/fr_FR/Changelog.md
+++ b/docs/fr_FR/Changelog.md
@@ -1,8 +1,17 @@
 # ChangeLog
 
+**Mise-à-jour de modèles d'équipement**
+
+    - Malgré la volonté de faire des évolutions les plus transparentes possibles, il se peut que certains équipements nécessitent d'être mis-à-jour à partir de leur dernier modèle pour à nouveau fonctionner correctement.
+
+      - Si ils sont sur batterie, réinclusion nécessaire.
+      - Si sur secteur, aller à la page 'avancé' et bouton 'mise-à-jour'.
+    - Modèle RWL021 modifié. Revoir vos scenarios si besoin. (voir 1243).
+
 -   Amélioration: Modèle d'équipement avec support 'private': Ajout du type 'generic'.
 -   Amélioration: Philips RWL021: Mise-à-jour modèle (1243). Attention à revoir scenario si besoin !!
 -   Amélioration: Ajout support Philips RWL020.
+-   Amélioration: Suppression de cmdes obsoletes 'boutonStateRWL021_X.json'.
 
 ## 241117-BETA-1
 
diff --git a/core/config/commands/boutonStateRWL021_1.json b/resources/archives/core/config/commands/boutonStateRWL021_1.json
similarity index 100%
rename from core/config/commands/boutonStateRWL021_1.json
rename to resources/archives/core/config/commands/boutonStateRWL021_1.json
diff --git a/core/config/commands/boutonStateRWL021_2.json b/resources/archives/core/config/commands/boutonStateRWL021_2.json
similarity index 100%
rename from core/config/commands/boutonStateRWL021_2.json
rename to resources/archives/core/config/commands/boutonStateRWL021_2.json
diff --git a/core/config/commands/boutonStateRWL021_3.json b/resources/archives/core/config/commands/boutonStateRWL021_3.json
similarity index 100%
rename from core/config/commands/boutonStateRWL021_3.json
rename to resources/archives/core/config/commands/boutonStateRWL021_3.json
diff --git a/core/config/commands/boutonStateRWL021_4.json b/resources/archives/core/config/commands/boutonStateRWL021_4.json
similarity index 100%
rename from core/config/commands/boutonStateRWL021_4.json
rename to resources/archives/core/config/commands/boutonStateRWL021_4.json
diff --git a/core/config/commands/boutonStateRWL021_5.json b/resources/archives/core/config/commands/boutonStateRWL021_5.json
similarity index 100%
rename from core/config/commands/boutonStateRWL021_5.json
rename to resources/archives/core/config/commands/boutonStateRWL021_5.json
diff --git a/core/config/commands/boutonStateRWL021_6.json b/resources/archives/core/config/commands/boutonStateRWL021_6.json
similarity index 100%
rename from core/config/commands/boutonStateRWL021_6.json
rename to resources/archives/core/config/commands/boutonStateRWL021_6.json
diff --git a/core/config/commands/boutonStateRWL021_7.json b/resources/archives/core/config/commands/boutonStateRWL021_7.json
similarity index 100%
rename from core/config/commands/boutonStateRWL021_7.json
rename to resources/archives/core/config/commands/boutonStateRWL021_7.json
diff --git a/core/config/commands/boutonStateRWL021_8.json b/resources/archives/core/config/commands/boutonStateRWL021_8.json
similarity index 100%
rename from core/config/commands/boutonStateRWL021_8.json
rename to resources/archives/core/config/commands/boutonStateRWL021_8.json