diff --git a/docs/examples/loaders/GLTF2Loader.html b/docs/examples/loaders/GLTFLoader.html
similarity index 95%
rename from docs/examples/loaders/GLTF2Loader.html
rename to docs/examples/loaders/GLTFLoader.html
index 4a9af9ceb07c2dfb5ed977fd21450d803c31352e..9629881573f0b9f1a9e2c6513fd9de9a56cbc687 100644
--- a/docs/examples/loaders/GLTF2Loader.html
+++ b/docs/examples/loaders/GLTFLoader.html
@@ -25,7 +25,7 @@
 		<h2>Extensions</h2>
 
 		<div>
-		GLTF2Loader supports the following glTF extensions:
+		GLTFLoader supports the following glTF extensions:
 		</div>
 
 		<ul>
@@ -49,7 +49,7 @@
 
 		<code>
 		// Instantiate a loader
-		var loader = new THREE.GLTF2Loader();
+		var loader = new THREE.GLTFLoader();
 
 		// Load a glTF resource
 		loader.load( 'models/gltf/duck/duck.gltf', function ( gltf ) {
@@ -62,7 +62,7 @@
 		} );
 		</code>
 
-		[example:webgl_loader_gltf2]
+		[example:webgl_loader_gltf]
 
 		<h2>Constructor</h2>
 
@@ -115,6 +115,6 @@
 
 		<h2>Source</h2>
 
-		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/GLTF2Loader.js examples/js/loaders/GLTF2Loader.js]
+		[link:https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/GLTFLoader.js examples/js/loaders/GLTFLoader.js]
 	</body>
 </html>
