diff --git a/LUFA/Drivers/Peripheral/ADC.h b/LUFA/Drivers/Peripheral/ADC.h
index 982364368f..ef708b4efb 100644
--- a/LUFA/Drivers/Peripheral/ADC.h
+++ b/LUFA/Drivers/Peripheral/ADC.h
@@ -62,7 +62,7 @@
 		     defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \
 			 defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || \
 			 defined(__AVR_ATmega32U6__))
-			#include "AVRU4U6U7/ADC.h"
+			#include "AVR8/ADC.h"
 		#else
 			#error "ADC is not available for the currently selected AVR model."
 		#endif
diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h b/LUFA/Drivers/Peripheral/AVR8/ADC.h
similarity index 100%
rename from LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h
rename to LUFA/Drivers/Peripheral/AVR8/ADC.h
diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/SPI.h b/LUFA/Drivers/Peripheral/AVR8/SPI.h
similarity index 100%
rename from LUFA/Drivers/Peripheral/AVRU4U6U7/SPI.h
rename to LUFA/Drivers/Peripheral/AVR8/SPI.h
diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/Serial.h b/LUFA/Drivers/Peripheral/AVR8/Serial.h
similarity index 100%
rename from LUFA/Drivers/Peripheral/AVRU4U6U7/Serial.h
rename to LUFA/Drivers/Peripheral/AVR8/Serial.h
diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h b/LUFA/Drivers/Peripheral/AVR8/TWI.h
similarity index 100%
rename from LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.h
rename to LUFA/Drivers/Peripheral/AVR8/TWI.h
diff --git a/LUFA/Drivers/Peripheral/SPI.h b/LUFA/Drivers/Peripheral/SPI.h
index cd2b423aec..aac3d95561 100644
--- a/LUFA/Drivers/Peripheral/SPI.h
+++ b/LUFA/Drivers/Peripheral/SPI.h
@@ -62,7 +62,7 @@
 		#if defined(__AVR32__)
 			#include "AVR32/SPI.h"
 		#else
-			#include "AVRU4U6U7/SPI.h"		
+			#include "AVR8/SPI.h"		
 		#endif
 		
 #endif
diff --git a/LUFA/Drivers/Peripheral/Serial.h b/LUFA/Drivers/Peripheral/Serial.h
index 51600f48c6..a2e06fa853 100644
--- a/LUFA/Drivers/Peripheral/Serial.h
+++ b/LUFA/Drivers/Peripheral/Serial.h
@@ -63,7 +63,7 @@
 		#if defined(__AVR32__)
 			#include "AVR32/Serial.h"
 		#else
-			#include "AVRU4U6U7/Serial.h"		
+			#include "AVR8/Serial.h"		
 		#endif
 		
 		#include "../../Common/Common.h"
diff --git a/LUFA/Drivers/Peripheral/TWI.h b/LUFA/Drivers/Peripheral/TWI.h
index 29c0afe408..fbb95e4649 100644
--- a/LUFA/Drivers/Peripheral/TWI.h
+++ b/LUFA/Drivers/Peripheral/TWI.h
@@ -61,7 +61,7 @@
 		     defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB647__) || \
 			 defined(__AVR_ATmega16U4__)  || defined(__AVR_ATmega32U4__) || \
 			 defined(__AVR_ATmega32U6__))
-			#include "AVRU4U6U7/TWI.h"
+			#include "AVR8/TWI.h"
 		#else
 			#error "TWI is not available for the currently selected AVR model."
 		#endif