diff --git a/LUFA/StudioIntegration/lufa_drivers_board_names.xml b/LUFA/StudioIntegration/lufa_drivers_board_names.xml
index 13d9439e11..0236222f07 100644
--- a/LUFA/StudioIntegration/lufa_drivers_board_names.xml
+++ b/LUFA/StudioIntegration/lufa_drivers_board_names.xml
@@ -86,7 +86,7 @@
 				<device-support value="atmega32u2"/>
 				<build type="define" name="BOARD" value="BOARD_DUCE"/>
 
-				<build type="header-file" value="Drivers/Board/AVR8/CULV3/LEDs.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/DUCE/LEDs.h"/>
 			</module>
 
 			<module type="driver" id="lufa.drivers.board#evk527" caption="EVK527">
@@ -106,8 +106,8 @@
 				<device-support value="atmega32u2"/>
 				<build type="define" name="BOARD" value="BOARD_JMDBU2"/>
 
-				<build type="header-file" value="Drivers/Board/AVR8/EVK527/Buttons.h"/>
-				<build type="header-file" value="Drivers/Board/AVR8/EVK527/LEDs.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/JMDBU2/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/JMDBU2/LEDs.h"/>
 			</module>
 
 			<module type="driver" id="lufa.drivers.board#leonardo" caption="LEONARDO">
@@ -233,8 +233,8 @@
 				<device-support value="at90usb162"/>
 				<build type="define" name="BOARD" value="BOARD_OLIMEXISPMK2"/>
 
-				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX32U4/LEDs.h"/>
-				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX32U4/Buttons.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXISPMK2/LEDs.h"/>
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXISPMK2/Buttons.h"/>
 			</module>
 
 			<module type="driver" id="lufa.drivers.board#olimex_t32u4" caption="OLIMEX_T32U4">
diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index feec88a886..49f3c35e37 100644
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -73,6 +73,7 @@ check_filenames: $(TEMP_MANIFEST_XML)
 	@for i in `xsltproc XSLT/lufa_filelist_transform.xslt $< | grep -v "^<" | sed -e "/^$$/d"`; do \
 		if ( ! test -f "$(LUFA_ROOT)/$$i" ); then \
 			echo "Source file $$i does not exist!"; \
+			exit 1; \
 		fi; \
 	done;