diff --git a/model/STM32STEAM32_WB55RG.cpp b/model/STEAM32_WB55RG.cpp
similarity index 81%
rename from model/STM32STEAM32_WB55RG.cpp
rename to model/STEAM32_WB55RG.cpp
index 27e7133..acad7b7 100644
--- a/model/STM32STEAM32_WB55RG.cpp
+++ b/model/STEAM32_WB55RG.cpp
@@ -1,10 +1,8 @@
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 using namespace codal;
 
-void STM32PNUCLEO_WB55RG_dmesg_flush();
-
-STM32STEAM32_WB55RG* codal::default_device_instance = nullptr;
+STEAM32_WB55RG* codal::default_device_instance = nullptr;
 
 /**
  * Constructor.
@@ -12,7 +10,7 @@ STM32STEAM32_WB55RG* codal::default_device_instance = nullptr;
  * Create a representation of a device, which includes member variables
  * that represent various device drivers used to control aspects of the STM32 IOT node.
  */
-STM32STEAM32_WB55RG::STM32STEAM32_WB55RG()
+STEAM32_WB55RG::STEAM32_WB55RG()
     : lowLevelTimer(TIM2, TIM2_IRQn),
       timer(lowLevelTimer),
       io(),
@@ -37,20 +35,20 @@ STM32STEAM32_WB55RG::STM32STEAM32_WB55RG()
  * static context i.e. in a constructor.
  *
  * @code
- * STM32STEAM32_WB55RG.init();
+ * STEAM32_WB55RG.init();
  * @endcode
  *
  * @note This method must be called before user code utilises any functionality
- *       contained within the STM32STEAM32_WB55RG class.
+ *       contained within the STEAM32_WB55RG class.
  */
