diff --git a/targets/arm/mikroe/ai_generated/stm32/src/adc/CMakeLists.txt b/targets/arm/mikroe/ai_generated/stm32/src/adc/CMakeLists.txt
index ad6df5c22..30117f8d9 100644
--- a/targets/arm/mikroe/ai_generated/stm32/src/adc/CMakeLists.txt
+++ b/targets/arm/mikroe/ai_generated/stm32/src/adc/CMakeLists.txt
@@ -12,7 +12,7 @@ if(MODULE_IS_GENERATED)
 
     find_cortex(hal_ll_def_list)
     list(APPEND hal_ll_def_list ${MCU_NAME})
-    set(mcu_header_path ${MCU_NAME}_${_MSDK_PACKAGE_ID_})
+    set(mcu_header_path ${MCU_NAME}/${_MSDK_PACKAGE_ID_}${_MSDK_PACKAGE_PIN_COUNT_})
 
     ## BEGIN ADC
     list(APPEND hal_ll_def_list "MACRO_USAGE_ADC")
diff --git a/targets/arm/mikroe/ai_generated/stm32/src/can/CMakeLists.txt b/targets/arm/mikroe/ai_generated/stm32/src/can/CMakeLists.txt
index 8d2c4f634..b647cb1d2 100644
--- a/targets/arm/mikroe/ai_generated/stm32/src/can/CMakeLists.txt
+++ b/targets/arm/mikroe/ai_generated/stm32/src/can/CMakeLists.txt
@@ -12,7 +12,7 @@ if(MODULE_IS_GENERATED)
 
     find_cortex(hal_ll_def_list)
     list(APPEND hal_ll_def_list ${MCU_NAME})
-    set(mcu_header_path ${MCU_NAME}_${_MSDK_PACKAGE_ID_})
+    set(mcu_header_path ${MCU_NAME}/${_MSDK_PACKAGE_ID_}${_MSDK_PACKAGE_PIN_COUNT_})
 
     ## BEGIN CAN
     list(APPEND hal_ll_def_list "MACRO_USAGE_CAN")
diff --git a/targets/arm/mikroe/ai_generated/stm32/src/dma/CMakeLists.txt b/targets/arm/mikroe/ai_generated/stm32/src/dma/CMakeLists.txt
index d89f07cee..a95239190 100644
--- a/targets/arm/mikroe/ai_generated/stm32/src/dma/CMakeLists.txt
+++ b/targets/arm/mikroe/ai_generated/stm32/src/dma/CMakeLists.txt
@@ -12,7 +12,7 @@ if(MODULE_IS_GENERATED)
 
     find_cortex(hal_ll_def_list)
     list(APPEND hal_ll_def_list ${MCU_NAME})
-    set(mcu_header_path ${MCU_NAME}_${_MSDK_PACKAGE_ID_})
+    set(mcu_header_path ${MCU_NAME}/${_MSDK_PACKAGE_ID_}${_MSDK_PACKAGE_PIN_COUNT_})
 
     ## BEGIN DMA
     list(APPEND hal_ll_def_list "MACRO_USAGE_DMA")
diff --git a/targets/arm/mikroe/ai_generated/stm32/src/gpio/CMakeLists.txt b/targets/arm/mikroe/ai_generated/stm32/src/gpio/CMakeLists.txt
index c36f0debd..48f8aa8d0 100644
--- a/targets/arm/mikroe/ai_generated/stm32/src/gpio/CMakeLists.txt
+++ b/targets/arm/mikroe/ai_generated/stm32/src/gpio/CMakeLists.txt
@@ -13,7 +13,7 @@ if(MODULE_IS_GENERATED)
 
     find_cortex(hal_ll_def_list)
     list(APPEND hal_ll_def_list ${MCU_NAME})
-    set(mcu_header_path ${MCU_NAME}_${_MSDK_PACKAGE_ID_})
+    set(mcu_header_path ${MCU_NAME}/${_MSDK_PACKAGE_ID_}${_MSDK_PACKAGE_PIN_COUNT_})
 
     ## BEGIN GPIO
     list(APPEND hal_ll_def_list "MACRO_USAGE_GPIO")
diff --git a/targets/arm/mikroe/ai_generated/stm32/src/i2c/CMakeLists.txt b/targets/arm/mikroe/ai_generated/stm32/src/i2c/CMakeLists.txt
index d76371bc0..4939bf93c 100644
--- a/targets/arm/mikroe/ai_generated/stm32/src/i2c/CMakeLists.txt
+++ b/targets/arm/mikroe/ai_generated/stm32/src/i2c/CMakeLists.txt
@@ -12,7 +12,7 @@ if(MODULE_IS_GENERATED)
 
     find_cortex(hal_ll_def_list)
     list(APPEND hal_ll_def_list ${MCU_NAME})
-    set(mcu_header_path ${MCU_NAME}_${_MSDK_PACKAGE_ID_})
+    set(mcu_header_path ${MCU_NAME}/${_MSDK_PACKAGE_ID_}${_MSDK_PACKAGE_PIN_COUNT_})
 
     ## BEGIN I2C
     list(APPEND hal_ll_def_list "MACRO_USAGE_I2C")
diff --git a/targets/arm/mikroe/ai_generated/stm32/src/one_wire/CMakeLists.txt b/targets/arm/mikroe/ai_generated/stm32/src/one_wire/CMakeLists.txt
index 4de6cfa1c..345b0d4f8 100644
--- a/targets/arm/mikroe/ai_generated/stm32/src/one_wire/CMakeLists.txt
+++ b/targets/arm/mikroe/ai_generated/stm32/src/one_wire/CMakeLists.txt
@@ -12,7 +12,7 @@ if(MODULE_IS_GENERATED)
 
     find_cortex(hal_ll_def_list)
     list(APPEND hal_ll_def_list ${MCU_NAME})
-    set(mcu_header_path ${MCU_NAME}_${_MSDK_PACKAGE_ID_})
+    set(mcu_header_path ${MCU_NAME}/${_MSDK_PACKAGE_ID_}${_MSDK_PACKAGE_PIN_COUNT_})
 
     list(APPEND hal_ll_def_list "MACRO_USAGE_ONE_WIRE")
 
diff --git a/targets/arm/mikroe/ai_generated/stm32/src/rtc/CMakeLists.txt b/targets/arm/mikroe/ai_generated/stm32/src/rtc/CMakeLists.txt
index 7fb0e9323..7cfa5e20b 100644
--- a/targets/arm/mikroe/ai_generated/stm32/src/rtc/CMakeLists.txt
+++ b/targets/arm/mikroe/ai_generated/stm32/src/rtc/CMakeLists.txt
@@ -12,7 +12,7 @@ if(MODULE_IS_GENERATED)
 
     find_cortex(hal_ll_def_list)
     list(APPEND hal_ll_def_list ${MCU_NAME})
-    set(mcu_header_path ${MCU_NAME}_${_MSDK_PACKAGE_ID_})
+    set(mcu_header_path ${MCU_NAME}/${_MSDK_PACKAGE_ID_}${_MSDK_PACKAGE_PIN_COUNT_})
 
     ## BEGIN RTC
     list(APPEND hal_ll_def_list "MACRO_USAGE_RTC")
diff --git a/targets/arm/mikroe/ai_generated/stm32/src/spi_master/CMakeLists.txt b/targets/arm/mikroe/ai_generated/stm32/src/spi_master/CMakeLists.txt
index 86f92ffec..da0bcaada 100644
--- a/targets/arm/mikroe/ai_generated/stm32/src/spi_master/CMakeLists.txt
+++ b/targets/arm/mikroe/ai_generated/stm32/src/spi_master/CMakeLists.txt
@@ -12,7 +12,7 @@ if(MODULE_IS_GENERATED)
 
     find_cortex(hal_ll_def_list)
     list(APPEND hal_ll_def_list ${MCU_NAME})
-    set(mcu_header_path ${MCU_NAME}_${_MSDK_PACKAGE_ID_})
+    set(mcu_header_path ${MCU_NAME}/${_MSDK_PACKAGE_ID_}${_MSDK_PACKAGE_PIN_COUNT_})
 
     # BEGIN SPI
     list(APPEND hal_ll_def_list "MACRO_USAGE_SPI")
diff --git a/targets/arm/mikroe/ai_generated/stm32/src/tim/CMakeLists.txt b/targets/arm/mikroe/ai_generated/stm32/src/tim/CMakeLists.txt
index 34bb262e3..859486461 100644
--- a/targets/arm/mikroe/ai_generated/stm32/src/tim/CMakeLists.txt
+++ b/targets/arm/mikroe/ai_generated/stm32/src/tim/CMakeLists.txt
@@ -12,7 +12,7 @@ if(MODULE_IS_GENERATED)
 
     find_cortex(hal_ll_def_list)
     list(APPEND hal_ll_def_list ${MCU_NAME})
-    set(mcu_header_path ${MCU_NAME}_${_MSDK_PACKAGE_ID_})
+    set(mcu_header_path ${MCU_NAME}/${_MSDK_PACKAGE_ID_}${_MSDK_PACKAGE_PIN_COUNT_})
 
     ## BEGIN TIM
     list(APPEND hal_ll_def_list "MACRO_USAGE_TIM")
diff --git a/targets/arm/mikroe/ai_generated/stm32/src/uart/CMakeLists.txt b/targets/arm/mikroe/ai_generated/stm32/src/uart/CMakeLists.txt
index afe97a083..b22ed7d4b 100644
--- a/targets/arm/mikroe/ai_generated/stm32/src/uart/CMakeLists.txt
+++ b/targets/arm/mikroe/ai_generated/stm32/src/uart/CMakeLists.txt
@@ -12,7 +12,7 @@ if(MODULE_IS_GENERATED)
 
     find_cortex(hal_ll_def_list)
     list(APPEND hal_ll_def_list ${MCU_NAME})
-    set(mcu_header_path ${MCU_NAME}_${_MSDK_PACKAGE_ID_})
+    set(mcu_header_path ${MCU_NAME}/${_MSDK_PACKAGE_ID_}${_MSDK_PACKAGE_PIN_COUNT_})
 
     ## BEGIN UART
     list(APPEND hal_ll_def_list "MACRO_USAGE_UART")