diff --git a/radio/src/targets/pl18/CMakeLists.txt b/radio/src/targets/pl18/CMakeLists.txt
index 8379fa97b..f808e6e50 100644
--- a/radio/src/targets/pl18/CMakeLists.txt
+++ b/radio/src/targets/pl18/CMakeLists.txt
@@ -175,7 +175,7 @@ add_library(board OBJECT EXCLUDE_FROM_ALL
 set(FIRMWARE_SRC ${FIRMWARE_SRC} $<TARGET_OBJECTS:board>)
 
 if(PCBREV STREQUAL NB4P)
-  target_sources(board PRIVATE ${TARGET_SRC_DIR}/switch_driver.cpp)
+  target_sources(board PRIVATE ${TARGET_SRC_DIR}/nb4p_switch_driver.cpp)
 endif()
 
 set(FIRMWARE_SRC
diff --git a/radio/src/targets/pl18/hal.h b/radio/src/targets/pl18/hal.h
index c364e8d78..141370894 100644
--- a/radio/src/targets/pl18/hal.h
+++ b/radio/src/targets/pl18/hal.h
@@ -53,14 +53,14 @@
 
 #if defined(RADIO_NB4P)
   // Trims
-  #define TRIMS_GPIO_REG_LHL
-  #define TRIMS_GPIO_PIN_LHL
-  #define TRIMS_GPIO_REG_LHR
-  #define TRIMS_GPIO_PIN_LHR
-  #define TRIMS_GPIO_REG_LVD
-  #define TRIMS_GPIO_PIN_LVD
-  #define TRIMS_GPIO_REG_LVU
-  #define TRIMS_GPIO_PIN_LVU
+  #define TRIMS_GPIO_REG_T1L
+  #define TRIMS_GPIO_PIN_T1L
+  #define TRIMS_GPIO_REG_T1R
+  #define TRIMS_GPIO_PIN_T1R
+  #define TRIMS_GPIO_REG_T2L
+  #define TRIMS_GPIO_PIN_T2L
+  #define TRIMS_GPIO_REG_T2R
+  #define TRIMS_GPIO_PIN_T2R
 
   // Switches
   #define SWITCHES_GPIO_REG_A
diff --git a/radio/src/targets/pl18/switch_driver.cpp b/radio/src/targets/pl18/nb4p_switch_driver.cpp
similarity index 100%
rename from radio/src/targets/pl18/switch_driver.cpp
rename to radio/src/targets/pl18/nb4p_switch_driver.cpp
diff --git a/radio/util/hw_defs/legacy_names.py b/radio/util/hw_defs/legacy_names.py
index ebb4598ad..382267a13 100644
--- a/radio/util/hw_defs/legacy_names.py
+++ b/radio/util/hw_defs/legacy_names.py
@@ -707,34 +707,6 @@ LEGACY_NAMES = [
                 "label": "VR1R",
                 "short_label": "2",
                 "description": "Potentiometer 2"
-            },
-            "EXT1": {
-                "yaml": "EXT1",
-                "lua": "ext1",
-                "label": "EXT1",
-                "short_label": "E1",
-                "description": "Ext 1"
-            },
-            "EXT2": {
-                "yaml": "EXT2",
-                "lua": "ext2",
-                "label": "EXT2",
-                "short_label": "E2",
-                "description": "Ext 2"
-            },
-            "EXT3": {
-                "yaml": "EXT3",
-                "lua": "ext3",
-                "label": "EXT3",
-                "short_label": "E3",
-                "description": "Ext 3"
-            },
-            "EXT4": {
-                "yaml": "EXT4",
-                "lua": "ext4",
-                "label": "EXT4",
-                "short_label": "E4",
-                "description": "Ext 4"
             }
         }
     },
diff --git a/radio/util/hw_defs/pot_config.py b/radio/util/hw_defs/pot_config.py
index 216b3e3a8..6f4f6b327 100644
--- a/radio/util/hw_defs/pot_config.py
+++ b/radio/util/hw_defs/pot_config.py
@@ -41,11 +41,7 @@ POT_CONFIG = {
     },
     "nb4p": {
         "P1": {"default": "POT"},
-        "P2": {"default": "POT"},
-        "EXT1": {"default": "MULTIPOS"},
-        "EXT2": {"default": "MULTIPOS"},
-        "EXT3": {"default": "MULTIPOS"},
-        "EXT4": {"default": "MULTIPOS"}
+        "P2": {"default": "POT"}
     },
     "v12": {
         "P1": {"default": "POT_CENTER"},