-int STM32STEAM32_WB55RG::init()
+int STEAM32_WB55RG::init()
 {
     if ((status & DEVICE_INITIALIZED) != 0) {
         return DEVICE_NOT_SUPPORTED;
     }
     status |= DEVICE_INITIALIZED;
 
-    // codal_dmesg_set_flush_fn(STM32STEAM32_WB55RG_dmesg_flush);
+    // codal_dmesg_set_flush_fn(STEAM32_WB55RG_dmesg_flush);
 
     // Bring up fiber scheduler.
     scheduler_init(messageBus);
@@ -68,7 +66,7 @@ int STM32STEAM32_WB55RG::init()
 
 extern "C" int __io_putchar(int ch);
 
-void STM32STEAM32_WB55RG_dmesg_flush()
+void STEAM32_WB55RG_dmesg_flush()
 {
 #if CONFIG_ENABLED(DMESG_SERIAL_DEBUG)
 #if DEVICE_DMESG_BUFFER_SIZE > 0
diff --git a/model/STM32STEAM32_WB55RG.h b/model/STEAM32_WB55RG.h
similarity index 89%
rename from model/STM32STEAM32_WB55RG.h
rename to model/STEAM32_WB55RG.h
index ad7c604..4150c42 100644
--- a/model/STM32STEAM32_WB55RG.h
+++ b/model/STEAM32_WB55RG.h
@@ -1,5 +1,4 @@
-#ifndef STM32PNUCLEO_WB55RG_H
-#define STM32PNUCLEO_WB55RG_H
+#pragma once
 
 #include "Button.h"
 #include "CodalComponent.h"
@@ -9,10 +8,10 @@
 #include "Event.h"
 #include "MessageBus.h"
 #include "NotifyEvents.h"
+#include "STEAM32_WB55RG_IO.h"
 #include "STM32I2C.h"
 #include "STM32LowLevelTimer.h"
 #include "STM32SPI.h"
-#include "STM32STEAM32_WB55RG_IO.h"
 #include "STM32Serial.h"
 #include "Timer.h"
 #include "stm32_def.h"
@@ -27,12 +26,12 @@
  * used to control aspects of the STM32 IOT node.
  */
 namespace codal {
-class STM32STEAM32_WB55RG : public CodalComponent {
+class STEAM32_WB55RG : public CodalComponent {
   public:
     STM32LowLevelTimer lowLevelTimer;
     Timer timer;
     MessageBus messageBus;
-    STM32STEAM32_WB55RG_IO io;
+    STEAM32_WB55RG_IO io;
 
     STM32Serial serial;
     STM32I2C i2c1;
@@ -44,7 +43,7 @@ class STM32STEAM32_WB55RG : public CodalComponent {
     /**
      * Constructor.
      */
-    STM32STEAM32_WB55RG();
+    STEAM32_WB55RG();
 
     /**
      * Post constructor initialisation method.
@@ -89,6 +88,5 @@ class STM32STEAM32_WB55RG : public CodalComponent {
     CODAL_TIMESTAMP systemTime() { return system_timer_current_time(); }
 };
 
-extern STM32STEAM32_WB55RG* default_device_instance;
+extern STEAM32_WB55RG* default_device_instance;
 }  // namespace codal
-#endif
diff --git a/model/STM32STEAM32_WB55RG_IO.cpp b/model/STEAM32_WB55RG_IO.cpp
similarity index 74%
rename from model/STM32STEAM32_WB55RG_IO.cpp
rename to model/STEAM32_WB55RG_IO.cpp
index d60c3cd..fb9e94e 100755
--- a/model/STM32STEAM32_WB55RG_IO.cpp
+++ b/model/STEAM32_WB55RG_IO.cpp
@@ -1,31 +1,9 @@
-/*
-The MIT License (MIT)
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-*/
-
 /**
  * Class definition for STM32 IOT node IO.
  * Represents a collection of all I/O pins on the device.
  */
 
-#include "STM32STEAM32_WB55RG_IO.h"
+#include "STEAM32_WB55RG_IO.h"
 
 namespace codal {
 
@@ -37,7 +15,7 @@ namespace codal {
  * Accepts a sequence of unique ID's used to distinguish events raised
  * by Pin instances on the default EventModel.
  */
-STM32STEAM32_WB55RG_IO::STM32STEAM32_WB55RG_IO()
+STEAM32_WB55RG_IO::STEAM32_WB55RG_IO()
     : PA_0(ID_PIN_PA0, PinNumber::PA_0, PIN_CAPABILITY_DIGITAL),
       PA_1(ID_PIN_PA1, PinNumber::PA_1, PIN_CAPABILITY_DIGITAL),
       PA_2(ID_PIN_PA2, PinNumber::PA_2, PIN_CAPABILITY_DIGITAL),  // Enable ANALOG = bug with TIM2 (due to PWM)
diff --git a/model/STM32STEAM32_WB55RG_IO.h b/model/STEAM32_WB55RG_IO.h
similarity index 96%
rename from model/STM32STEAM32_WB55RG_IO.h
rename to model/STEAM32_WB55RG_IO.h
index c793e23..48cd0cb 100755
--- a/model/STM32STEAM32_WB55RG_IO.h
+++ b/model/STEAM32_WB55RG_IO.h
@@ -1,5 +1,4 @@
-#ifndef STM32_IOT_NODE_IO_H
-#define STM32_IOT_NODE_IO_H
+#pragma once
 
 #include "STM32Pin.h"
 //
@@ -76,12 +75,12 @@ namespace codal {
 /**
  * Represents a collection of all I/O pins exposed by the device.
  */
-class STM32STEAM32_WB55RG_IO {
+class STEAM32_WB55RG_IO {
   public:
     /**
      * Constructor.
      */
-    STM32STEAM32_WB55RG_IO();
+    STEAM32_WB55RG_IO();
 
     STM32Pin PA_0;
     STM32Pin PA_1;
@@ -130,5 +129,3 @@ class STM32STEAM32_WB55RG_IO {
     STM32Pin NC;
 };
 }  // namespace codal
-
-#endif
diff --git a/samples/BLE/BLE_Broadcast/BLE_Broadcast_Sample.cpp b/samples/BLE/BLE_Broadcast/BLE_Broadcast_Sample.cpp
index c067fba..d181a65 100644
--- a/samples/BLE/BLE_Broadcast/BLE_Broadcast_Sample.cpp
+++ b/samples/BLE/BLE_Broadcast/BLE_Broadcast_Sample.cpp
@@ -9,7 +9,7 @@
 #include "STM32Serial.h"
 #include "ble_utils.h"
 
-void BLE_Broadcast_Sample_main(codal::STM32STEAM32_WB55RG& steam32)
+void BLE_Broadcast_Sample_main(codal::STEAM32_WB55RG& steam32)
 {
     steam32.serial.init(115200);
 
diff --git a/samples/BLE/BLE_Broadcast/BLE_Broadcast_Sample.h b/samples/BLE/BLE_Broadcast/BLE_Broadcast_Sample.h
index cedbca6..8d8fbfe 100644
--- a/samples/BLE/BLE_Broadcast/BLE_Broadcast_Sample.h
+++ b/samples/BLE/BLE_Broadcast/BLE_Broadcast_Sample.h
@@ -1,4 +1,4 @@
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #ifndef BLE_BROADCAST_SAMPLE_H
 #define BLE_BROADCAST_SAMPLE_H
@@ -7,6 +7,6 @@
 #define SAMPLE_MAIN BLE_Broadcast_Sample_main
 #endif
 
-void BLE_Broadcast_Sample_main(codal::STM32STEAM32_WB55RG& steam32);
+void BLE_Broadcast_Sample_main(codal::STEAM32_WB55RG& steam32);
 
 #endif
diff --git a/samples/Basic/Blink/BlinkSample.cpp b/samples/Basic/Blink/BlinkSample.cpp
index 00e8094..527a622 100644
--- a/samples/Basic/Blink/BlinkSample.cpp
+++ b/samples/Basic/Blink/BlinkSample.cpp
@@ -3,7 +3,7 @@
 using namespace std;
 using namespace codal;
 
-void BlinkSample_main(codal::STM32STEAM32_WB55RG& steam32)
+void BlinkSample_main(codal::STEAM32_WB55RG& steam32)
 {
     bool state = false;
 
diff --git a/samples/Basic/Blink/BlinkSample.h b/samples/Basic/Blink/BlinkSample.h
index 38951fa..438662c 100644
--- a/samples/Basic/Blink/BlinkSample.h
+++ b/samples/Basic/Blink/BlinkSample.h
@@ -1,4 +1,4 @@
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #ifndef BLINK_SAMPLE_H
 #define BLINK_SAMPLE_H
@@ -7,6 +7,6 @@
 #define SAMPLE_MAIN BlinkSample_main
 #endif
 
-void BlinkSample_main(codal::STM32STEAM32_WB55RG& steam32);
+void BlinkSample_main(codal::STEAM32_WB55RG& steam32);
 
 #endif
diff --git a/samples/Basic/Buttons/ButtonSample.cpp b/samples/Basic/Buttons/ButtonSample.cpp
index 7a6db1c..be50b74 100644
--- a/samples/Basic/Buttons/ButtonSample.cpp
+++ b/samples/Basic/Buttons/ButtonSample.cpp
@@ -3,7 +3,7 @@
 using namespace std;
 using namespace codal;
 
-void ButtonSample_main(codal::STM32STEAM32_WB55RG& steam32)
+void ButtonSample_main(codal::STEAM32_WB55RG& steam32)
 {
     STM32Pin& led_red   = steam32.io.PC_12;
     STM32Pin& led_green = steam32.io.PC_11;
diff --git a/samples/Basic/Buttons/ButtonSample.h b/samples/Basic/Buttons/ButtonSample.h
index 906caa1..ac32590 100644
--- a/samples/Basic/Buttons/ButtonSample.h
+++ b/samples/Basic/Buttons/ButtonSample.h
@@ -1,4 +1,4 @@
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #ifndef BUTTON_SAMPLE_H
 #define BUTTON_SAMPLE_H
@@ -7,6 +7,6 @@
 #define SAMPLE_MAIN ButtonSample_main
 #endif
 
-void ButtonSample_main(codal::STM32STEAM32_WB55RG& steam32);
+void ButtonSample_main(codal::STEAM32_WB55RG& steam32);
 
 #endif
diff --git a/samples/Basic/ScannerI2C/ScannerI2C.cpp b/samples/Basic/ScannerI2C/ScannerI2C.cpp
index 4a7cfda..fa57f41 100644
--- a/samples/Basic/ScannerI2C/ScannerI2C.cpp
+++ b/samples/Basic/ScannerI2C/ScannerI2C.cpp
@@ -3,7 +3,7 @@
 
 #include <cstdio>
 
-void ScannerI2C(codal::STM32STEAM32_WB55RG& steam32)
+void ScannerI2C(codal::STEAM32_WB55RG& steam32)
 {
     steam32.serial.init(115200);
 
diff --git a/samples/Basic/ScannerI2C/ScannerI2C.h b/samples/Basic/ScannerI2C/ScannerI2C.h
index 1afe89d..c363282 100644
--- a/samples/Basic/ScannerI2C/ScannerI2C.h
+++ b/samples/Basic/ScannerI2C/ScannerI2C.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #ifndef SAMPLE_MAIN
 #define SAMPLE_MAIN ScannerI2C
 #endif
 
-void ScannerI2C(codal::STM32STEAM32_WB55RG& steam32);
+void ScannerI2C(codal::STEAM32_WB55RG& steam32);
diff --git a/samples/Basic/Serial/SerialSample.cpp b/samples/Basic/Serial/SerialSample.cpp
index 4d68680..80fd982 100644
--- a/samples/Basic/Serial/SerialSample.cpp
+++ b/samples/Basic/Serial/SerialSample.cpp
@@ -4,7 +4,7 @@
 
 #include "STM32Serial.h"
 
-void SerialSample_main(codal::STM32STEAM32_WB55RG& steam32)
+void SerialSample_main(codal::STEAM32_WB55RG& steam32)
 {
     steam32.serial.init(115200);
 
diff --git a/samples/Basic/Serial/SerialSample.h b/samples/Basic/Serial/SerialSample.h
index b6c192a..3b95c2d 100644
--- a/samples/Basic/Serial/SerialSample.h
+++ b/samples/Basic/Serial/SerialSample.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #ifndef SAMPLE_MAIN
 #define SAMPLE_MAIN SerialSample_main
 #endif
 
-void SerialSample_main(codal::STM32STEAM32_WB55RG& steam32);
+void SerialSample_main(codal::STEAM32_WB55RG& steam32);
diff --git a/samples/Basic/SingleWireSerial/SingleWireSerialSample.cpp b/samples/Basic/SingleWireSerial/SingleWireSerialSample.cpp
index 85a1a60..f0df6a7 100644
--- a/samples/Basic/SingleWireSerial/SingleWireSerialSample.cpp
+++ b/samples/Basic/SingleWireSerial/SingleWireSerialSample.cpp
@@ -14,7 +14,7 @@ void set_serial_mode(codal::STM32SingleWireSerial& sws, bool is_tx)
     }
 }
 
-void SingleSerialSerialSample_main(codal::STM32STEAM32_WB55RG& steam32)
+void SingleSerialSerialSample_main(codal::STEAM32_WB55RG& steam32)
 {
     bool is_sserial_tx = false;
     codal::STM32SingleWireSerial sserial(steam32.io.PB_6);
diff --git a/samples/Basic/SingleWireSerial/SingleWireSerialSample.h b/samples/Basic/SingleWireSerial/SingleWireSerialSample.h
index 7ef2d73..dca5461 100644
--- a/samples/Basic/SingleWireSerial/SingleWireSerialSample.h
+++ b/samples/Basic/SingleWireSerial/SingleWireSerialSample.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #ifndef SAMPLE_MAIN
 #define SAMPLE_MAIN SingleSerialSerialSample_main
 #endif
 
-void SingleSerialSerialSample_main(codal::STM32STEAM32_WB55RG& steam32);
+void SingleSerialSerialSample_main(codal::STEAM32_WB55RG& steam32);
diff --git a/samples/Demo/demo_sample.cpp b/samples/Demo/demo_sample.cpp
index e44fe12..e1752c0 100644
--- a/samples/Demo/demo_sample.cpp
+++ b/samples/Demo/demo_sample.cpp
@@ -1208,7 +1208,7 @@ void show_qwic()
     }
 }
 
-void Demo_main(codal::STM32STEAM32_WB55RG& steam32)
+void Demo_main(codal::STEAM32_WB55RG& steam32)
 {
     i2c_qwiic = &steam32.i2c3;
     spi       = &steam32.spi1;
diff --git a/samples/Demo/demo_sample.h b/samples/Demo/demo_sample.h
index 4872fbc..0f2650d 100644
--- a/samples/Demo/demo_sample.h
+++ b/samples/Demo/demo_sample.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #ifndef SAMPLE_MAIN
 #define SAMPLE_MAIN Demo_main
 #endif
 
-void Demo_main(codal::STM32STEAM32_WB55RG& steam32);
\ No newline at end of file
+void Demo_main(codal::STEAM32_WB55RG& steam32);
\ No newline at end of file
diff --git a/samples/Display/OLED_SSD1327/OLED_SSD1327.cpp b/samples/Display/OLED_SSD1327/OLED_SSD1327.cpp
index 8541713..f12c85f 100644
--- a/samples/Display/OLED_SSD1327/OLED_SSD1327.cpp
+++ b/samples/Display/OLED_SSD1327/OLED_SSD1327.cpp
@@ -445,7 +445,7 @@ uint8_t pic[128][64] = {
 #include "VL53L1X.h"
 #include "WSEN-PADS.h"
 
-void OledSample1327_main(codal::STM32STEAM32_WB55RG& steam32)
+void OledSample1327_main(codal::STEAM32_WB55RG& steam32)
 {
     STM32SPI& spi = steam32.spi1;
     STM32Pin& cs  = steam32.io.PD_0;
diff --git a/samples/Display/OLED_SSD1327/OLED_SSD1327.h b/samples/Display/OLED_SSD1327/OLED_SSD1327.h
index 01d01ca..889bdba 100644
--- a/samples/Display/OLED_SSD1327/OLED_SSD1327.h
+++ b/samples/Display/OLED_SSD1327/OLED_SSD1327.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #ifndef SAMPLE_MAIN
 #define SAMPLE_MAIN OledSample1327_main
 #endif
 
-void OledSample1327_main(codal::STM32STEAM32_WB55RG& steam32);
+void OledSample1327_main(codal::STEAM32_WB55RG& steam32);
diff --git a/samples/Peripherals/APDS9960/APDS9960_sample.cpp b/samples/Peripherals/APDS9960/APDS9960_sample.cpp
index a2d8097..4358d42 100644
--- a/samples/Peripherals/APDS9960/APDS9960_sample.cpp
+++ b/samples/Peripherals/APDS9960/APDS9960_sample.cpp
@@ -6,7 +6,7 @@
 #include "APDS9960.h"
 #include "ssd1327.h"
 
-void APDS9960_SampleMain(codal::STM32STEAM32_WB55RG& steam32)
+void APDS9960_SampleMain(codal::STEAM32_WB55RG& steam32)
 {
     steam32.serial.init(115200);
 
diff --git a/samples/Peripherals/APDS9960/APDS9960_sample.h b/samples/Peripherals/APDS9960/APDS9960_sample.h
index 6fed93f..acb020f 100644
--- a/samples/Peripherals/APDS9960/APDS9960_sample.h
+++ b/samples/Peripherals/APDS9960/APDS9960_sample.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #ifndef SAMPLE_MAIN
 #define SAMPLE_MAIN APDS9960_SampleMain
 #endif
 
-void APDS9960_SampleMain(codal::STM32STEAM32_WB55RG& steam32);
+void APDS9960_SampleMain(codal::STEAM32_WB55RG& steam32);
diff --git a/samples/Peripherals/BQ27441/BQ27441_sample.cpp b/samples/Peripherals/BQ27441/BQ27441_sample.cpp
index 6ced1c6..419a2c0 100644
--- a/samples/Peripherals/BQ27441/BQ27441_sample.cpp
+++ b/samples/Peripherals/BQ27441/BQ27441_sample.cpp
@@ -5,7 +5,7 @@
 
 #include "BQ27441.h"
 
-void BQ27441_SampleMain(codal::STM32STEAM32_WB55RG& steam32)
+void BQ27441_SampleMain(codal::STEAM32_WB55RG& steam32)
 {
     steam32.serial.init(115200);
     steam32.sleep(2000);
diff --git a/samples/Peripherals/BQ27441/BQ27441_sample.h b/samples/Peripherals/BQ27441/BQ27441_sample.h
index ceae91b..3bdd36a 100644
--- a/samples/Peripherals/BQ27441/BQ27441_sample.h
+++ b/samples/Peripherals/BQ27441/BQ27441_sample.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #ifndef SAMPLE_MAIN
 #define SAMPLE_MAIN BQ27441_SampleMain
 #endif
 
-void BQ27441_SampleMain(codal::STM32STEAM32_WB55RG& steam32);
+void BQ27441_SampleMain(codal::STEAM32_WB55RG& steam32);
diff --git a/samples/Peripherals/DapLink_Flash/DapLink_Flash_sample.cpp b/samples/Peripherals/DapLink_Flash/DapLink_Flash_sample.cpp
index 21b368a..308c251 100644
--- a/samples/Peripherals/DapLink_Flash/DapLink_Flash_sample.cpp
+++ b/samples/Peripherals/DapLink_Flash/DapLink_Flash_sample.cpp
@@ -14,7 +14,7 @@ constexpr uint8_t FLASH_READ_ERROR_REG  = 0x81;
 
 bool state_led = false;
 
-void DAPLINK_FLASH_Sample(codal::STM32STEAM32_WB55RG& steam32)
+void DAPLINK_FLASH_Sample(codal::STEAM32_WB55RG& steam32)
 {
     steam32.init();
     steam32.serial.init(115200);
diff --git a/samples/Peripherals/DapLink_Flash/DapLink_Flash_sample.h b/samples/Peripherals/DapLink_Flash/DapLink_Flash_sample.h
index bf8ba5a..db13513 100644
--- a/samples/Peripherals/DapLink_Flash/DapLink_Flash_sample.h
+++ b/samples/Peripherals/DapLink_Flash/DapLink_Flash_sample.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #ifndef SAMPLE_MAIN
 #define SAMPLE_MAIN DAPLINK_FLASH_Sample
 #endif
 
-void DAPLINK_FLASH_Sample(codal::STM32STEAM32_WB55RG& steam32);
+void DAPLINK_FLASH_Sample(codal::STEAM32_WB55RG& steam32);
diff --git a/samples/Peripherals/FUS_WS_Operator/FUS_WS_Operator.cpp b/samples/Peripherals/FUS_WS_Operator/FUS_WS_Operator.cpp
index cf6248f..6f3ec8f 100644
--- a/samples/Peripherals/FUS_WS_Operator/FUS_WS_Operator.cpp
+++ b/samples/Peripherals/FUS_WS_Operator/FUS_WS_Operator.cpp
@@ -34,7 +34,7 @@ bool click_button(codal::STM32Pin& btn)
     return false;
 }
 
-void FUS_WS_Operator(STM32STEAM32_WB55RG& steam32)
+void FUS_WS_Operator(STEAM32_WB55RG& steam32)
 {
     // Start CRC clock for FUS
     __HAL_RCC_CRC_CLK_ENABLE();
diff --git a/samples/Peripherals/FUS_WS_Operator/FUS_WS_Operator.h b/samples/Peripherals/FUS_WS_Operator/FUS_WS_Operator.h
index 773ff03..472e4ef 100644
--- a/samples/Peripherals/FUS_WS_Operator/FUS_WS_Operator.h
+++ b/samples/Peripherals/FUS_WS_Operator/FUS_WS_Operator.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #ifndef SAMPLE_MAIN
 #define SAMPLE_MAIN FUS_WS_Operator
 #endif
 
-void FUS_WS_Operator(codal::STM32STEAM32_WB55RG& steam32);
\ No newline at end of file
+void FUS_WS_Operator(codal::STEAM32_WB55RG& steam32);
\ No newline at end of file
diff --git a/samples/Peripherals/HTS221/HTS221_sample.cpp b/samples/Peripherals/HTS221/HTS221_sample.cpp
index d396c0d..3b47a1d 100644
--- a/samples/Peripherals/HTS221/HTS221_sample.cpp
+++ b/samples/Peripherals/HTS221/HTS221_sample.cpp
@@ -3,7 +3,7 @@
 
 #include <string>
 
-void hts221Sample(codal::STM32STEAM32_WB55RG& steam32)
+void hts221Sample(codal::STEAM32_WB55RG& steam32)
 {
     steam32.serial.init(115200);
 
diff --git a/samples/Peripherals/HTS221/HTS221_sample.h b/samples/Peripherals/HTS221/HTS221_sample.h
index 3ad1bb9..ee83b26 100644
--- a/samples/Peripherals/HTS221/HTS221_sample.h
+++ b/samples/Peripherals/HTS221/HTS221_sample.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "HTS221.h"
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #ifndef SAMPLE_MAIN
 #define SAMPLE_MAIN hts221Sample
 #endif
 
-void hts221Sample(codal::STM32STEAM32_WB55RG& steam32);
+void hts221Sample(codal::STEAM32_WB55RG& steam32);
diff --git a/samples/Peripherals/RTC/RTC_sample.cpp b/samples/Peripherals/RTC/RTC_sample.cpp
index 3f8a143..358fefd 100644
--- a/samples/Peripherals/RTC/RTC_sample.cpp
+++ b/samples/Peripherals/RTC/RTC_sample.cpp
@@ -32,7 +32,7 @@ const char* weekdayToStr(uint8_t wd)
     }
 }
 
-void RTC_main(STM32STEAM32_WB55RG& steam32)
+void RTC_main(STEAM32_WB55RG& steam32)
 {
     auto rtc     = STM32RTC();
     auto& serial = steam32.serial;
diff --git a/samples/Peripherals/RTC/RTC_sample.h b/samples/Peripherals/RTC/RTC_sample.h
index 41a1cb9..ce0a1e7 100644
--- a/samples/Peripherals/RTC/RTC_sample.h
+++ b/samples/Peripherals/RTC/RTC_sample.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #ifndef SAMPLE_MAIN
 #define SAMPLE_MAIN RTC_main
 #endif
 
-void RTC_main(codal::STM32STEAM32_WB55RG& steam32);
\ No newline at end of file
+void RTC_main(codal::STEAM32_WB55RG& steam32);
\ No newline at end of file
diff --git a/samples/Peripherals/SAI/SAI_sample.cpp b/samples/Peripherals/SAI/SAI_sample.cpp
index 2397c37..5a7499f 100644
--- a/samples/Peripherals/SAI/SAI_sample.cpp
+++ b/samples/Peripherals/SAI/SAI_sample.cpp
@@ -46,7 +46,7 @@ void onError(const uint32_t errCode)
     printf("An error occured: %08X (%d)\r\n", errCode, errCode);
 }
 
-void SAI_main(STM32STEAM32_WB55RG& steam32)
+void SAI_main(STEAM32_WB55RG& steam32)
 {
     bool is_paused = false;
 
diff --git a/samples/Peripherals/SAI/SAI_sample.h b/samples/Peripherals/SAI/SAI_sample.h
index d0334e1..7c83473 100644
--- a/samples/Peripherals/SAI/SAI_sample.h
+++ b/samples/Peripherals/SAI/SAI_sample.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #ifndef SAMPLE_MAIN
 #define SAMPLE_MAIN SAI_main
 #endif
 
-void SAI_main(codal::STM32STEAM32_WB55RG& steam32);
\ No newline at end of file
+void SAI_main(codal::STEAM32_WB55RG& steam32);
\ No newline at end of file
diff --git a/samples/Peripherals/VL53L1X/VL53L1X_sample.cpp b/samples/Peripherals/VL53L1X/VL53L1X_sample.cpp
index 1d0608f..13d165a 100644
--- a/samples/Peripherals/VL53L1X/VL53L1X_sample.cpp
+++ b/samples/Peripherals/VL53L1X/VL53L1X_sample.cpp
@@ -4,7 +4,7 @@
 #include <cstdio>
 #include <string>
 
-void vlx53l1xSample(codal::STM32STEAM32_WB55RG& steam32)
+void vlx53l1xSample(codal::STEAM32_WB55RG& steam32)
 {
     steam32.serial.init(115200);
 
diff --git a/samples/Peripherals/VL53L1X/VL53L1X_sample.h b/samples/Peripherals/VL53L1X/VL53L1X_sample.h
index d50bac2..f93a4ad 100644
--- a/samples/Peripherals/VL53L1X/VL53L1X_sample.h
+++ b/samples/Peripherals/VL53L1X/VL53L1X_sample.h
@@ -2,13 +2,13 @@
 #ifndef __HTS221_SAMPLE_H__
 #define __HTS221_SAMPLE_H__
 
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 #include "VL53L1X.h"
 
 #ifndef SAMPLE_MAIN
 #define SAMPLE_MAIN vlx53l1xSample
 #endif
 
-void vlx53l1xSample(codal::STM32STEAM32_WB55RG& steam32);
+void vlx53l1xSample(codal::STEAM32_WB55RG& steam32);
 
 #endif
diff --git a/samples/Peripherals/WSEN-PADS/WSEN-PADS_sample.cpp b/samples/Peripherals/WSEN-PADS/WSEN-PADS_sample.cpp
index c141ce7..dc4bb0f 100644
--- a/samples/Peripherals/WSEN-PADS/WSEN-PADS_sample.cpp
+++ b/samples/Peripherals/WSEN-PADS/WSEN-PADS_sample.cpp
@@ -2,7 +2,7 @@
 
 #include <string>
 
-void Wsen_PadsSample(codal::STM32STEAM32_WB55RG& steam32)
+void Wsen_PadsSample(codal::STEAM32_WB55RG& steam32)
 {
     steam32.serial.init(115200);
 
diff --git a/samples/Peripherals/WSEN-PADS/WSEN-PADS_sample.h b/samples/Peripherals/WSEN-PADS/WSEN-PADS_sample.h
index a284f28..3926266 100644
--- a/samples/Peripherals/WSEN-PADS/WSEN-PADS_sample.h
+++ b/samples/Peripherals/WSEN-PADS/WSEN-PADS_sample.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 #include "WSEN-PADS.h"
 
 #ifndef SAMPLE_MAIN
 #define SAMPLE_MAIN Wsen_PadsSample
 #endif
 
-void Wsen_PadsSample(codal::STM32STEAM32_WB55RG& steam32);
+void Wsen_PadsSample(codal::STEAM32_WB55RG& steam32);
diff --git a/samples/main.cpp b/samples/main.cpp
index f3d65e5..4c56a21 100644
--- a/samples/main.cpp
+++ b/samples/main.cpp
@@ -1,5 +1,5 @@
 #include "CodalFiber.h"
-#include "STM32STEAM32_WB55RG.h"
+#include "STEAM32_WB55RG.h"
 
 #if defined(BUTTONS_SAMPLE)
 #include "ButtonSample.h"
@@ -37,7 +37,7 @@
 #include "BlinkSample.h"
 #endif
 
-codal::STM32STEAM32_WB55RG steam32;
+codal::STEAM32_WB55RG steam32;
 
 auto main() -> int
 {
diff --git a/target-locked.json b/target-locked.json
index 8880824..ce676e9 100644
--- a/target-locked.json
+++ b/target-locked.json
@@ -27,7 +27,6 @@
         "PERIPHERAL_PINS": "PeripheralPins_STEAM32_WB55RG",
         "PROCESSOR_WORD_TYPE": "uintptr_t",
         "SCHEDULER_TICK_PERIOD_US": 1000,
-        "STEAM32_WB55RG": 1,
         "USE_ACCEL_LSB": 0,
         "VARIANT": "variant_STEAM32_WB55RG",
         "VARIANT_H": "\"variant_STEAM32_WB55RG.h\""
diff --git a/target.json b/target.json
index 08320ca..9a05012 100644
--- a/target.json
+++ b/target.json
@@ -36,7 +36,7 @@
     "PERIPHERAL_PINS": "PeripheralPins_STEAM32_WB55RG",
     "VARIANT": "variant_STEAM32_WB55RG",
     "VARIANT_H": "\"variant_STEAM32_WB55RG.h\"",
-    "STEAM32_WB55RG": 1,
+    "ARDUINO_STEAM32_WB55RG": 1,
     "HAL_UART_MODULE_ENABLED": 1
   },
   "definitions": "-DSTM32WBxx -DSTM32WB55xx -DCUSTOM_PERIPHERAL_PINS -include codal-stm32-STEAM32_WB55RG/inc/localconf.h -DI2C_IRQ_PRIO=0",