diff --git a/docs/list.js b/docs/list.js
index b4d16c5d37c7e875b61ce38a3b93b3e9689c92ea..11d4393883ff6c1d56d589e2cc37508b2ab6efc2 100644
--- a/docs/list.js
+++ b/docs/list.js
@@ -341,7 +341,7 @@ var list = {
 		"Loaders": {
 			"BabylonLoader": "examples/loaders/BabylonLoader",
 			"ColladaLoader": "examples/loaders/ColladaLoader",
-			"GLTF2Loader": "examples/loaders/GLTF2Loader",
+			"GLTFLoader": "examples/loaders/GLTFLoader",
 			"MTLLoader": "examples/loaders/MTLLoader",
 			"OBJLoader": "examples/loaders/OBJLoader",
 			"OBJLoader2": "examples/loaders/OBJLoader2",
diff --git a/docs/manual/introduction/Animation-system.html b/docs/manual/introduction/Animation-system.html
index ee6fa1b1466214522dbc2a80acf37ae42d57cbca..9bc0baabf6bee2283550b8b867c32648573d1a7d 100644
--- a/docs/manual/introduction/Animation-system.html
+++ b/docs/manual/introduction/Animation-system.html
@@ -111,7 +111,7 @@
 				<li>[page:ObjectLoader THREE.ObjectLoader]</li>
 				<li>THREE.BVHLoader</li>
 				<li>THREE.FBXLoader</li>
-				<li>[page:GLTF2Loader THREE.GLTF2Loader]</li>
+				<li>[page:GLTFLoader THREE.GLTFLoader]</li>
 				<li>THREE.MMDLoader</li>
 				<li>THREE.SEA3DLoader</li>
 			</ul>
diff --git a/editor/index.html b/editor/index.html
index 782fa084a62abef144f451c67c44090c264cc55b..a4f60529b37cbe8f8213ed5ed018e950d631d01b 100644
--- a/editor/index.html
+++ b/editor/index.html
@@ -23,7 +23,7 @@
 		<script src="../examples/js/loaders/BabylonLoader.js"></script>
 		<script src="../examples/js/loaders/ColladaLoader2.js"></script>
 		<script src="../examples/js/loaders/FBXLoader.js"></script>
-		<script src="../examples/js/loaders/GLTF2Loader.js"></script>
+		<script src="../examples/js/loaders/GLTFLoader.js"></script>
 		<script src="../examples/js/loaders/KMZLoader.js"></script>
 		<script src="../examples/js/loaders/MD2Loader.js"></script>
 		<script src="../examples/js/loaders/OBJLoader.js"></script>
diff --git a/editor/js/Loader.js b/editor/js/Loader.js
index 3219e0ace1f748d30157fc26afb7492c1e7ddb7a..3be687970b023db755fb9d1170f170c0222c5f3a 100644
--- a/editor/js/Loader.js
+++ b/editor/js/Loader.js
@@ -176,7 +176,7 @@ var Loader = function ( editor ) {
 
 					var contents = event.target.result;
 
-					var loader = new THREE.GLTF2Loader();
+					var loader = new THREE.GLTFLoader();
 					loader.parse( contents, '', function ( result ) {
 
 						result.scene.name = filename;
diff --git a/examples/files.js b/examples/files.js
index c5e3317a6c0a986f79e3fdfbbd13209354a6eeea..38a2d23edf7071cd759da26ac0ba8801553daa4b 100644
--- a/examples/files.js
+++ b/examples/files.js
@@ -18,7 +18,7 @@ var files = {
 		"webgl_effects_parallaxbarrier",
 		"webgl_effects_peppersghost",
 		"webgl_effects_stereo",
-		"webgl_exporter_gltf2",
+		"webgl_exporter_gltf",
 		"webgl_exporter_obj",
 		"webgl_geometries",
 		"webgl_geometries2",
@@ -92,7 +92,7 @@ var files = {
 		"webgl_loader_ctm_materials",
 		"webgl_loader_draco",
 		"webgl_loader_fbx",
-		"webgl_loader_gltf2",
+		"webgl_loader_gltf",
 		"webgl_loader_imagebitmap",
 		"webgl_loader_json_blender",
 		"webgl_loader_json_claraio",
diff --git a/examples/js/exporters/GLTFExporter.js b/examples/js/exporters/GLTFExporter.js
index 9f92f2f4dd0b0881fd4a271043697816e78df387..8d80f7c0bd073dd21e9f9946af06069cb1f52ff5 100644
--- a/examples/js/exporters/GLTFExporter.js
+++ b/examples/js/exporters/GLTFExporter.js
@@ -233,7 +233,7 @@ THREE.GLTFExporter.prototype = {
 
 			} else {
 
-				throw new Error( 'THREE.GLTF2Exporter: Unsupported bufferAttribute component type.' );
+				throw new Error( 'THREE.GLTFExporter: Unsupported bufferAttribute component type.' );
 
 			}
 
diff --git a/examples/js/loaders/GLTF2Loader.js b/examples/js/loaders/GLTFLoader.js
similarity index 100%
rename from examples/js/loaders/GLTF2Loader.js
rename to examples/js/loaders/GLTFLoader.js
diff --git a/examples/webgl_exporter_gltf2.html b/examples/webgl_exporter_gltf.html
similarity index 99%
rename from examples/webgl_exporter_gltf2.html
rename to examples/webgl_exporter_gltf.html
index e69c65c9fbdd6bf159e90bf41a54d6f6223962b8..3b600796547ab8becdca740fe7888cbe843b282c 100644
--- a/examples/webgl_exporter_gltf2.html
+++ b/examples/webgl_exporter_gltf.html
@@ -22,7 +22,7 @@
 	</head>
 	<body>
 		<div id="info">
-			GLTF2 Exporter<br/>
+			GLTF Exporter<br/>
 			<button id="export_scene">Export Scene1</button>
 			<button id="export_scenes">Export Scene1 and Scene 2</button>
 			<button id="export_object">Export Sphere</button>
diff --git a/examples/webgl_loader_gltf2.html b/examples/webgl_loader_gltf2.html
index 3a15be1d8b4ada4ddee55ef57ceb44947ae1006d..7e85e7528993b2bd957f63b7b0b357d39141c0ff 100644
--- a/examples/webgl_loader_gltf2.html
+++ b/examples/webgl_loader_gltf2.html
@@ -96,7 +96,7 @@
 	</div>
 		<script src="../build/three.js"></script>
 		<script src="js/controls/OrbitControls.js"></script>
-		<script src="js/loaders/GLTF2Loader.js"></script>
+		<script src="js/loaders/GLTFLoader.js"></script>
 
 		<script>
 			var orbitControls = null;
@@ -202,7 +202,7 @@
 					scene.add(ground);
 				}
 
-				loader = new THREE.GLTF2Loader();
+				loader = new THREE.GLTFLoader();
 
 				for (var i = 0; i < extensionSelect.children.length; i++) {
 					var child = extensionSelect.children[i];