diff --git a/examples/webgl_tonemapping.html b/examples/webgl_tonemapping.html
index c73f9958951473426b2f9235178c9e7f53f966f6..73b6e1cb80cdc152f9a4290a79e64b9d148dc17c 100644
--- a/examples/webgl_tonemapping.html
+++ b/examples/webgl_tonemapping.html
@@ -74,7 +74,7 @@
 				Reinhard: THREE.ReinhardToneMapping,
 				Uncharted2: THREE.Uncharted2ToneMapping,
 				Cineon: THREE.CineonToneMapping,
-				ACESFilm: THREE.ACESFilmToneMapping
+				ACESFilm: THREE.ACESFilmicToneMapping
 			};
 
 			var camera, scene, renderer, group;
diff --git a/src/constants.js b/src/constants.js
index 483209693ea961500e0b6c5790ddf71fb0c81404..5a68b3d0085b90f2665a0379665f40095b1b9d5a 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -55,7 +55,7 @@ export var LinearToneMapping = 1;
 export var ReinhardToneMapping = 2;
 export var Uncharted2ToneMapping = 3;
 export var CineonToneMapping = 4;
-export var ACESFilmToneMapping = 5;
+export var ACESFilmicToneMapping = 5;
 export var UVMapping = 300;
 export var CubeReflectionMapping = 301;
 export var CubeRefractionMapping = 302;
diff --git a/src/renderers/shaders/ShaderChunk/tonemapping_pars_fragment.glsl b/src/renderers/shaders/ShaderChunk/tonemapping_pars_fragment.glsl
index 51c46a9facfa1c211a72bd396170daa674415444..ca6a98672d9ed84b080fa9ec3fc0c2f236dcfc8a 100644
--- a/src/renderers/shaders/ShaderChunk/tonemapping_pars_fragment.glsl
+++ b/src/renderers/shaders/ShaderChunk/tonemapping_pars_fragment.glsl
@@ -41,7 +41,7 @@ vec3 OptimizedCineonToneMapping( vec3 color ) {
 }
 
 // source: https://knarkowicz.wordpress.com/2016/01/06/aces-filmic-tone-mapping-curve/
-vec3 ACESFilmToneMapping( vec3 color ) {
+vec3 ACESFilmicToneMapping( vec3 color ) {
 
 	color *= toneMappingExposure;
 	return saturate( ( color * ( 2.51 * color + 0.03 ) ) / ( color * ( 2.43 * color + 0.59 ) + 0.14 ) );
diff --git a/src/renderers/webgl/WebGLProgram.js b/src/renderers/webgl/WebGLProgram.js
index 9ee8663689f0442e4c3697b9df1f7db2f3ec4f6c..846b1e86ddfbe5b47d4ba8834831533dcf123a74 100644
--- a/src/renderers/webgl/WebGLProgram.js
+++ b/src/renderers/webgl/WebGLProgram.js
@@ -5,7 +5,7 @@
 import { WebGLUniforms } from './WebGLUniforms.js';
 import { WebGLShader } from './WebGLShader.js';
 import { ShaderChunk } from '../shaders/ShaderChunk.js';
-import { NoToneMapping, AddOperation, MixOperation, MultiplyOperation, EquirectangularRefractionMapping, CubeRefractionMapping, SphericalReflectionMapping, EquirectangularReflectionMapping, CubeUVRefractionMapping, CubeUVReflectionMapping, CubeReflectionMapping, PCFSoftShadowMap, PCFShadowMap, ACESFilmToneMapping, CineonToneMapping, Uncharted2ToneMapping, ReinhardToneMapping, LinearToneMapping, GammaEncoding, RGBDEncoding, RGBM16Encoding, RGBM7Encoding, RGBEEncoding, sRGBEncoding, LinearEncoding } from '../../constants.js';
+import { NoToneMapping, AddOperation, MixOperation, MultiplyOperation, EquirectangularRefractionMapping, CubeRefractionMapping, SphericalReflectionMapping, EquirectangularReflectionMapping, CubeUVRefractionMapping, CubeUVReflectionMapping, CubeReflectionMapping, PCFSoftShadowMap, PCFShadowMap, ACESFilmicToneMapping, CineonToneMapping, Uncharted2ToneMapping, ReinhardToneMapping, LinearToneMapping, GammaEncoding, RGBDEncoding, RGBM16Encoding, RGBM7Encoding, RGBEEncoding, sRGBEncoding, LinearEncoding } from '../../constants.js';
 
 var programIdCount = 0;
 
@@ -70,8 +70,8 @@ function getToneMappingFunction( functionName, toneMapping ) {
 			toneMappingName = 'OptimizedCineon';
 			break;
 
-		case ACESFilmToneMapping:
-			toneMappingName = 'ACESFilm';
+		case ACESFilmicToneMapping:
+			toneMappingName = 'ACESFilmic';
 			break;
 
 		default: