diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae202175..66ea24cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,2 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+
 add_subdirectory(cores)
-add_subdirectory(variants)
+add_subdirectory(variants)
\ No newline at end of file
diff --git a/samples/blinky_arduino/CMakeLists.txt b/samples/blinky_arduino/CMakeLists.txt
index d8a51037..ef665451 100644
--- a/samples/blinky_arduino/CMakeLists.txt
+++ b/samples/blinky_arduino/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-set(DTC_OVERLAY_FILE $ENV{HOME}/zephyrproject/modules/lib/Arduino-Zephyr-API/variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble.overlay)
+set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(blinky)
 
diff --git a/samples/button_press_led/CMakeLists.txt b/samples/button_press_led/CMakeLists.txt
index d8a51037..ef665451 100644
--- a/samples/button_press_led/CMakeLists.txt
+++ b/samples/button_press_led/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-set(DTC_OVERLAY_FILE $ENV{HOME}/zephyrproject/modules/lib/Arduino-Zephyr-API/variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble.overlay)
+set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(blinky)
 
diff --git a/samples/hello_arduino/CMakeLists.txt b/samples/hello_arduino/CMakeLists.txt
index d271050f..71a3a075 100644
--- a/samples/hello_arduino/CMakeLists.txt
+++ b/samples/hello_arduino/CMakeLists.txt
@@ -2,10 +2,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-set(DTC_OVERLAY_FILE $ENV{HOME}/zephyrproject/modules/lib/Arduino-Zephyr-API/variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble.overlay)
+set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(hello_world)
 
 target_sources(app PRIVATE src/app.cpp)
 
-zephyr_compile_options(-Wno-unused-variable -Wno-comment)
\ No newline at end of file
+zephyr_compile_options(-Wno-unused-variable -Wno-comment)
diff --git a/samples/threads_arduino/CMakeLists.txt b/samples/threads_arduino/CMakeLists.txt
index 5a1e6f67..3e97b7b2 100644
--- a/samples/threads_arduino/CMakeLists.txt
+++ b/samples/threads_arduino/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
-set(DTC_OVERLAY_FILE $ENV{HOME}/zephyrproject/modules/lib/Arduino-Zephyr-API/variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble.overlay)
+set(DTC_OVERLAY_FILE $ENV{ZEPHYR_BASE}/../modules/lib/Arduino-Zephyr-API/variants/${BOARD}/${BOARD}.overlay)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(threads)
diff --git a/variants/CMakeLists.txt b/variants/CMakeLists.txt
index 927d5122..c217a8c9 100644
--- a/variants/CMakeLists.txt
+++ b/variants/CMakeLists.txt
@@ -1,5 +1,3 @@
 # SPDX-License-Identifier: Apache-2.0
 zephyr_include_directories(.)
-zephyr_include_directories(ARDUINO_NANO_33_BLE)
-zephyr_include_directories(ARDUINO_NANO_33_BLE_SENSE)
-zephyr_include_directories(ARDUINO_NANO_33_IOT)
\ No newline at end of file
+zephyr_include_directories(${BOARD})
diff --git a/variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble.overlay b/variants/arduino_nano_33_ble/arduino_nano_33_ble.overlay
similarity index 100%
rename from variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble.overlay
rename to variants/arduino_nano_33_ble/arduino_nano_33_ble.overlay
diff --git a/variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble_pinmap.h b/variants/arduino_nano_33_ble/arduino_nano_33_ble_pinmap.h
similarity index 100%
rename from variants/ARDUINO_NANO_33_BLE/arduino_nano_33_ble_pinmap.h
rename to variants/arduino_nano_33_ble/arduino_nano_33_ble_pinmap.h
diff --git a/variants/ARDUINO_NANO_33_BLE_SENSE/arduino_nano_33_ble_sense.overlay b/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense.overlay
similarity index 100%
rename from variants/ARDUINO_NANO_33_BLE_SENSE/arduino_nano_33_ble_sense.overlay
rename to variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense.overlay
diff --git a/variants/ARDUINO_NANO_33_BLE_SENSE/arduino_nano_33_ble_sense_pinmap.h b/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h
similarity index 99%
rename from variants/ARDUINO_NANO_33_BLE_SENSE/arduino_nano_33_ble_sense_pinmap.h
rename to variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h
index e7b7811b..c8d01ec6 100644
--- a/variants/ARDUINO_NANO_33_BLE_SENSE/arduino_nano_33_ble_sense_pinmap.h
+++ b/variants/arduino_nano_33_ble_sense/arduino_nano_33_ble_sense_pinmap.h
@@ -79,4 +79,4 @@ enum digitalPins {
   D19,
   D20,
   D21
-};
\ No newline at end of file
+};
diff --git a/variants/ARDUINO_NANO_33_IOT/arduino_nano_33_iot.overlay b/variants/arduino_nano_33_iot/arduino_nano_33_iot.overlay
similarity index 100%
rename from variants/ARDUINO_NANO_33_IOT/arduino_nano_33_iot.overlay
rename to variants/arduino_nano_33_iot/arduino_nano_33_iot.overlay
diff --git a/variants/ARDUINO_NANO_33_IOT/arduino_nano_33_iot_pinmap.h b/variants/arduino_nano_33_iot/arduino_nano_33_iot_pinmap.h
similarity index 100%
rename from variants/ARDUINO_NANO_33_IOT/arduino_nano_33_iot_pinmap.h
rename to variants/arduino_nano_33_iot/arduino_nano_33_iot_pinmap.h