diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 6f64ffab5d..ada9c53c3f 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -170,7 +170,7 @@ add_filter( 'widget_text_content', 'wptexturize'          );
 add_filter( 'widget_text_content', 'convert_smilies',  20 );
 add_filter( 'widget_text_content', 'wpautop'              );
 
-add_filter( 'widget_html_code_content', 'balanceTags' );
+add_filter( 'widget_custom_html_content', 'balanceTags' );
 
 add_filter( 'date_i18n', 'wp_maybe_decline_date' );
 
diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php
index 32a908ac11..cdc6e9690b 100644
--- a/wp-includes/default-widgets.php
+++ b/wp-includes/default-widgets.php
@@ -61,5 +61,5 @@ require_once( ABSPATH . WPINC . '/widgets/class-wp-widget-tag-cloud.php' );
 /** WP_Nav_Menu_Widget class */
 require_once( ABSPATH . WPINC . '/widgets/class-wp-nav-menu-widget.php' );
 
-/** WP_Widget_HTML_Code class */
-require_once( ABSPATH . WPINC . '/widgets/class-wp-widget-html-code.php' );
+/** WP_Widget_Custom_HTML class */
+require_once( ABSPATH . WPINC . '/widgets/class-wp-widget-custom-html.php' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 39faa69cab..cc0cf154e4 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9-alpha-40925';
+$wp_version = '4.9-alpha-40926';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
diff --git a/wp-includes/widgets.php b/wp-includes/widgets.php
index b44048d641..fbbdcf5f55 100644
--- a/wp-includes/widgets.php
+++ b/wp-includes/widgets.php
@@ -1474,7 +1474,7 @@ function wp_widgets_init() {
 
 	register_widget( 'WP_Nav_Menu_Widget' );
 
-	register_widget( 'WP_Widget_HTML_Code' );
+	register_widget( 'WP_Widget_Custom_HTML' );
 
 	/**
 	 * Fires after all default WordPress widgets have been registered.
diff --git a/wp-includes/widgets/class-wp-widget-html-code.php b/wp-includes/widgets/class-wp-widget-custom-html.php
similarity index 77%
rename from wp-includes/widgets/class-wp-widget-html-code.php
rename to wp-includes/widgets/class-wp-widget-custom-html.php
index d16900183f..f6d28fd625 100644
--- a/wp-includes/widgets/class-wp-widget-html-code.php
+++ b/wp-includes/widgets/class-wp-widget-custom-html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Widget API: WP_Widget_HTML_Code class
+ * Widget API: WP_Widget_Custom_HTML class
  *
  * @package WordPress
  * @subpackage Widgets
@@ -8,13 +8,13 @@
  */
 
 /**
- * Core class used to implement a HTML Code widget.
+ * Core class used to implement a Custom HTML widget.
  *
  * @since 4.8.1
  *
  * @see WP_Widget
  */
-class WP_Widget_HTML_Code extends WP_Widget {
+class WP_Widget_Custom_HTML extends WP_Widget {
 
 	/**
 	 * Default instance.
@@ -28,28 +28,28 @@ class WP_Widget_HTML_Code extends WP_Widget {
 	);
 
 	/**
-	 * Sets up a new HTML Code widget instance.
+	 * Sets up a new Custom HTML widget instance.
 	 *
 	 * @since 4.8.1
 	 */
 	public function __construct() {
 		$widget_ops = array(
-			'classname' => 'widget_html_code',
+			'classname' => 'widget_custom_html',
 			'description' => __( 'Arbitrary HTML code.' ),
 			'customize_selective_refresh' => true,
 		);
 		$control_ops = array();
-		parent::__construct( 'html_code', __( 'HTML Code' ), $widget_ops, $control_ops );
+		parent::__construct( 'custom_html', __( 'Custom HTML' ), $widget_ops, $control_ops );
 	}
 
 	/**
-	 * Outputs the content for the current HTML Code widget instance.
+	 * Outputs the content for the current Custom HTML widget instance.
 	 *
 	 * @since 4.8.1
 	 *
 	 * @param array $args     Display arguments including 'before_title', 'after_title',
 	 *                        'before_widget', and 'after_widget'.
-	 * @param array $instance Settings for the current HTML Code widget instance.
+	 * @param array $instance Settings for the current Custom HTML widget instance.
 	 */
 	public function widget( $args, $instance ) {
 
@@ -61,15 +61,15 @@ class WP_Widget_HTML_Code extends WP_Widget {
 		$content = $instance['content'];
 
 		/**
-		 * Filters the content of the HTML Code widget.
+		 * Filters the content of the Custom HTML widget.
 		 *
 		 * @since 4.8.1
 		 *
-		 * @param string              $content  The widget content.
-		 * @param array               $instance Array of settings for the current widget.
-		 * @param WP_Widget_HTML_Code $this     Current HTML Code widget instance.
+		 * @param string                $content  The widget content.
+		 * @param array                 $instance Array of settings for the current widget.
+		 * @param WP_Widget_Custom_HTML $this     Current Custom HTML widget instance.
 		 */
-		$content = apply_filters( 'widget_html_code_content', $content, $instance, $this );
+		$content = apply_filters( 'widget_custom_html_content', $content, $instance, $this );
 
 		echo $args['before_widget'];
 		if ( ! empty( $title ) ) {
@@ -80,7 +80,7 @@ class WP_Widget_HTML_Code extends WP_Widget {
 	}
 
 	/**
-	 * Handles updating settings for the current HTML Code widget instance.
+	 * Handles updating settings for the current Custom HTML widget instance.
 	 *
 	 * @since 4.8.1
 	 *
@@ -101,7 +101,7 @@ class WP_Widget_HTML_Code extends WP_Widget {
 	}
 
 	/**
-	 * Outputs the HTML Code widget settings form.
+	 * Outputs the Custom HTML widget settings form.
 	 *
 	 * @since 4.8.1
 	 *