diff --git a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
index f55bca67ed..653eb7c8b2 100644
--- a/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
+++ b/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js
@@ -8,8 +8,8 @@
 	tinymce.create('tinymce.plugins.WordPress', {
 		init : function(ed, url) {
 			var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2'), last = 0, moreHTML, nextpageHTML, closeOnClick, mod_key, style;
-			moreHTML = '<img src="' + url + '/img/trans.gif" class="mceWPmore mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
-			nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
+			moreHTML = '<img src="' + url + '/img/trans.gif" class="mce-wp-more mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
+			nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mce-wp-nextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
 
 			if ( getUserSetting('hidetb', '0') == '1' )
 				ed.settings.wordpress_adv_hidden = 0;
@@ -383,17 +383,17 @@
 		_handleMoreBreak : function(ed, url) {
 			var moreHTML, nextpageHTML;
 
-			moreHTML = '<img src="' + url + '/img/trans.gif" alt="$1" class="mceWPmore mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
-			nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
+			moreHTML = '<img src="' + url + '/img/trans.gif" alt="$1" class="mce-wp-more mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
+			nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mce-wp-nextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
 
 			// Display morebreak instead if img in element path
 			ed.onPostRender.add(function() {
 				if (ed.theme.onResolveName) {
 					ed.theme.onResolveName.add(function(th, o) {
 						if (o.node.nodeName == 'IMG') {
-							if ( ed.dom.hasClass(o.node, 'mceWPmore') )
+							if ( ed.dom.hasClass(o.node, 'mce-wp-more') )
 								o.name = 'wpmore';
-							if ( ed.dom.hasClass(o.node, 'mceWPnextpage') )
+							if ( ed.dom.hasClass(o.node, 'mce-wp-nextpage') )
 								o.name = 'wppage';
 						}
 
@@ -413,11 +413,11 @@
 			ed.onPostProcess.add(function(ed, o) {
 				if (o.get)
 					o.content = o.content.replace(/<img[^>]+>/g, function(im) {
-						if (im.indexOf('class="mceWPmore') !== -1) {
+						if (im.indexOf('class="mce-wp-more') !== -1) {
 							var m, moretext = (m = im.match(/alt="(.*?)"/)) ? m[1] : '';
 							im = '<!--more'+moretext+'-->';
 						}
-						if (im.indexOf('class="mceWPnextpage') !== -1)
+						if (im.indexOf('class="mce-wp-nextpage') !== -1)
 							im = '<!--nextpage-->';
 
 						return im;
@@ -426,8 +426,8 @@
 
 			// Set active buttons if user selected pagebreak or more break
 			ed.onNodeChange.add(function(ed, cm, n) {
-				cm.setActive('wp_page', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mceWPnextpage'));
-				cm.setActive('wp_more', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mceWPmore'));
+				cm.setActive('wp_page', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mce-wp-nextpage'));
+				cm.setActive('wp_more', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mce-wp-more'));
 			});
 		}
 	});
diff --git a/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js b/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js
index 99434628e5..986304dc62 100644
--- a/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js
+++ b/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js
@@ -23,7 +23,7 @@
 					return;
 
 				// Make sure we've selected a gallery node.
-				if ( el.nodeName != 'IMG' || ed.dom.getAttrib(el, 'class').indexOf('wpGallery') == -1 )
+				if ( el.nodeName != 'IMG' || ed.dom.getAttrib(el, 'class').indexOf('wp-gallery') == -1 )
 					return;
 
 				frame = gallery.edit( '[' + ed.dom.getAttrib( el, 'title' ) + ']' );
@@ -40,7 +40,7 @@
 					ed.dom.events.add(ed.getBody(), 'touchstart', function(e){
 						var target = e.target;
 
-						if ( target.nodeName == 'IMG' && ed.dom.hasClass(target, 'wpGallery') ) {
+						if ( target.nodeName == 'IMG' && ed.dom.hasClass(target, 'wp-gallery') ) {
 							ed.selection.select(target);
 							ed.dom.events.cancel(e);
 							ed.plugins.wordpress._hideButtons();
@@ -51,7 +51,7 @@
 			});
 
 			ed.onMouseDown.add(function(ed, e) {
-				if ( e.target.nodeName == 'IMG' && ed.dom.hasClass(e.target, 'wpGallery') ) {
+				if ( e.target.nodeName == 'IMG' && ed.dom.hasClass(e.target, 'wp-gallery') ) {
 					ed.plugins.wordpress._hideButtons();
 					ed.plugins.wordpress._showButtons(e.target, 'wp_gallerybtns');
 				}
@@ -69,7 +69,7 @@
 
 		_do_gallery : function(co) {
 			return co.replace(/\[gallery([^\]]*)\]/g, function(a,b){
-				return '<img src="'+tinymce.baseURL+'/plugins/wpgallery/img/t.gif" class="wpGallery mceItem" title="gallery'+tinymce.DOM.encode(b)+'" />';
+				return '<img src="'+tinymce.baseURL+'/plugins/wpgallery/img/t.gif" class="wp-gallery mceItem" title="gallery'+tinymce.DOM.encode(b)+'" />';
 			});
 		},
 
@@ -83,7 +83,7 @@
 			return co.replace(/(?:<p[^>]*>)*(<img[^>]+>)(?:<\/p>)*/g, function(a,im) {
 				var cls = getAttr(im, 'class');
 
-				if ( cls.indexOf('wpGallery') != -1 )
+				if ( cls.indexOf('wp-gallery') != -1 )
 					return '<p>['+tinymce.trim(getAttr(im, 'title'))+']</p>';
 
 				return a;
@@ -130,7 +130,7 @@
 			tinymce.dom.Event.add(dellButton, 'mousedown', function(e) {
 				var ed = tinymce.activeEditor, el = ed.selection.getNode();
 
-				if ( el.nodeName == 'IMG' && ed.dom.hasClass(el, 'wpGallery') ) {
+				if ( el.nodeName == 'IMG' && ed.dom.hasClass(el, 'wp-gallery') ) {
 					ed.dom.remove(el);
 
 					ed.execCommand('mceRepaint');
diff --git a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css
index c1e70cab98..c979af99b5 100644
--- a/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css
+++ b/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css
@@ -99,8 +99,8 @@ td {
 }
 
 /* Styles for the WordPress plugins */
-img.mceWPnextpage,
-img.mceWPmore {
+img.mce-wp-nextpage,
+img.mce-wp-more {
 	border: 0;
 	border-top: 1px dotted #cccccc;
 	display: block;
@@ -109,15 +109,15 @@ img.mceWPmore {
 	margin: 15px auto 0;
 }
 
-img.mceWPmore {
+img.mce-wp-more {
 	background: transparent url("img/more_bug.gif") no-repeat right top;
 }
 
-img.mceWPnextpage {
+img.mce-wp-nextpage {
     background: transparent url("img/page_bug.gif") no-repeat right top;
 }
 
-img.wpGallery {
+img.wp-gallery {
 	border: 1px dashed #888;
 	background: #f2f8ff url("img/gallery.png") no-repeat scroll center center;
 	width: 99%;