diff --git a/demo/configuration_section.js b/demo/configuration_section.js
index f61ed62058..e1047fdd85 100644
--- a/demo/configuration_section.js
+++ b/demo/configuration_section.js
@@ -45,8 +45,8 @@ shakaDemo.setupConfiguration_ = function() {
       'change', shakaDemo.onAdaptationChange_);
   document.getElementById('logLevelList').addEventListener(
       'change', shakaDemo.onLogLevelChange_);
-  document.getElementById('enableAutoplay').addEventListener(
-      'change', shakaDemo.onAutoplayChange_);
+  document.getElementById('enableLoadOnRefresh').addEventListener(
+      'change', shakaDemo.onLoadOnRefreshChange_);
   document.getElementById('drmSettingsVideoRobustness').addEventListener(
       'input', shakaDemo.onDrmSettingsChange_);
   document.getElementById('drmSettingsAudioRobustness').addEventListener(
@@ -68,7 +68,7 @@ shakaDemo.setupConfiguration_ = function() {
 
 
 /** @private */
-shakaDemo.onAutoplayChange_ = function() {
+shakaDemo.onLoadOnRefreshChange_ = function() {
   // Change the hash, to mirror this.
   shakaDemo.hashShouldChange_();
 };
diff --git a/demo/index.html b/demo/index.html
index 69a05371ed..909a8c4836 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -177,8 +177,8 @@ <h1>Shaka Player <span id="version"></span></h1>
           <input id="enableAdaptation" type="checkbox" checked>
         </div>
         <div>
-          <label for="enableAutoplay">Autoplay:</label>
-          <input id="enableAutoplay" type="checkbox">
+          <label for="enableLoadOnRefresh">Auto-load on page refresh:</label>
+          <input id="enableLoadOnRefresh" type="checkbox">
         </div>
         <div>
           <label for="logToScreen">Log to the screen:</label>
diff --git a/demo/main.js b/demo/main.js
index d33756124b..6578674e60 100644
--- a/demo/main.js
+++ b/demo/main.js
@@ -281,7 +281,7 @@ shakaDemo.preBrowserCheckParams_ = function(params) {
     document.body.className = 'noinput';
   }
   if ('play' in params) {
-    document.getElementById('enableAutoplay').checked = true;
+    document.getElementById('enableLoadOnRefresh').checked = true;
   }
   // shaka.log is not set if logging isn't enabled.
   // I.E. if using the compiled version of shaka.
@@ -512,7 +512,7 @@ shakaDemo.hashShouldChange_ = function() {
       params.push(logLevel);
     }
   }
-  if (document.getElementById('enableAutoplay').checked) {
+  if (document.getElementById('enableLoadOnRefresh').checked) {
     params.push('play');
   }