diff --git a/skeletons/firefox/package.json b/skeletons/firefox/package.json
index c325f8c9df..9b81485bfc 100644
--- a/skeletons/firefox/package.json
+++ b/skeletons/firefox/package.json
@@ -8,8 +8,8 @@
   "main": "lib/main.js",
   "preferences": [{
     "name": "tomsterLocationbarButtonToggle",
-        "title": "Display The Tomster icon when a site runs Ember.js",
-        "description": "Display The Tomster icon when a site runs Ember.js",
+        "title": "Display The Ember icon when a site runs Ember.js",
+        "description": "Display The Ember icon when a site runs Ember.js",
         "type": "bool",
         "value": false
   }]
diff --git a/skeletons/web-extension/background-script.js b/skeletons/web-extension/background-script.js
index f67651f7ac..21eb73553a 100644
--- a/skeletons/web-extension/background-script.js
+++ b/skeletons/web-extension/background-script.js
@@ -6,7 +6,7 @@
  * ClientApp.  The background-script serves as a proxy between the EmberInspector
  * and the content-script.
  *
- * It is also responsible for showing the Tomster icon and tooltip in the url bar.
+ * It is also responsible for showing the Ember icon and tooltip in the url bar.
  *
  * See:
  *     https://developer.chrome.com/extensions/background_pages
@@ -57,7 +57,7 @@
   }
 
   /**
-   * Remove the curent tab's Tomster.
+   * Remove the curent tab's Ember icon.
    * Typically used to clearout the icon after reload.
    * @param {Number} tabId - the current tab
    */
@@ -152,7 +152,7 @@
       updateTabAction(sender.tab.id);
       updateContextMenu();
     } else if (request && request.type === 'resetEmberIcon') {
-      // hide the Tomster icon
+      // hide the Ember icon
       hideAction(sender.tab.id);
     } else if (request && request.type === 'inspectorLoaded') {
       updateContextMenu(true);
diff --git a/skeletons/web-extension/options.js b/skeletons/web-extension/options.js
index c20c292415..103fa95561 100644
--- a/skeletons/web-extension/options.js
+++ b/skeletons/web-extension/options.js
@@ -2,7 +2,7 @@
 
 /**
  * Extension options for Chrome.
- * This allows the user to decide if the Tomster icon should show when visiting
+ * This allows the user to decide if the Ember icon should show when visiting
  * a webpage that has Ember running.
  *
  * see: