diff --git a/Effects/ambient.eff b/Effects/ambient.eff
index 2c45a8d2a..4ead836b6 100644
--- a/Effects/ambient.eff
+++ b/Effects/ambient.eff
@@ -13,19 +13,23 @@
 			</render-bin>
 			<texture-unit>
 				<unit>0</unit>
-				<type>depth-buffer</type>
+				<type>buffer</type>
+				<name>depth</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>1</unit>
-				<type>normal-buffer</type>
+				<type>buffer</type>
+				<name>normal</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>2</unit>
-				<type>diffuse-buffer</type>
+				<type>buffer</type>
+				<name>diffuse</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>3</unit>
-				<type>spec-emis-buffer</type>
+				<type>buffer</type>
+				<name>spec-emis</name>
 			</texture-unit>
 			<program>
 				<vertex-shader>Shaders/ambient.vert</vertex-shader>
diff --git a/Effects/display.eff b/Effects/display.eff
index d403eb68e..e9a751ad2 100644
--- a/Effects/display.eff
+++ b/Effects/display.eff
@@ -13,23 +13,28 @@
 			</render-bin>
 			<texture-unit>
 				<unit>0</unit>
-				<type>depth-buffer</type>
+				<type>buffer</type>
+				<name>depth</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>1</unit>
-				<type>normal-buffer</type>
+				<type>buffer</type>
+				<name>normal</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>2</unit>
-				<type>diffuse-buffer</type>
+				<type>buffer</type>
+				<name>diffuse</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>3</unit>
-				<type>spec-emis-buffer</type>
+				<type>buffer</type>
+				<name>spec-emis</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>4</unit>
-				<type>lighting-buffer</type>
+				<type>buffer</type>
+				<name>lighting</name>
 			</texture-unit>
 			<program>
 				<vertex-shader>Shaders/display.vert</vertex-shader>
diff --git a/Effects/fog.eff b/Effects/fog.eff
index 1092fc908..7008ef933 100644
--- a/Effects/fog.eff
+++ b/Effects/fog.eff
@@ -17,19 +17,23 @@
 			</render-bin>
 			<texture-unit>
 				<unit>0</unit>
-				<type>depth-buffer</type>
+				<type>buffer</type>
+				<name>depth</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>1</unit>
-				<type>normal-buffer</type>
+				<type>buffer</type>
+				<name>normal</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>2</unit>
-				<type>diffuse-buffer</type>
+				<type>buffer</type>
+				<name>diffuse</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>3</unit>
-				<type>spec-emis-buffer</type>
+				<type>buffer</type>
+				<name>spec-emis</name>
 			</texture-unit>
 			<program>
 				<vertex-shader>Shaders/fog.vert</vertex-shader>
diff --git a/Effects/light-point.eff b/Effects/light-point.eff
index ae20e6d56..3d1f74814 100644
--- a/Effects/light-point.eff
+++ b/Effects/light-point.eff
@@ -19,19 +19,23 @@
 			</blend>
 			<texture-unit>
 				<unit>0</unit>
-				<type>depth-buffer</type>
+				<type>buffer</type>
+				<name>depth</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>1</unit>
-				<type>normal-buffer</type>
+				<type>buffer</type>
+				<name>normal</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>2</unit>
-				<type>diffuse-buffer</type>
+				<type>buffer</type>
+				<name>diffuse</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>3</unit>
-				<type>spec-emis-buffer</type>
+				<type>buffer</type>
+				<name>spec-emis</name>
 			</texture-unit>
 			<program>
 				<vertex-shader>Shaders/light-spot.vert</vertex-shader>
diff --git a/Effects/light-spot.eff b/Effects/light-spot.eff
index 6585e9aee..2b8630e52 100644
--- a/Effects/light-spot.eff
+++ b/Effects/light-spot.eff
@@ -19,19 +19,23 @@
 			</blend>
 			<texture-unit>
 				<unit>0</unit>
-				<type>depth-buffer</type>
+				<type>buffer</type>
+				<name>depth</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>1</unit>
-				<type>normal-buffer</type>
+				<type>buffer</type>
+				<name>normal</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>2</unit>
-				<type>diffuse-buffer</type>
+				<type>buffer</type>
+				<name>diffuse</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>3</unit>
-				<type>spec-emis-buffer</type>
+				<type>buffer</type>
+				<name>spec-emis</name>
 			</texture-unit>
 			<program>
 				<vertex-shader>Shaders/light-spot.vert</vertex-shader>
diff --git a/Effects/sunlight.eff b/Effects/sunlight.eff
index 1717de1ce..beefa4cb8 100644
--- a/Effects/sunlight.eff
+++ b/Effects/sunlight.eff
@@ -41,23 +41,28 @@
 			</render-bin>
 			<texture-unit>
 				<unit>0</unit>
-				<type>depth-buffer</type>
+				<type>buffer</type>
+				<name>depth</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>1</unit>
-				<type>normal-buffer</type>
+				<type>buffer</type>
+				<name>normal</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>2</unit>
-				<type>diffuse-buffer</type>
+				<type>buffer</type>
+				<name>diffuse</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>3</unit>
-				<type>spec-emis-buffer</type>
+				<type>buffer</type>
+				<name>spec-emis</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>4</unit>
-				<type>shadow-buffer</type>
+				<type>buffer</type>
+				<name>shadow</name>
 			</texture-unit>
 			<program>
 				<vertex-shader>Shaders/sunlight.vert</vertex-shader>
@@ -298,19 +303,23 @@
 			</render-bin>
 			<texture-unit>
 				<unit>0</unit>
-				<type>depth-buffer</type>
+				<type>buffer</type>
+				<name>depth</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>1</unit>
-				<type>normal-buffer</type>
+				<type>buffer</type>
+				<name>normal</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>2</unit>
-				<type>diffuse-buffer</type>
+				<type>buffer</type>
+				<name>diffuse</name>
 			</texture-unit>
 			<texture-unit>
 				<unit>3</unit>
-				<type>spec-emis-buffer</type>
+				<type>buffer</type>
+				<name>spec-emis</name>
 			</texture-unit>
 			<program>
 				<vertex-shader>Shaders/sunlight.vert</vertex-shader>