diff --git a/include/libopencm3/dispatch/nvic.h b/include/libopencm3/dispatch/nvic.h
index 6764aaf2..67ed85c3 100644
--- a/include/libopencm3/dispatch/nvic.h
+++ b/include/libopencm3/dispatch/nvic.h
@@ -20,8 +20,8 @@
 #	include <libopencm3/lpc13xx/nvic.h>
 #elif defined(LPC17XX)
 #	include <libopencm3/lpc17xx/nvic.h>
-#elif defined(LPC43XX)
-#	include <libopencm3/lpc43xx/nvic.h>
+#elif defined(LPC43XX_M4)
+#	include <libopencm3/lpc43xx/m4/nvic.h>
 
 #elif defined(SAM3X)
 #	include <libopencm3/sam/3x/nvic.h>
diff --git a/include/libopencm3/lpc43xx/irq.yaml b/include/libopencm3/lpc43xx/m4/irq.yaml
similarity index 89%
rename from include/libopencm3/lpc43xx/irq.yaml
rename to include/libopencm3/lpc43xx/m4/irq.yaml
index bc9536b0..32141733 100644
--- a/include/libopencm3/lpc43xx/irq.yaml
+++ b/include/libopencm3/lpc43xx/m4/irq.yaml
@@ -1,6 +1,6 @@
-includeguard: LIBOPENCM3_LPC43xx_NVIC_H
-partname_humanreadable: LPC 43xx series
-partname_doxygen: LPC43xx
+includeguard: LIBOPENCM3_LPC43xx_M4_NVIC_H
+partname_humanreadable: LPC 43xx series M4 core
+partname_doxygen: LPC43xx (M4)
 irqs:
   0: dac           
   1: m0core        
diff --git a/lib/dispatch/vector_chipset.c b/lib/dispatch/vector_chipset.c
index 796276c0..771000c2 100644
--- a/lib/dispatch/vector_chipset.c
+++ b/lib/dispatch/vector_chipset.c
@@ -1,8 +1,8 @@
 #if defined(STM32F4)
 #	include "../stm32/f4/vector_chipset.c"
 
-#elif defined(LPC43XX)
-#	include "../lpc43xx/vector_chipset.c"
+#elif defined(LPC43XX_M4)
+#	include "../lpc43xx/m4/vector_chipset.c"
 
 #else
 
diff --git a/lib/dispatch/vector_nvic.c b/lib/dispatch/vector_nvic.c
index 6d3dbb03..fcf6fae8 100644
--- a/lib/dispatch/vector_nvic.c
+++ b/lib/dispatch/vector_nvic.c
@@ -20,8 +20,8 @@
 #	include "../lpc13xx/vector_nvic.c"
 #elif defined(LPC17XX)
 #	include "../lpc17xx/vector_nvic.c"
-#elif defined(LPC43XX)
-#	include "../lpc43xx/vector_nvic.c"
+#elif defined(LPC43XX_M4)
+#	include "../lpc43xx/m4/vector_nvic.c"
 
 #elif defined(SAM3X)
 #	include "../sam/3x/vector_nvic.c"
diff --git a/lib/lpc43xx/m4/Makefile b/lib/lpc43xx/m4/Makefile
index c396d67a..75dbea34 100644
--- a/lib/lpc43xx/m4/Makefile
+++ b/lib/lpc43xx/m4/Makefile
@@ -32,7 +32,7 @@ CFLAGS		= -O2 -g3 \
 		  -I../../../include -fno-common \
 		  -mcpu=cortex-m4 -mthumb -Wstrict-prototypes \
 		  -ffunction-sections -fdata-sections -MD \
-		  -mfloat-abi=hard -mfpu=fpv4-sp-d16 -DLPC43XX
+		  -mfloat-abi=hard -mfpu=fpv4-sp-d16 -DLPC43XX -DLPC43XX_M4
 # ARFLAGS	= rcsv
 ARFLAGS		= rcs
 
diff --git a/lib/lpc43xx/vector_chipset.c b/lib/lpc43xx/m4/vector_chipset.c
similarity index 100%
rename from lib/lpc43xx/vector_chipset.c
rename to lib/lpc43xx/m4/vector_chipset.c