diff --git a/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt b/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt
index 8cb4ea9a8d..f50f8a4ddb 100644
--- a/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt
+++ b/LUFA/StudioIntegration/XSLT/lufa_extension_transform.xslt
@@ -22,11 +22,11 @@
 	<xsl:template match="lufa-manifest">
 		<xsl:comment>This file has been automatically generated from the LUFA Atmel Studio integration XML files.</xsl:comment>
 
-		<fdk xml-version="2.0">
+		<extension-container xmlversion="2.0">
 			<xsl:for-each select="xml-source">
-				<xsl:apply-templates select="document(@filename)/lufa/fdk/*"/>
+				<xsl:apply-templates select="document(@filename)/lufa/extension-container/*"/>
 			</xsl:for-each>
-		</fdk>
+		</extension-container>
 	</xsl:template>
 
 	<!-- Recursively match and copy/process all nodes/attributes -->
diff --git a/LUFA/StudioIntegration/lufa.xml b/LUFA/StudioIntegration/lufa.xml
index 5f491f5995..d9570f55d7 100644
--- a/LUFA/StudioIntegration/lufa.xml
+++ b/LUFA/StudioIntegration/lufa.xml
@@ -9,7 +9,7 @@
 <!-- Atmel Studio framework integration file -->
 
 <lufa>
-	<fdk>
+	<extension-container>
 		<extension uuid="0e160d5c-e331-48d9-850b-e0387912171b" org="FourWalledCubicle" shortname="LUFA" version="" fullname="Lightweight USB Framework for AVRs (LUFA)">
 			<author name="Dean Camera" website="http://www.lufa-lib.org/" email="dean@fourwalledcubicle.com"/>
 			<description>Lightweight USB Framework for AVRs (LUFA), a USB software stack/framework.</description>
@@ -24,7 +24,7 @@
 			</online-help>
 			<dependencies/>
 		</extension>
-	</fdk>
+	</extension-container>
 
 	<asf>
 		<device-alias-map name="lufa_avr8">
diff --git a/LUFA/StudioIntegration/lufa_drivers_peripheral.xml b/LUFA/StudioIntegration/lufa_drivers_peripheral.xml
index 44398d498f..57eb827e73 100644
--- a/LUFA/StudioIntegration/lufa_drivers_peripheral.xml
+++ b/LUFA/StudioIntegration/lufa_drivers_peripheral.xml
@@ -19,7 +19,7 @@
 				<require idref="lufa.common"/>
 				<require idref="lufa.drivers.misc.ansi"/>
 
-				<build type="c-source"    value="Drivers/Peripheral/AVR8/Serial_AVR8.c"/>
+				<build type="c-source" value="Drivers/Peripheral/AVR8/Serial_AVR8.c"/>
 				<build type="header-file" value="Drivers/Peripheral/AVR8/Serial_AVR8.h"/>
 				<build type="include-path" value=".."/>
 				<build type="header-file" subtype="api" value="Drivers/Peripheral/Serial.h"/>
@@ -33,7 +33,7 @@
 				<require idref="lufa.common"/>
 				<require idref="lufa.drivers.misc.ansi"/>
 
-				<build type="c-source"    value="Drivers/Peripheral/XMEGA/Serial_XMEGA.c"/>
+				<build type="c-source" value="Drivers/Peripheral/XMEGA/Serial_XMEGA.c"/>
 				<build type="header-file" value="Drivers/Peripheral/XMEGA/Serial_XMEGA.h"/>
 				<build type="include-path" value=".."/>
 				<build type="header-file" subtype="api" value="Drivers/Peripheral/Serial.h"/>
@@ -131,7 +131,7 @@
 
 				<require idref="lufa.common"/>
 
-				<build type="c-source"    value="Drivers/Peripheral/AVR8/TWI_AVR8.c"/>
+				<build type="c-source" value="Drivers/Peripheral/AVR8/TWI_AVR8.c"/>
 				<build type="header-file" value="Drivers/Peripheral/AVR8/TWI_AVR8.h"/>
 				<build type="include-path" value=".."/>
 				<build type="header-file" subtype="api" value="Drivers/Peripheral/TWI.h"/>