diff --git a/index.js b/index.js
index 878f950e..d96988bc 100644
--- a/index.js
+++ b/index.js
@@ -279,10 +279,10 @@ class HtmlWebpackPlugin {
               return self.options.showErrors ? prettyError(err, compiler.context).toHtml() : 'ERROR';
             })
             .then(html => {
-              // Allow to use [contenthash] as placeholder for the html-webpack-plugin name
+              // Allow to use [templatehash] as placeholder for the html-webpack-plugin name
               // See also https://survivejs.com/webpack/optimizing/adding-hashes-to-filenames/
               // From https://github.com/webpack-contrib/extract-text-webpack-plugin/blob/8de6558e33487e7606e7cd7cb2adc2cccafef272/src/index.js#L212-L214
-              const finalOutputName = childCompilationOutputName.replace(/\[(?:(\w+):)?contenthash(?::([a-z]+\d*))?(?::(\d+))?\]/ig, (_, hashType, digestType, maxLength) => {
+              const finalOutputName = childCompilationOutputName.replace(/\[(?:(\w+):)?templatehash(?::([a-z]+\d*))?(?::(\d+))?\]/ig, (_, hashType, digestType, maxLength) => {
                 return loaderUtils.getHashDigest(Buffer.from(html, 'utf8'), hashType, digestType, parseInt(maxLength, 10));
               });
               // Add the evaluated html code to the webpack assets
diff --git a/spec/basic.spec.js b/spec/basic.spec.js
index 4dc1a8f9..17df8a6b 100644
--- a/spec/basic.spec.js
+++ b/spec/basic.spec.js
@@ -626,7 +626,7 @@ describe('HtmlWebpackPlugin', () => {
     }, ['<script src="index_bundle.js"'], /test-\S+\.html$/, done);
   });
 
-  it('will replace [contenthash] in the filename with a content hash of 32 hex characters', done => {
+  it('will replace [templatehash] in the filename with a content hash of 32 hex characters', done => {
     testHtmlPlugin({
       mode: 'production',
       entry: {
@@ -637,7 +637,7 @@ describe('HtmlWebpackPlugin', () => {
         filename: '[name]_bundle.js'
       },
       plugins: [
-        new HtmlWebpackPlugin({filename: 'index.[contenthash].html'})
+        new HtmlWebpackPlugin({filename: 'index.[templatehash].html'})
       ]
     }, [], /index\.[a-f0-9]{32}\.html/, done);
   });