diff --git a/hw/mcu/nxp/lpc13uxx/CMSIS_CORE_LPC13Uxx/history.txt b/hw/mcu/nxp/lpc13xx/CMSIS_CORE_LPC13Uxx/history.txt
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/CMSIS_CORE_LPC13Uxx/history.txt
rename to hw/mcu/nxp/lpc13xx/CMSIS_CORE_LPC13Uxx/history.txt
diff --git a/hw/mcu/nxp/lpc13uxx/CMSIS_CORE_LPC13Uxx/inc/LPC13Uxx.h b/hw/mcu/nxp/lpc13xx/CMSIS_CORE_LPC13Uxx/inc/LPC13Uxx.h
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/CMSIS_CORE_LPC13Uxx/inc/LPC13Uxx.h
rename to hw/mcu/nxp/lpc13xx/CMSIS_CORE_LPC13Uxx/inc/LPC13Uxx.h
diff --git a/hw/mcu/nxp/lpc13uxx/CMSIS_CORE_LPC13Uxx/inc/power_api.h b/hw/mcu/nxp/lpc13xx/CMSIS_CORE_LPC13Uxx/inc/power_api.h
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/CMSIS_CORE_LPC13Uxx/inc/power_api.h
rename to hw/mcu/nxp/lpc13xx/CMSIS_CORE_LPC13Uxx/inc/power_api.h
diff --git a/hw/mcu/nxp/lpc13uxx/CMSIS_CORE_LPC13Uxx/inc/system_LPC13Uxx.h b/hw/mcu/nxp/lpc13xx/CMSIS_CORE_LPC13Uxx/inc/system_LPC13Uxx.h
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/CMSIS_CORE_LPC13Uxx/inc/system_LPC13Uxx.h
rename to hw/mcu/nxp/lpc13xx/CMSIS_CORE_LPC13Uxx/inc/system_LPC13Uxx.h
diff --git a/hw/mcu/nxp/lpc13uxx/CMSIS_CORE_LPC13Uxx/liblinks.xml b/hw/mcu/nxp/lpc13xx/CMSIS_CORE_LPC13Uxx/liblinks.xml
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/CMSIS_CORE_LPC13Uxx/liblinks.xml
rename to hw/mcu/nxp/lpc13xx/CMSIS_CORE_LPC13Uxx/liblinks.xml
diff --git a/hw/mcu/nxp/lpc13uxx/CMSIS_CORE_LPC13Uxx/src/system_LPC13Uxx.c b/hw/mcu/nxp/lpc13xx/CMSIS_CORE_LPC13Uxx/src/system_LPC13Uxx.c
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/CMSIS_CORE_LPC13Uxx/src/system_LPC13Uxx.c
rename to hw/mcu/nxp/lpc13xx/CMSIS_CORE_LPC13Uxx/src/system_LPC13Uxx.c
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/clkconfig.h b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/clkconfig.h
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/clkconfig.h
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/clkconfig.h
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/gpio.h b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/gpio.h
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/gpio.h
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/gpio.h
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/nmi.h b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/nmi.h
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/nmi.h
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/nmi.h
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/power_api.h b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/power_api.h
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/power_api.h
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/power_api.h
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/timer16.h b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/timer16.h
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/timer16.h
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/timer16.h
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/timer32.h b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/timer32.h
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/timer32.h
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/timer32.h
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/type.h b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/type.h
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/type.h
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/type.h
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/uart.h b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/uart.h
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/uart.h
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/uart.h
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/usart.h b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/usart.h
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/inc/usart.h
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/inc/usart.h
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/src/Serial.c b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/src/Serial.c
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/src/Serial.c
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/src/Serial.c
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/src/clkconfig.c b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/src/clkconfig.c
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/src/clkconfig.c
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/src/clkconfig.c
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/src/gpio.c b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/src/gpio.c
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/src/gpio.c
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/src/gpio.c
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/src/nmi.c b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/src/nmi.c
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/src/nmi.c
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/src/nmi.c
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/src/timer16.c b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/src/timer16.c
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/src/timer16.c
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/src/timer16.c
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/src/timer32.c b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/src/timer32.c
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/src/timer32.c
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/src/timer32.c
diff --git a/hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/src/uart.c b/hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/src/uart.c
similarity index 100%
rename from hw/mcu/nxp/lpc13uxx/LPC13Uxx_DriverLib/src/uart.c
rename to hw/mcu/nxp/lpc13xx/LPC13Uxx_DriverLib/src/uart.c