diff --git a/src/wp-admin/js/inline-edit-post.js b/src/wp-admin/js/inline-edit-post.js
index 8240a8444e..958de0682c 100644
--- a/src/wp-admin/js/inline-edit-post.js
+++ b/src/wp-admin/js/inline-edit-post.js
@@ -272,7 +272,7 @@ inlineEditPost = {
 					if ( -1 !== r.indexOf( '<tr' ) ) {
 						$(inlineEditPost.what+id).siblings('tr.hidden').addBack().remove();
 						$('#edit-'+id).before(r).remove();
-						window.WPEmoji.parse( $( inlineEditPost.what + id ).get( 0 ) );
+						wp.emoji.parse( $( inlineEditPost.what + id ).get( 0 ) );
 						$(inlineEditPost.what+id).hide().fadeIn();
 					} else {
 						r = r.replace( /<.[^<>]*?>/g, '' );
diff --git a/src/wp-admin/js/inline-edit-tax.js b/src/wp-admin/js/inline-edit-tax.js
index 1052960edd..7347bc27d8 100644
--- a/src/wp-admin/js/inline-edit-tax.js
+++ b/src/wp-admin/js/inline-edit-tax.js
@@ -117,7 +117,7 @@ inlineEditTax = {
 						// Update the value in the Parent dropdown.
 						$( '#parent' ).find( 'option[value=' + option_value + ']' ).text( row.find( '.row-title' ).text() );
 
-						window.WPEmoji.parse( row.get( 0 ) );
+						wp.emoji.parse( row.get( 0 ) );
 
 						row.hide().fadeIn();
 					} else {
diff --git a/src/wp-admin/js/post.js b/src/wp-admin/js/post.js
index 202d1d92f1..36750c6e5a 100644
--- a/src/wp-admin/js/post.js
+++ b/src/wp-admin/js/post.js
@@ -741,7 +741,7 @@ jQuery(document).ready( function($) {
 					});
 				}
 
-				window.WPEmoji.parse( box.get( 0 ) );
+				wp.emoji.parse( box.get( 0 ) );
 
 				b.html(revert_b);
 				real_slug.val(new_slug);
diff --git a/src/wp-admin/js/tags.js b/src/wp-admin/js/tags.js
index f6855ecd42..e5ad2ca935 100644
--- a/src/wp-admin/js/tags.js
+++ b/src/wp-admin/js/tags.js
@@ -49,7 +49,7 @@ jQuery(document).ready(function($) {
 			else
 				$( '.tags' ).prepend( res.responses[0].supplemental.parents ); // As the parent is not visible, Insert the version with Parent - Child - ThisTerm
 
-			window.WPEmoji.parse( $( '.tags' ).get( 0 ) );
+			wp.emoji.parse( $( '.tags' ).get( 0 ) );
 
 			$('.tags .no-items').remove();
 
diff --git a/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js b/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js
index e692030038..3dfd36a709 100755
--- a/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wpemoji/plugin.js
@@ -1,8 +1,8 @@
-( function( tinymce, WPEmoji ) {
+( function( tinymce, wp ) {
 	tinymce.PluginManager.add( 'wpemoji', function( editor, url ) {
 		var typing;
 
-		if ( ! WPEmoji.parseEmoji ) {
+		if ( ! wp.emoji.parseEmoji ) {
 			return;
 		}
 
@@ -32,7 +32,7 @@
 			node = selection.getNode();
 			bookmark = selection.getBookmark();
 
-			WPEmoji.parse( node );
+			wp.emoji.parse( node );
 
 			imgs = editor.dom.select( 'img.emoji', node );
 
@@ -61,4 +61,4 @@
 			}
 		} );
 	} );
-} )( window.tinymce, window.WPEmoji );
+} )( window.tinymce, window.wp );
diff --git a/src/wp-includes/js/twemoji.js b/src/wp-includes/js/twemoji.js
old mode 100755
new mode 100644
diff --git a/src/wp-includes/js/emoji.js b/src/wp-includes/js/wp-emoji.js
old mode 100755
new mode 100644
similarity index 81%
rename from src/wp-includes/js/emoji.js
rename to src/wp-includes/js/wp-emoji.js
index a99f4a7864..734b7b0dd2
--- a/src/wp-includes/js/emoji.js
+++ b/src/wp-includes/js/wp-emoji.js
@@ -1,8 +1,10 @@
-/* global EmojiSettings, twemoji */
-var WPEmoji;
+/* global _wpemojiSettings, twemoji */
+window.wp = window.wp || {};
 
 (function() {
-	WPEmoji = {
+	var emoji;
+
+	wp.emoji = emoji = {
 		/**
 		 * The CDN URL for where emoji files are hosted.
 		 *
@@ -10,7 +12,7 @@ var WPEmoji;
 		 *
 		 * @var string
 		 */
-		base_url: '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72',
+		baseUrl: '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72',
 
 		/**
 		 * The extension of the hosted emoji files.
@@ -54,16 +56,16 @@ var WPEmoji;
 		 * @since 4.2.0
 		 */
 		init: function() {
-			if ( typeof EmojiSettings !== 'undefined' ) {
-				this.base_url = EmojiSettings.base_url || this.base_url;
-				this.ext = EmojiSettings.ext || this.ext;
+			if ( typeof _wpemojiSettings !== 'undefined' ) {
+				emoji.baseUrl = _wpemojiSettings.baseUrl || emoji.baseUrl;
+				emoji.ext = _wpemojiSettings.ext || emoji.ext;
 			}
 
-			WPEmoji.parseAllEmoji = ! WPEmoji.browserSupportsEmoji();
-			WPEmoji.parseFlags = ! WPEmoji.browserSupportsFlagEmoji();
-			WPEmoji.parseEmoji = WPEmoji.parseAllEmoji || WPEmoji.parseFlags;
+			emoji.parseAllEmoji = ! emoji.browserSupportsEmoji();
+			emoji.parseFlags = ! emoji.browserSupportsFlagEmoji();
+			emoji.parseEmoji = emoji.parseAllEmoji || emoji.parseFlags;
 
-			if ( ! WPEmoji.parseEmoji ) {
+			if ( ! emoji.parseEmoji ) {
 				return;
 			}
 		},
@@ -74,7 +76,7 @@ var WPEmoji;
 		 * @since 4.2.0
 		 */
 		load: function() {
-			WPEmoji.parse( document.body );
+			emoji.parse( document.body );
 		},
 
 		/**
@@ -160,13 +162,13 @@ var WPEmoji;
 		 * @param {Element} element The DOM node to parse.
 		 */
 		parse: function( element ) {
-			if ( ! WPEmoji.parseEmoji ) {
+			if ( ! emoji.parseEmoji ) {
 				return;
 			}
 
 			return twemoji.parse( element, {
-				base: this.base_url,
-				ext: this.ext,
+				base:     emoji.baseUrl,
+				ext:      emoji.ext,
 				callback: function( icon, options ) {
 					// Ignore some standard characters that TinyMCE recommends in its character map.
 					switch ( icon ) {
@@ -181,7 +183,7 @@ var WPEmoji;
 							return false;
 					}
 
-					if ( WPEmoji.parseFlags && ! WPEmoji.parseAllEmoji && ! icon.match( /^1f1(e[6-9a-f]|f[1-9a-f])-1f1(e[6-9a-f]|f[1-9a-f])$/ ) ) {
+					if ( emoji.parseFlags && ! emoji.parseAllEmoji && ! icon.match( /^1f1(e[6-9a-f]|f[1-9a-f])-1f1(e[6-9a-f]|f[1-9a-f])$/ ) ) {
 						return false;
 					}
 
@@ -192,10 +194,10 @@ var WPEmoji;
 	};
 
 	if ( window.addEventListener ) {
-		window.addEventListener( 'load', WPEmoji.load, false );
+		window.addEventListener( 'load', emoji.load, false );
 	} else if ( window.attachEvent ) {
-		window.attachEvent( 'onload', WPEmoji.load );
+		window.attachEvent( 'onload', emoji.load );
 	}
 
-	WPEmoji.init();
+	emoji.init();
 })();
diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php
index a7671e1046..d5963415aa 100644
--- a/src/wp-includes/script-loader.php
+++ b/src/wp-includes/script-loader.php
@@ -425,8 +425,8 @@ function wp_default_scripts( &$scripts ) {
 	$scripts->add( 'mce-view', "/wp-includes/js/mce-view$suffix.js", array( 'shortcode', 'media-models', 'media-audiovideo', 'wp-playlist' ), false, 1 );
 
 	$scripts->add( 'twemoji', "/wp-includes/js/twemoji$suffix.js", array(), false, 1 );
-	$scripts->add( 'emoji', "/wp-includes/js/emoji$suffix.js", array( 'twemoji' ), false, 1 );
-	did_action( 'init' ) && $scripts->localize( 'emoji', 'EmojiSettings', array(
+	$scripts->add( 'emoji', "/wp-includes/js/wp-emoji$suffix.js", array( 'twemoji' ), false, 1 );
+	did_action( 'init' ) && $scripts->localize( 'wp-emoji', '_wpemojiSettings', array(
 		/**
 		 * Filter the URL where emoji images are hosted.
 		 *
@@ -434,7 +434,7 @@ function wp_default_scripts( &$scripts ) {
 		 *
 		 * @param string The emoji base URL.
 		 */
-		'base_url' => apply_filters( 'emoji_url', '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72/' ),
+		'baseUrl' => apply_filters( 'emoji_url', '//s0.wp.com/wp-content/mu-plugins/emoji/twemoji/72x72/' ),
 		/**
 		 * Filter the extension of the emoji files.
 		 *