Index: src/js/_enqueues/wp/customize/controls.js
===================================================================
--- src/js/_enqueues/wp/customize/controls.js	(revision 46737)
+++ src/js/_enqueues/wp/customize/controls.js	(working copy)
@@ -3500,7 +3500,7 @@
 			control.params = _.extend(
 				{},
 				control.defaults,
-				control.params || {}, // In case sub-class already defines.
+				control.params || {}, // In case subclass already defines.
 				options.params || options || {} // The options.params property is deprecated, but it is checked first for back-compat.
 			);
 
Index: src/wp-admin/includes/class-wp-list-table.php
===================================================================
--- src/wp-admin/includes/class-wp-list-table.php	(revision 46737)
+++ src/wp-admin/includes/class-wp-list-table.php	(working copy)
@@ -251,7 +251,7 @@
 	 * @abstract
 	 */
 	public function ajax_user_can() {
-		die( 'function WP_List_Table::ajax_user_can() must be over-ridden in a sub-class.' );
+		die( 'function WP_List_Table::ajax_user_can() must be overridden in a subclass.' );
 	}
 
 	/**
@@ -263,7 +263,7 @@
 	 * @abstract
 	 */
 	public function prepare_items() {
-		die( 'function WP_List_Table::prepare_items() must be over-ridden in a sub-class.' );
+		die( 'function WP_List_Table::prepare_items() must be overridden in a subclass.' );
 	}
 
 	/**
@@ -931,7 +931,7 @@
 	 * @return array
 	 */
 	public function get_columns() {
-		die( 'function WP_List_Table::get_columns() must be over-ridden in a sub-class.' );
+		die( 'function WP_List_Table::get_columns() must be overridden in a subclass.' );
 	}
 
 	/**
Index: src/wp-includes/class-wp-image-editor.php
===================================================================
--- src/wp-includes/class-wp-image-editor.php	(revision 46737)
+++ src/wp-includes/class-wp-image-editor.php	(working copy)
@@ -30,7 +30,7 @@
 
 	/**
 	 * Checks to see if current environment supports the editor chosen.
-	 * Must be overridden in a sub-class.
+	 * Must be overridden in a subclass.
 	 *
 	 * @since 3.5.0
 	 *
@@ -45,7 +45,7 @@
 
 	/**
 	 * Checks to see if editor supports the mime-type specified.
-	 * Must be overridden in a sub-class.
+	 * Must be overridden in a subclass.
 	 *
 	 * @since 3.5.0
 	 *
Index: src/wp-includes/class-wp-widget.php
===================================================================
--- src/wp-includes/class-wp-widget.php	(revision 46737)
+++ src/wp-includes/class-wp-widget.php	(working copy)
@@ -101,7 +101,7 @@
 	/**
 	 * Echoes the widget content.
 	 *
-	 * Sub-classes should over-ride this function to generate their widget code.
+	 * Subclasses should override this function to generate their widget code.
 	 *
 	 * @since 2.8.0
 	 *
@@ -110,7 +110,7 @@
 	 * @param array $instance The settings for the particular instance of the widget.
 	 */
 	public function widget( $args, $instance ) {
-		die( 'function WP_Widget::widget() must be over-ridden in a sub-class.' );
+		die( 'function WP_Widget::widget() must be overridden in a subclass.' );
 	}
 
 	/**
Index: src/wp-includes/pomo/translations.php
===================================================================
--- src/wp-includes/pomo/translations.php	(revision 46737)
+++ src/wp-includes/pomo/translations.php	(working copy)
@@ -113,7 +113,7 @@
 		 * Here, in the base Translations class, the common logic for English is implemented:
 		 *  0 if there is one element, 1 otherwise
 		 *
-		 * This function should be overridden by the sub-classes. For example MO/PO can derive the logic
+		 * This function should be overridden by the subclasses. For example MO/PO can derive the logic
 		 * from their headers.
 		 *
 		 * @param integer $count number of items