diff --git a/BuildTests/ModuleTest/makefile.avr8 b/BuildTests/ModuleTest/makefile.avr8
index 167564d240..360b1ee8bf 100644
--- a/BuildTests/ModuleTest/makefile.avr8
+++ b/BuildTests/ModuleTest/makefile.avr8
@@ -131,7 +131,9 @@ include $(LUFA_PATH)/LUFA/makefile
 SRC = Test_C.c                   \
       $(LUFA_SRC_USB)            \
       $(LUFA_SRC_USBCLASS)       \
-      $(LUFA_SRC_SERIAL)
+      $(LUFA_SRC_TEMPERATURE)    \
+      $(LUFA_SRC_SERIAL)         \
+      $(LUFA_SRC_TWI)            \
 
 
 
diff --git a/LUFA/CodeTemplates/LUFAConfig.h b/LUFA/CodeTemplates/LUFAConfig.h
index f7d1509cff..35e8f65865 100644
--- a/LUFA/CodeTemplates/LUFAConfig.h
+++ b/LUFA/CodeTemplates/LUFAConfig.h
@@ -75,7 +75,7 @@
 //		#define NO_INTERNAL_SERIAL
 //		#define FIXED_CONTROL_ENDPOINT_SIZE      {Insert Value Here}
 //		#define DEVICE_STATE_AS_GPIOR            {Insert Value Here}
-//		#define FIXED_NUM_CONFIGURATION          {Insert Value Here}
+//		#define FIXED_NUM_CONFIGURATIONS         {Insert Value Here}
 //		#define CONTROL_ONLY_DEVICE
 //		#define INTERRUPT_CONTROL_ENDPOINT
 //		#define NO_DEVICE_REMOTE_WAKEUP
@@ -115,7 +115,7 @@
 //		#define NO_INTERNAL_SERIAL
 //		#define FIXED_CONTROL_ENDPOINT_SIZE      {Insert Value Here}
 //		#define DEVICE_STATE_AS_GPIOR            {Insert Value Here}
-//		#define FIXED_NUM_CONFIGURATION          {Insert Value Here}
+//		#define FIXED_NUM_CONFIGURATIONS         {Insert Value Here}
 //		#define CONTROL_ONLY_DEVICE
 //		#define NO_DEVICE_REMOTE_WAKEUP
 //		#define NO_DEVICE_SELF_POWER
@@ -145,7 +145,7 @@
 		/* USB Device Mode Driver Related Tokens: */
 //		#define NO_INTERNAL_SERIAL
 //		#define FIXED_CONTROL_ENDPOINT_SIZE      {Insert Value Here}
-//		#define FIXED_NUM_CONFIGURATION          {Insert Value Here}
+//		#define FIXED_NUM_CONFIGURATIONS         {Insert Value Here}
 //		#define CONTROL_ONLY_DEVICE
 //		#define INTERRUPT_CONTROL_ENDPOINT
 //		#define NO_DEVICE_REMOTE_WAKEUP