diff --git a/src/materials/mappings/CubeReflectionMapping.js b/src/materials/mappings/CubeReflectionMapping.js
new file mode 100644
index 00000000..19485cc3
--- /dev/null
+++ b/src/materials/mappings/CubeReflectionMapping.js
@@ -0,0 +1,9 @@
+/**
+ * @author mr.doob / http://mrdoob.com/
+ */
+ 
+THREE.CubeReflectionMapping = function () {
+
+	
+
+}
diff --git a/src/materials/mappings/CubeRefractionMapping.js b/src/materials/mappings/CubeRefractionMapping.js
new file mode 100644
index 00000000..2ce88d12
--- /dev/null
+++ b/src/materials/mappings/CubeRefractionMapping.js
@@ -0,0 +1,9 @@
+/**
+ * @author mr.doob / http://mrdoob.com/
+ */
+ 
+THREE.CubeRefractionMapping = function () {
+
+	
+
+}
diff --git a/src/materials/mappings/LatitudeReflectionMapping.js b/src/materials/mappings/LatitudeReflectionMapping.js
new file mode 100644
index 00000000..aeb7a0ee
--- /dev/null
+++ b/src/materials/mappings/LatitudeReflectionMapping.js
@@ -0,0 +1,9 @@
+/**
+ * @author mr.doob / http://mrdoob.com/
+ */
+ 
+THREE.LatitudeReflectionMapping = function () {
+
+	
+
+}
diff --git a/src/materials/mappings/LatitudeRefractionMapping.js b/src/materials/mappings/LatitudeRefractionMapping.js
new file mode 100644
index 00000000..ef3826d9
--- /dev/null
+++ b/src/materials/mappings/LatitudeRefractionMapping.js
@@ -0,0 +1,9 @@
+/**
+ * @author mr.doob / http://mrdoob.com/
+ */
+ 
+THREE.LatitudeRefractionMapping = function () {
+
+	
+
+}
diff --git a/src/materials/mappings/SphericalReflectionMapping.js b/src/materials/mappings/SphericalReflectionMapping.js
new file mode 100644
index 00000000..7213b339
--- /dev/null
+++ b/src/materials/mappings/SphericalReflectionMapping.js
@@ -0,0 +1,9 @@
+/**
+ * @author mr.doob / http://mrdoob.com/
+ */
+ 
+THREE.SphericalReflectionMapping = function () {
+
+	
+
+}
diff --git a/src/materials/mappings/SphericalRefractionMapping.js b/src/materials/mappings/SphericalRefractionMapping.js
new file mode 100644
index 00000000..67369998
--- /dev/null
+++ b/src/materials/mappings/SphericalRefractionMapping.js
@@ -0,0 +1,9 @@
+/**
+ * @author mr.doob / http://mrdoob.com/
+ */
+ 
+THREE.SphericalRefractionMapping = function () {
+
+	
+
+}
diff --git a/src/materials/mappings/UVMapping.js b/src/materials/mappings/UVMapping.js
new file mode 100644
index 00000000..4adc258b
--- /dev/null
+++ b/src/materials/mappings/UVMapping.js
@@ -0,0 +1,9 @@
+/**
+ * @author mr.doob / http://mrdoob.com/
+ */
+ 
+THREE.UVMapping = function () {
+
+	
+
+}
diff --git a/src/materials/textures/Texture.js b/src/materials/textures/Texture.js
index e22ee0c9..8316578b 100644
--- a/src/materials/textures/Texture.js
+++ b/src/materials/textures/Texture.js
@@ -1,15 +1,13 @@
 /**
  * @author mr.doob / http://mrdoob.com/
  * @author alteredq / http://alteredqualia.com/
- * }
  */
 
 THREE.Texture = function ( image, mapping, wrap_s, wrap_t ) {
 
 	this.image = image;
-	this.loaded = false;
 
-	this.mapping = mapping !== undefined ? mapping : THREE.UVMapping;
+	this.mapping = mapping !== undefined ? mapping : new THREE.UVMapping();
 
 	this.wrap_s = wrap_s !== undefined ? wrap_s : THREE.ClampToEdge;
 	this.wrap_t = wrap_t !== undefined ? wrap_t : THREE.ClampToEdge;
@@ -26,13 +24,9 @@ THREE.Texture = function ( image, mapping, wrap_s, wrap_t ) {
 
 };
 
-THREE.UVMapping = 0;
-THREE.ReflectionMapping = 1;
-THREE.RefractionMapping = 2;
+THREE.MultiplyOperation = 0;
+THREE.MixOperation = 1;
 
-THREE.Multiply = 0;
-THREE.Mix = 1;
-
-THREE.Repeat = 0; // TODO: Rename to *Wrapping
-THREE.ClampToEdge = 1;
-THREE.MirroredRepeat = 2;
+THREE.RepeatWrapping = 0;
+THREE.ClampToEdgeWrapping = 1;
+THREE.MirroredRepeatWrapping = 2;