diff --git a/src/wp-admin/css/colors.css b/src/wp-admin/css/colors.css
index 59016bb60e..d2556974d6 100644
--- a/src/wp-admin/css/colors.css
+++ b/src/wp-admin/css/colors.css
@@ -46,33 +46,33 @@ input[type=radio]:checked:before {
 }
 
 
-/* Helper classes for pulling MP6 colors */
+/* Helper classes for plugins to leverage the active WordPress color scheme */
 
-.mp6-primary {
+.wp-ui-primary {
 	color: #fff;
 	background-color: #333;
 }
-.mp6-text-primary {
+.wp-ui-text-primary {
 	color: #333;
 }
 
-.mp6-highlight {
+.wp-ui-highlight {
 	color: white;
 	background-color: #1e8cbe;
 }
-.mp6-text-highlight {
+.wp-ui-text-highlight {
 	color: #1e8cbe;
 }
 
-.mp6-notification {
+.wp-ui-notification {
 	color: #fff;
 	background-color: #D54E21;
 }
-.mp6-text-notification {
+.wp-ui-text-notification {
 	color: #D54E21;
 }
 
-.mp6-text-icon {
+.wp-ui-text-icon {
 	color: #999;
 }
 
diff --git a/src/wp-admin/css/colors/_admin.scss b/src/wp-admin/css/colors/_admin.scss
index b9eca2633f..ede9857c1e 100644
--- a/src/wp-admin/css/colors/_admin.scss
+++ b/src/wp-admin/css/colors/_admin.scss
@@ -53,31 +53,31 @@ input[type=radio]:checked:before {
 		@include button( $button-color );
 	}
 
-	.mp6-primary {
+	.wp-ui-primary {
 		color: $text-color;
 		background-color: $base-color;
 	}
-	.mp6-text-primary {
+	.wp-ui-text-primary {
 		color: $base-color;
 	}
 
-	.mp6-highlight {
+	.wp-ui-highlight {
 		color: $menu-highlight-text;
 		background-color: $menu-highlight-background;
 	}
-	.mp6-text-highlight {
+	.wp-ui-text-highlight {
 		color: $menu-highlight-background;
 	}
 
-	.mp6-notification {
+	.wp-ui-notification {
 		color: $menu-bubble-text;
 		background-color: $menu-bubble-background;
 	}
-	.mp6-text-notification {
+	.wp-ui-text-notification {
 		color: $menu-bubble-background;
 	}
 
-	.mp6-text-icon {
+	.wp-ui-text-icon {
 		color: $menu-icon;
 	}
 }
diff --git a/src/wp-admin/css/wp-admin.css b/src/wp-admin/css/wp-admin.css
index eb38cf1ae4..8b3e56abc4 100644
--- a/src/wp-admin/css/wp-admin.css
+++ b/src/wp-admin/css/wp-admin.css
@@ -12752,7 +12752,6 @@ li#wp-admin-bar-menu-toggle {
 		padding: 1px 0 0;
 	}
 
-	/* Set drop shadow again per original mp6 plugin settings at line 1265 of colors-mp6.css in r687296, remove when original styles have been corrected */
 	.plugins tr.active + tr.inactive td.column-description {
 		-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);
 		-moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1);
diff --git a/src/wp-includes/css/editor.css b/src/wp-includes/css/editor.css
index e22d8d17a2..90987629b5 100644
--- a/src/wp-includes/css/editor.css
+++ b/src/wp-includes/css/editor.css
@@ -49,7 +49,7 @@
 	color: #555;
 }
 
-/* These are part of TinyMCE, used in TinyMCE Advanced, but not WordPress. These are not MP6-ified.  */
+/* These are part of TinyMCE, used in TinyMCE Advanced, but not WordPress. These are not updated for 3.8's design. */
 .wp_themeSkin span.mce_sup,
 .wp_themeSkin span.mce_sub,
 .wp_themeSkin span.mce_media,
diff --git a/src/wp-includes/js/svg-painter.js b/src/wp-includes/js/svg-painter.js
index a36fb4ef28..4d3a5075f3 100644
--- a/src/wp-includes/js/svg-painter.js
+++ b/src/wp-includes/js/svg-painter.js
@@ -167,7 +167,7 @@ var svgPainter = ( function( $, window, document, undefined ) {
 				return;
 			}
 
-			xml = $element.data( 'mp6-svg-' + color );
+			xml = $element.data( 'wp-ui-svg-' + color );
 
 			if ( ! xml ) {
 				encoded = $element.css( 'background-image' ).match( /.+data:image\/svg\+xml;base64,(.+?)['"] ?\)/ );
@@ -197,7 +197,7 @@ var svgPainter = ( function( $, window, document, undefined ) {
 					xml = base64.btoa( xml );
 				}
 
-				$element.data( 'mp6-svg-' + color, xml );
+				$element.data( 'wp-ui-svg-' + color, xml );
 			}
 
 			$element.attr( 'style', 'background-image: url("data:image/svg+xml;base64,' + xml + '") !important;' );