diff --git a/code/.vscode/launch.json b/code/.vscode/launch.json
deleted file mode 100644
index 14da6651..00000000
--- a/code/.vscode/launch.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "gdb",
-            "request": "launch",
-            "cwd": "${workspaceRoot}",
-            "name": "PlatformIO Debugger",
-            "target": "c:/Users/Josh/espdev/espurna/code/.pioenvs/nodemcu-lolin/firmware.elf",
-            "gdbpath": "C:/Users/Josh/.platformio/penv/Scripts/piodebuggdb",
-            "autorun": [ "source .pioinit" ]
-        }
-    ]
-}
\ No newline at end of file
diff --git a/code/espurna/config/arduino.h b/code/espurna/config/arduino.h
index 2dd7e48d..8f9f7909 100644
--- a/code/espurna/config/arduino.h
+++ b/code/espurna/config/arduino.h
@@ -49,7 +49,7 @@
 //#define MANCAVEMADE_ESPLIVE
 //#define INTERMITTECH_QUINLED
 //#define ARILUX_AL_LC06
-//#define SM_PW702U
+//#define XENON_SM_PW702U
 
 //--------------------------------------------------------------------------------
 // Features (values below are non-default values)
diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h
index 479bd877..5e68fbd0 100644
--- a/code/espurna/config/hardware.h
+++ b/code/espurna/config/hardware.h
@@ -1117,11 +1117,11 @@
 // XENON SM-PW701U
 // -----------------------------------------------------------------------------
 
-#elif defined(SM_PW702U)
+#elif defined(XENON_SM_PW702U)
 
     // Info
     #define MANUFACTURER        "XENON"
-    #define DEVICE              "SM-PW702U"
+    #define DEVICE              "SM_PW702U"
 
     // Buttons
     #define BUTTON1_PIN         13
diff --git a/code/espurna/hardware.ino b/code/espurna/hardware.ino
index 9dc554b8..0e9cca04 100644
--- a/code/espurna/hardware.ino
+++ b/code/espurna/hardware.ino
@@ -531,9 +531,9 @@ void hwUpwardsCompatibility() {
         setSetting("chLogic", 5, 0);
         setSetting("relays", 1);
 
-        #elif defined(SM_PW702U)
-        
-        setSetting("board", 39);
+    #elif defined(XENON_SM_PW702U)
+
+        setSetting("board", 44);
         setSetting("ledGPIO", 1, 4);
         setSetting("ledLogic", 1, 0);
         setSetting("btnGPIO", 1, 13);
diff --git a/code/platformio.ini b/code/platformio.ini
index 8f05baba..7f835845 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -1003,24 +1003,24 @@ upload_port = "192.168.4.1"
 upload_flags = --auth=fibonacci --port 8266
 monitor_baud = 115200
 
-[env:sm_pw702u]
-platform = espressif8266
+[env:xenon-sm-pw702u]
+platform = ${common.platform}
 framework = arduino
 board = esp12e
 board_flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags_1m} -DSM_PW702U
+build_flags = ${common.build_flags_1m} -DXENON_SM_PW702U
 monitor_baud = 115200
 
-[env:sm_pw702u-ota]
-platform = espressif8266
+[env:xenon-sm-pw702u-ota]
+platform = ${common.platform}
 framework = arduino
 board = esp12e
 board_flash_mode = dout
 lib_deps = ${common.lib_deps}
 lib_ignore = ${common.lib_ignore}
-build_flags = ${common.build_flags_1m} -DSM_PW702U
+build_flags = ${common.build_flags_1m} -DXENON_SM_PW702U
 upload_speed = 115200
 upload_port = "192.168.4.1"
 upload_flags = --auth=fibonacci --port 8266