diff --git a/README.md b/README.md
index cd5dcbfa..10e743f5 100644
--- a/README.md
+++ b/README.md
@@ -184,9 +184,9 @@ Reveal.initialize({
 	// Display presentation control arrows
 	controls: true,
 
-	// Hint at where the user can navigate, for example by animating
-	// the down arrow when we first encounter a vertical slide
-	controlsHints: true,
+	// Help the user learn the controls by providing hints, for example by
+	// bouncing the down arrow when they first encounter a vertical slide
+	controlsTutorial: true,
 
 	// Determines where controls appear, "edges" or "bottom-right"
 	controlsLayout: 'bottom-right',
diff --git a/js/reveal.js b/js/reveal.js
index 96177fec..973d4190 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -52,9 +52,9 @@
 			// Display presentation control arrows
 			controls: true,
 
-			// Hint at where the user can navigate, for example by animating
-			// the down arrow when we first encounter a vertical slide
-			controlsHints: true,
+			// Help the user learn the controls by providing hints, for example by
+			// bouncing the down arrow when they first encounter a vertical slide
+			controlsTutorial: true,
 
 			// Determines where controls appear, "edges" or "bottom-right"
 			controlsLayout: 'bottom-right',
@@ -2917,7 +2917,7 @@
 
 		}
 
-		if( config.controlsHints ) {
+		if( config.controlsTutorial ) {
 
 			// Highlight control arrows with an animation to ensure
 			// that the viewer knows how to navigate
@@ -2927,7 +2927,7 @@
 			else {
 				dom.controlsDownArrow.classList.remove( 'highlight' );
 
-				if( !hasNavigatedRight && routes.right && indexh === 0 ) {
+				if( !hasNavigatedRight && routes.right && indexv === 0 ) {
 					dom.controlsRightArrow.classList.add( 'highlight' );
 				}
 				else {