diff --git a/src/wp-includes/class-wp-customize-control.php b/src/wp-includes/class-wp-customize-control.php
index 6c5e46711c..f10a74fc69 100644
--- a/src/wp-includes/class-wp-customize-control.php
+++ b/src/wp-includes/class-wp-customize-control.php
@@ -889,7 +889,7 @@ final class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control
 					<span><span class="dice">&#9860;</span>
 					<# if ( data.type === 'uploaded' ) { #>
 						<?php _e( 'Randomize uploaded headers' ); ?>
-					<# } else if ( data.type === 'suggested' ) { #>
+					<# } else if ( data.type === 'default' ) { #>
 						<?php _e( 'Randomize suggested headers' ); ?>
 					<# } #>
 					</span>
@@ -920,7 +920,7 @@ final class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control
 					<span><span class="dice">&#9860;</span>
 					<# if ( data.type === 'uploaded' ) { #>
 						<?php _e( 'Randomizing uploaded headers' ); ?>
-					<# } else if ( data.type === 'suggested' ) { #>
+					<# } else if ( data.type === 'default' ) { #>
 						<?php _e( 'Randomizing suggested headers' ); ?>
 					<# } #>
 					</span>
diff --git a/src/wp-includes/js/customize-views.js b/src/wp-includes/js/customize-views.js
index 018852d58e..07a73c8067 100644
--- a/src/wp-includes/js/customize-views.js
+++ b/src/wp-includes/js/customize-views.js
@@ -136,8 +136,7 @@
 		extendedModel: function() {
 			var c = this.model.get('collection');
 			return _.extend(this.model.toJSON(), {
-				// -1 to exclude the randomize button
-				nImages: c.size() - 1
+				type: c.type,
 			});
 		},