1 files changed, 12 insertions, 12 deletions

diff --git a/js/vapi-background.js b/js/vapi-background.js
index 363733c..7a49e9d 100644
--- a/js/vapi-background.js
+++ b/js/vapi-background.js
@@ -80,7 +80,7 @@ var deferUntil = function(testFn, mainFn, details) {
 /******************************************************************************/
 
 vAPI.app = {
-    name: 'uMatrix',
+    name: 'eMatrix',
     version: location.hash.slice(1)
 };
 
@@ -130,7 +130,7 @@ window.addEventListener('unload', function() {
 
     if ( cleanupTasks.length < expectedNumberOfCleanups ) {
         console.error(
-            'uMatrix> Cleanup tasks performed: %s (out of %s)',
+            'eMatrix> Cleanup tasks performed: %s (out of %s)',
             cleanupTasks.length,
             expectedNumberOfCleanups
         );
@@ -817,7 +817,7 @@ vAPI.tabs.get = function(tabId, callback) {
     var tabBrowser = getTabBrowser(win);
 
     // https://github.com/gorhill/uMatrix/issues/540
-    // The `index` property is nowhere used by uMatrix at this point, so we
+    // The `index` property is nowhere used by eMatrix at this point, so we
     // will refrain from returning this information for the time being.
 
     callback({
@@ -1535,7 +1535,7 @@ vAPI.messaging.onMessage = function({target, data}) {
         return;
     }
 
-    console.error('uMatrix> messaging > unknown request: %o', data);
+    console.error('eMatrix> messaging > unknown request: %o', data);
 
     // Unhandled:
     // Need to callback anyways in case caller expected an answer, or
@@ -1798,7 +1798,7 @@ var httpObserver = {
             try {
                 this.componentRegistrar.unregisterFactory(this.classID, Components.manager.getClassObject(this.classID, Ci.nsIFactory));
             } catch (ex) {
-                console.error('uMatrix> httpObserver > unable to unregister stale instance: ', ex);
+                console.error('eMatrix> httpObserver > unable to unregister stale instance: ', ex);
             }
         }
 
@@ -1952,7 +1952,7 @@ var httpObserver = {
 
     // https://github.com/gorhill/uMatrix/issues/165
     // https://developer.mozilla.org/en-US/Firefox/Releases/3.5/Updating_extensions#Getting_a_load_context_from_a_request
-    // Not sure `umatrix:shouldLoad` is still needed, uMatrix does not
+    // Not sure `ematrix:shouldLoad` is still needed, eMatrix does not
     //   care about embedded frames topography.
     // Also:
     //   https://developer.mozilla.org/en-US/Firefox/Multiprocess_Firefox/Limitations_of_chrome_scripts
@@ -2041,8 +2041,8 @@ var httpObserver = {
             // TODO: Find better place for this, needs to be set before onHeadersReceived.callback.
             // Web workers not blocked in Pale Moon as child-src currently unavailable, see:
             // https://github.com/MoonchildProductions/Pale-Moon/issues/949
-            if ( µMatrix.cspNoWorker === undefined ) {
-                µMatrix.cspNoWorker = "child-src 'none'; frame-src data: blob: *; report-uri about:blank";
+            if ( ηMatrix.cspNoWorker === undefined ) {
+                ηMatrix.cspNoWorker = "child-src 'none'; frame-src data: blob: *; report-uri about:blank";
             }
 
             var result = vAPI.net.onHeadersReceived.callback({
@@ -2265,7 +2265,7 @@ vAPI.toolbarButton = {
             // Sanity check
             attempts = (attempts || 0) + 1;
             if ( attempts > 1/*000*/ ) {
-                //console.error('uMatrix> resizePopupDelayed: giving up after too many attempts');
+                //console.error('eMatrix> resizePopupDelayed: giving up after too many attempts');
                 return false;
             }
 
@@ -2381,7 +2381,7 @@ vAPI.toolbarButton = {
     }
 
     tbb.codePath = 'legacy';
-    tbb.id = 'umatrix-legacy-button';   // NOTE: must match legacy-toolbar-button.css
+    tbb.id = 'ematrix-button';   // NOTE: must match legacy-toolbar-button.css
     tbb.viewId = tbb.id + '-panel';
 
     var styleSheetUri = null;
@@ -2411,7 +2411,7 @@ vAPI.toolbarButton = {
     };
 
     var addLegacyToolbarButton = function(window) {
-        // uMatrix's stylesheet lazily added.
+        // eMatrix's stylesheet lazily added.
         if ( styleSheetUri === null ) {
             var sss = Cc["@mozilla.org/content/style-sheet-service;1"]
                         .getService(Ci.nsIStyleSheetService);
@@ -3108,7 +3108,7 @@ vAPI.contextMenu.remove = function() {
 /******************************************************************************/
 
 var optionsObserver = (function() {
-    var addonId = 'uMatrix@raymondhill.net';
+    var addonId = 'eMatrix@vannilla.org';
 
     var commandHandler = function() {
         switch ( this.id ) {