version 6.0.14

Rebrand of LibreJS under Unified XUL Platform

48 files changed, 301 insertions, 302 deletions

diff --git a/lib/addon_management/install_uninstall.js b/lib/addon_management/install_uninstall.js
index 084b448..040d003 100644
--- a/lib/addon_management/install_uninstall.js
+++ b/lib/addon_management/install_uninstall.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -57,7 +57,7 @@ exports.onUnload = function(reason) {
 
 exports.onLoad = function () {
   try {
-    var clearCache = prompt.dialog(null, "LibreJS installation", "If you have tabs and windows opened prior to installing LibreJS, you will have to refresh them for their JavaScript to be analyzed and blocked. Press OK to clear the browser cache.");
+    var clearCache = prompt.dialog(null, "LibreJSXUL installation", "If you have tabs and windows opened prior to installing LibreJSXUL. you will have to refresh them for their JavaScript to be analyzed and blocked. Press OK to clear the browser cache.");
     if (clearCache) {
 	    caching.clearAllCache();
     }
diff --git a/lib/addon_management/prefchange.js b/lib/addon_management/prefchange.js
index 48a8765..fa31d99 100644
--- a/lib/addon_management/prefchange.js
+++ b/lib/addon_management/prefchange.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var whitelist = [];
@@ -67,10 +67,10 @@ prefSet.on("whitelist", setWhitelist);
 /*var setDryRun = function () {
     var dryRun = prefSet.prefs.dryrun;
     if (dryRun === true) {
-        prompt.alert(null, "LibreJS Dry Run Mode", "Is Dry Run Mode really what you want? LibreJS will still analyze JavaScript on a page, but it will not block any of it. As a result, ALL of the JavaScript on a page will run as is, whether it is free and trivial or not. You will not be warned again. Uncheck that box if you are unsure.");
+        prompt.alert(null, "LibreJSXUL Dry Run Mode", "Is Dry Run Mode really what you want? LibreJSXUL will still analyze JavaScript on a page, but it will not block any of it. As a result, ALL of the JavaScript on a page will run as is, whether it is free and trivial or not. You will not be warned again. Uncheck that box if you are unsure.");
         scriptsCached.resetCache();
     } else {
-        prompt.alert(null, "LibreJS Dry Run Mode", "LibreJS Dry Run Mode is now disabled");
+        prompt.alert(null, "LibreJSXUL Dry Run Mode", "LibreJSXUL Dry Run Mode is now disabled");
     }
 };*/
 
@@ -102,7 +102,7 @@ exports.isComplaintTab = function () {
 var setDisplayNotifications = function () {
     var displayNotifications = prefSet.prefs.display_notifications;
     if (displayNotifications === true) {
-        prompt.alert(null, "Turning on notifications", "Notifications with code snippets will now appear while LibreJS is analyzing JavaScript on a page.");
+        prompt.alert(null, "Turning on notifications", "Notifications with code snippets will now appear while LibreJSXUL is analyzing JavaScript on a page.");
     } else {
         prompt.alert(null, "Turning off notifications", "Notifications of code being analyzed will not be displayed.");
     }
diff --git a/lib/html_script_finder/bug_fix.js b/lib/html_script_finder/bug_fix.js
index c6bcb16..d770d4a 100644
--- a/lib/html_script_finder/bug_fix.js
+++ b/lib/html_script_finder/bug_fix.js
@@ -1,24 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-exports.END_OF_SCRIPT = 'this.narcissusBugFixLibreJS'; // value from parse tree without \n\n
-exports.narcissusBugFixLibreJS = '\n\n' + exports.END_OF_SCRIPT; // real value from source.
-
+exports.END_OF_SCRIPT = 'this.narcissusBugFixLibreJSXUL'; // value from parse tree without \n\n
+exports.narcissusBugFixLibreJSXUL = '\n\n' + exports.END_OF_SCRIPT; // real value from source.
diff --git a/lib/html_script_finder/dom_handler.js b/lib/html_script_finder/dom_handler.js
index e16f673..9d49ced 100644
--- a/lib/html_script_finder/dom_handler.js
+++ b/lib/html_script_finder/dom_handler.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -449,10 +449,10 @@ DomHandler.prototype.removeGivenJs = function (script, reason, singleton, hash)
             }
         }
         if (isAllowed) {
-            comment_str = 'LibreJS: Script should be blocked, but page is whitelisted.';
+            comment_str = 'LibreJSXUL: Script should be blocked, but page is whitelisted.';
             script.status = statusTypes.ACCEPTED;
         } else {
-            comment_str = 'LibreJS: script blocked.';
+            comment_str = 'LibreJSXUL: script blocked.';
             script.status = statusTypes.REJECTED;
         }
 
diff --git a/lib/html_script_finder/dom_handler/attributes.js b/lib/html_script_finder/dom_handler/attributes.js
index ac603fe..f493953 100644
--- a/lib/html_script_finder/dom_handler/attributes.js
+++ b/lib/html_script_finder/dom_handler/attributes.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 // object model for script entries.
diff --git a/lib/html_script_finder/dom_handler/dom_checker.js b/lib/html_script_finder/dom_handler/dom_checker.js
index b4d27b2..cdf5edd 100644
--- a/lib/html_script_finder/dom_handler/dom_checker.js
+++ b/lib/html_script_finder/dom_handler/dom_checker.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lib/html_script_finder/dom_handler/dom_gatherer.js b/lib/html_script_finder/dom_handler/dom_gatherer.js
index ce29cf6..c9abf56 100644
--- a/lib/html_script_finder/dom_handler/dom_gatherer.js
+++ b/lib/html_script_finder/dom_handler/dom_gatherer.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var scriptProperties = require("./script_properties");
@@ -246,9 +246,9 @@ DomGatherer.prototype.gatherScriptsContent = function() {
                 } else if (this.d.domScripts[i].text !== '') {
                     // using else if since script text is
                     // ignored if src attribute is set.
-                    // adding this.narcissusBugFixLibreJS to fix comment bug.
+                    // adding this.narcissusBugFixLibreJSXUL to fix comment bug.
                     var bugfix = require('../../html_script_finder/bug_fix')
-                        .narcissusBugFixLibreJS;
+                        .narcissusBugFixLibreJSXUL;
                     currentScript = stripHtmlCommentsInScript(
                         this.d.domScripts[i].text + bugfix);
 
diff --git a/lib/html_script_finder/dom_handler/request.js b/lib/html_script_finder/dom_handler/request.js
index f25ba8f..2cbb411 100644
--- a/lib/html_script_finder/dom_handler/request.js
+++ b/lib/html_script_finder/dom_handler/request.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var timer = require("sdk/timers");
diff --git a/lib/html_script_finder/dom_handler/script_object.js b/lib/html_script_finder/dom_handler/script_object.js
index 64468b4..ac21cab 100644
--- a/lib/html_script_finder/dom_handler/script_object.js
+++ b/lib/html_script_finder/dom_handler/script_object.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var removedScripts = require("../../script_entries/removed_scripts")
@@ -185,7 +185,7 @@ Script.prototype.tagAsDryRun = function(pageURL, reason, hash) {
  *
  */
 Script.prototype.removeNarcissusBugLine = function(str) {
-    return str.replace('\n\nthis.narcissusBugFixLibreJS', '');
+    return str.replace('\n\nthis.narcissusBugFixLibreJSXUL', '');
 };
 
 /**
diff --git a/lib/html_script_finder/dom_handler/script_properties.js b/lib/html_script_finder/dom_handler/script_properties.js
index 07af983..1faad95 100644
--- a/lib/html_script_finder/dom_handler/script_properties.js
+++ b/lib/html_script_finder/dom_handler/script_properties.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 exports.scriptTypes = {
diff --git a/lib/html_script_finder/html_parser.js b/lib/html_script_finder/html_parser.js
index ab36eaf..4d17462 100644
--- a/lib/html_script_finder/html_parser.js
+++ b/lib/html_script_finder/html_parser.js
@@ -47,25 +47,25 @@
  */
 
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lib/html_script_finder/url_seen_tester.js b/lib/html_script_finder/url_seen_tester.js
index fbba0c0..e06f152 100644
--- a/lib/html_script_finder/url_seen_tester.js
+++ b/lib/html_script_finder/url_seen_tester.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var httpRe = /^(http:)/i;
diff --git a/lib/html_script_finder/web_labels/find_js_labels.js b/lib/html_script_finder/web_labels/find_js_labels.js
index e392024..3986e0f 100644
--- a/lib/html_script_finder/web_labels/find_js_labels.js
+++ b/lib/html_script_finder/web_labels/find_js_labels.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/lib/html_script_finder/web_labels/js_web_labels.js b/lib/html_script_finder/web_labels/js_web_labels.js
index 0cb64bf..13e1c9f 100644
--- a/lib/html_script_finder/web_labels/js_web_labels.js
+++ b/lib/html_script_finder/web_labels/js_web_labels.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 // node.js url module. Makes it easier to resolve
@@ -153,7 +153,7 @@ WebLabelFinder.prototype.fetchLicensePage = function() {
 /**
  * @method isLicenseFree
  * Returns true if the given web labels row refers to a script that
- * can be executed by LibreJS.
+ * can be executed by LibreJSXUL.
  *
  * This method has some side effects :-/
  *
diff --git a/lib/html_script_finder/web_labels/script_hash_worker.js b/lib/html_script_finder/web_labels/script_hash_worker.js
index 4ed9d21..90c95f5 100644
--- a/lib/html_script_finder/web_labels/script_hash_worker.js
+++ b/lib/html_script_finder/web_labels/script_hash_worker.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 const types = require("../../js_checker/constant_types");
diff --git a/lib/http_observer/allowed_referrers.js b/lib/http_observer/allowed_referrers.js
index 06d860b..712cc8a 100644
--- a/lib/http_observer/allowed_referrers.js
+++ b/lib/http_observer/allowed_referrers.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var prefChange = require("../addon_management/prefchange");
diff --git a/lib/http_observer/caching.js b/lib/http_observer/caching.js
index 285f95a..60d481c 100644
--- a/lib/http_observer/caching.js
+++ b/lib/http_observer/caching.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
diff --git a/lib/http_observer/http_request_observer.js b/lib/http_observer/http_request_observer.js
index 0b6e14d..ae2726d 100644
--- a/lib/http_observer/http_request_observer.js
+++ b/lib/http_observer/http_request_observer.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
diff --git a/lib/http_observer/process_response.js b/lib/http_observer/process_response.js
index 72f236c..6bd518e 100644
--- a/lib/http_observer/process_response.js
+++ b/lib/http_observer/process_response.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -219,7 +219,7 @@ var processResponseObject = {
             console.debug('js error in js app, removing script', e);
             console.debug("error", e, e.lineNumber);
             // modify data that will be sent to the browser.
-            this.data = '// LibreJS: Script contents were removed when it was loaded from a page, because another script attempted to load this one dynamically. Please place your cursor in the url bar and press the enter key to see the source.';
+            this.data = '// LibreJSXUL: Script contents were removed when it was loaded from a page, because another script attempted to load this one dynamically. Please place your cursor in the url bar and press the enter key to see the source.';
             this.jsListenerCallback();
         }
 
@@ -296,7 +296,7 @@ var processResponseObject = {
                     removedScripts.addAScript(this.req.referrer.spec, scriptObj);
 
                     // modify data that will be sent to the browser.
-                    this.data = '// LibreJS: Script contents were removed when it was loaded from a page, because another script attempted to load this one dynamically and its contents appear to be nonfree/nontrivial. Please hit enter in the location bar to see the actual source.';
+                    this.data = '// LibreJSXUL: Script contents were removed when it was loaded from a page, because another script attempted to load this one dynamically and its contents appear to be nonfree/nontrivial. Please hit enter in the location bar to see the actual source.';
                 } else {
                     console.debug("writing to dry run", this.url);
                     scriptObj = {
@@ -348,7 +348,7 @@ var processResponseObject = {
      * original listener.
      */
     processAllTypes: function() {
-        // toggle xlibrejs if X-LibreJS is set.
+        // toggle xlibrejs if X-LibreJSXUL is set.
 
         // process HTML
         if ((htmlMimeTypeRe.test(this.contentType) ||
diff --git a/lib/http_observer/stream_loader.js b/lib/http_observer/stream_loader.js
index c790fe2..66c9016 100644
--- a/lib/http_observer/stream_loader.js
+++ b/lib/http_observer/stream_loader.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 
diff --git a/lib/js_checker/constant_types.js b/lib/js_checker/constant_types.js
index a2da0da..a1ef732 100644
--- a/lib/js_checker/constant_types.js
+++ b/lib/js_checker/constant_types.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 //var debug = require("debug/debug");
 
diff --git a/lib/js_checker/free_checker.js b/lib/js_checker/free_checker.js
index 9da4b35..cd1b421 100644
--- a/lib/js_checker/free_checker.js
+++ b/lib/js_checker/free_checker.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var licenses = require('./license_definitions');
@@ -185,10 +185,10 @@ exports.freeCheck = {
      *  checkIsLastJsNode.
      *  returns true if n is the last node.
      *  Or if nodes before it are only comments etc (not valid code.)
-     *  A special LibreJS node is appended at the end of a script tree to
+     *  A special LibreJSXUL node is appended at the end of a script tree to
      *  check if this is the last (and also for narcissus to keep the last comment
      *  in the tree.)
-     * TODO: Refactor LibreJS so that END nodes can have a comment.
+     * TODO: Refactor LibreJSXUL so that END nodes can have a comment.
      */
     checkIsLastNode: function (n) {
         // first check if the comment is part of the very last statement.
diff --git a/lib/js_checker/js_checker.js b/lib/js_checker/js_checker.js
index ecf0826..1d1fed9 100644
--- a/lib/js_checker/js_checker.js
+++ b/lib/js_checker/js_checker.js
@@ -1,24 +1,24 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  * Copyright (C) 2015 Ruben Rodriguez
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
@@ -45,23 +45,23 @@ const timer = require("sdk/timers");
 var callbackMap = {};
 
 /**
- * 
- * Pairs a hash with a given callback 
+ *
+ * Pairs a hash with a given callback
  * method from an object.
- * 
+ *
  */
 var setHashCallback = function(hash, callback, notification) {
     console.debug('setHashCallback', hash);
     if (hash in callbackMap && isDryRun()) {
         // workaround for issue with dryrun after checking box.
         // do nothing.
-        callbackMap[hash] = callback;    
+        callbackMap[hash] = callback;
     } else if (hash in callbackMap) {
         console.debug("callback", callbackMap[hash]);
         if (notification && typeof notification.close === 'function') {
             notification.close();
         }
-        throw Error("already being checked.");	
+        throw Error("already being checked.");
     } else {
         console.debug('setting callbackMap for', hash, 'to', callback);
         callbackMap[hash] = callback;
@@ -78,7 +78,7 @@ var removeHashCallback = function(hash) {
 
 /**
  * find callback and return result (parse tree).
- * 
+ *
  */
 exports.callbackHashResult = function(hash, result) {
     console.debug('typeof callbackMap function:', typeof callbackMap[hash]);
@@ -167,7 +167,7 @@ JsChecker.prototype.isFreeLicensed = function(script) {
 JsChecker.prototype.searchJs = function(jsCode, resultReady, url) {
     var that = this;
     var bugfix = require('../html_script_finder/bug_fix')
-        .narcissusBugFixLibreJS;
+        .narcissusBugFixLibreJSXUL;
     console.debug('JsChecker.searchJs for script url:', url);
     this.url = url;
     this.resultReady = resultReady;
@@ -177,7 +177,7 @@ JsChecker.prototype.searchJs = function(jsCode, resultReady, url) {
         .createNotification(this.shortText).notification;
 
     var verbatimCode = this.jsCode.replace(bugfix, '');
-    this.hash = scriptsCached.getHash(verbatimCode);    
+    this.hash = scriptsCached.getHash(verbatimCode);
     var isCached = scriptsCached.isCached(verbatimCode, this.hash);
     if (isCached) {
         console.debug("We have it cached indeed!");
@@ -254,14 +254,14 @@ JsChecker.prototype.handleTree = function(tree, errorMessage) {
 
 /**
  * getCheckerResult
- * 
+ *
  * Callback to Assign result from walkTree to property.
  * reset parse tree. create cache entry.
- * 
+ *
  */
 JsChecker.prototype.getCheckerResult = function(result) {
     // done with parse tree. Get rid of it.
-    this.parseTree = {}; 
+    this.parseTree = {};
     this.removeNotification();
 
     this.parseTree.nonTrivialChecker = this.nonTrivialChecker;
@@ -279,13 +279,13 @@ JsChecker.prototype.getCheckerResult = function(result) {
 /**
  * trivialCheck
  *
- * Runs nodes through a series of conditional statements 
+ * Runs nodes through a series of conditional statements
  * to find out whether it is trivial or not.
  *
  * @param {object} n. The current node being studied.
- * @param {string} t. The type of node being studied 
+ * @param {string} t. The type of node being studied
  * (initializer, functionbody, try block, ...)
- * 
+ *
  */
 JsChecker.prototype.trivialCheck = function(n) {
     return this.nonTrivialChecker.checkNontrivial(n);
@@ -294,12 +294,12 @@ JsChecker.prototype.trivialCheck = function(n) {
 /**
  * freeCheck
  *
- * Check if comments above current node could be a free licence. 
+ * Check if comments above current node could be a free licence.
  * If it is, then the script will be flagged as free.
  *
  * @param {object} n. The current node being studied.
  * (initializer, functionbody, try block, ...)
- * 
+ *
  */
 JsChecker.prototype.freeCheck = function(n, ntype) {
     var check = freeChecker.freeCheck.checkNodeFreeLicense(n, this.queue);
@@ -308,8 +308,8 @@ JsChecker.prototype.freeCheck = function(n, ntype) {
 
 /**
  * walkTree
- * 
- * An iterative functionwalking the parse tree generated by 
+ *
+ * An iterative functionwalking the parse tree generated by
  * Narcissus.
  *
  * @param {object} node. The original node.
@@ -317,10 +317,10 @@ JsChecker.prototype.freeCheck = function(n, ntype) {
  */
 JsChecker.prototype.walkTree = function(node) {
     var queue = [node];
-    var i, 
+    var i,
         len,
-        n, counter = 0, 
-        result, 
+        n, counter = 0,
+        result,
         processQueue,
         that = this;
 
@@ -352,7 +352,7 @@ JsChecker.prototype.walkTree = function(node) {
                 // fetch all the children.
                 len = n.children.length;
                 for (i = 0; i < len; i++) {
-                    if (n.children[i] != undefined && 
+                    if (n.children[i] != undefined &&
                         n.children[i].visited == undefined
                        ) {
                         // figure out siblings.
@@ -374,11 +374,11 @@ JsChecker.prototype.walkTree = function(node) {
             if (n.type != undefined) {
                 // fetch all properties that may have nodes.
                 for (var item in n) {
-                    if (item != 'tokenizer' && 
+                    if (item != 'tokenizer' &&
                             item != 'children' &&
-                            item != 'length' && 
-                            n[item] != null && 
-                            typeof n[item] === 'object' && 
+                            item != 'length' &&
+                            n[item] != null &&
+                            typeof n[item] === 'object' &&
                             n[item].type != undefined &&
                             n[item].visited == undefined
                        ) {
@@ -413,7 +413,7 @@ JsChecker.prototype.walkTree = function(node) {
                 if ((end - start) > 30) {
 
                     // been running more than 20ms, pause
-                    // for 10 ms before calling processQueue 
+                    // for 10 ms before calling processQueue
                     // again.
                     timer.setTimeout(processQueue, 8);
                     return;
@@ -451,10 +451,10 @@ JsChecker.prototype.cancelWalkTree = function() {
 
 /**
  * walkTreeComplete
- * 
+ *
  * Trigger when the walkTree has been completed or
  * when it has been cut short.
- * 
+ *
  */
 JsChecker.prototype.walkTreeComplete = function(result) {
     var that = this;
@@ -499,9 +499,9 @@ JsChecker.prototype.walkTreeComplete = function(result) {
 
 /**
  * checkNode
- * 
+ *
  * checks a single node.
- * 
+ *
  */
 JsChecker.prototype.checkNode = function(n) {
     var sub;
diff --git a/lib/js_checker/license_definitions.js b/lib/js_checker/license_definitions.js
index 26e56a0..90107e4 100644
--- a/lib/js_checker/license_definitions.js
+++ b/lib/js_checker/license_definitions.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 exports.types = {
     SHORT: 'short',
diff --git a/lib/js_checker/nontrivial_checker.js b/lib/js_checker/nontrivial_checker.js
index 1c79a2a..21cf478 100644
--- a/lib/js_checker/nontrivial_checker.js
+++ b/lib/js_checker/nontrivial_checker.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 const types = require("./constant_types");
 
diff --git a/lib/js_checker/pattern_utils.js b/lib/js_checker/pattern_utils.js
index b3e84d6..ebb0b2e 100644
--- a/lib/js_checker/pattern_utils.js
+++ b/lib/js_checker/pattern_utils.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 exports.patternUtils = {
diff --git a/lib/js_checker/privacy_checker.js b/lib/js_checker/privacy_checker.js
index fe0fa8a..3e6d747 100644
--- a/lib/js_checker/privacy_checker.js
+++ b/lib/js_checker/privacy_checker.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 const privacyThreatJs = require('./privacy_threat_definitions.js');
diff --git a/lib/js_checker/privacy_threat_definitions.js b/lib/js_checker/privacy_threat_definitions.js
index fd04dcf..49e503f 100644
--- a/lib/js_checker/privacy_threat_definitions.js
+++ b/lib/js_checker/privacy_threat_definitions.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 exports.js = {
diff --git a/lib/js_checker/relation_checker.js b/lib/js_checker/relation_checker.js
index 21580a9..50769c0 100644
--- a/lib/js_checker/relation_checker.js
+++ b/lib/js_checker/relation_checker.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 /**
  * relation_checker.js
diff --git a/lib/js_load_observer/js_load_observer.js b/lib/js_load_observer/js_load_observer.js
index 525f58f..ddc4325 100644
--- a/lib/js_load_observer/js_load_observer.js
+++ b/lib/js_load_observer/js_load_observer.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
@@ -71,7 +71,7 @@ ScriptAnalyzer.prototype.analyzeScriptBeforeExec = function (e) {
             // file:// types of pages are allowed.
 
             // set invalid type so that the script is detected
-            // by LibreJS as blocked (although it's blocked using
+            // by LibreJSXUL as blocked (although it's blocked using
             // preventDefault().
             script.setAttribute('type', 'librejs/blocked');
             //script.setAttribute('data-librejs-blocked', 'dynamically');
diff --git a/lib/main.js b/lib/main.js
index b704aad..990dfb9 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 // Uncomment the following to start debugging, or do it from about:config.
@@ -45,10 +45,10 @@ var cachedResult = librejsStorage.init();
 librejsStorage.generateCacheFromDB();
 
 exports.main = function(options, callbacks) {
-    if (options.loadReason === 'enable' || 
-	    options.loadReason === 'install'
+    if (options.loadReason === 'enable' ||
+        options.loadReason === 'install'
        ) {
-	    addonManage.onLoad();
+        addonManage.onLoad();
     }
 };
 
diff --git a/lib/parser/narcissus_worker.js b/lib/parser/narcissus_worker.js
index e9829b4..ffbd167 100644
--- a/lib/parser/narcissus_worker.js
+++ b/lib/parser/narcissus_worker.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var data = require("sdk/self").data;
diff --git a/lib/pref_observer/pref_observer.js b/lib/pref_observer/pref_observer.js
index 2c5e360..7ad63b1 100644
--- a/lib/pref_observer/pref_observer.js
+++ b/lib/pref_observer/pref_observer.js
@@ -1,22 +1,22 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var {Cc, Ci} = require("chrome");
diff --git a/lib/preferences/preferences.js b/lib/preferences/preferences.js
index 46d2a46..df9d695 100644
--- a/lib/preferences/preferences.js
+++ b/lib/preferences/preferences.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 var data = require("sdk/self").data;
 var panel = require("sdk/panel");
diff --git a/lib/script_entries/accepted_scripts.js b/lib/script_entries/accepted_scripts.js
index bac11f0..ddb07d8 100644
--- a/lib/script_entries/accepted_scripts.js
+++ b/lib/script_entries/accepted_scripts.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var allScripts = require('./all_scripts').allScripts;
diff --git a/lib/script_entries/all_scripts.js b/lib/script_entries/all_scripts.js
index c27a410..f7f9b11 100644
--- a/lib/script_entries/all_scripts.js
+++ b/lib/script_entries/all_scripts.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var crypto = require('./crypto');
diff --git a/lib/script_entries/crypto.js b/lib/script_entries/crypto.js
index 9393e8b..0eb09dd 100644
--- a/lib/script_entries/crypto.js
+++ b/lib/script_entries/crypto.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
diff --git a/lib/script_entries/dryrun_scripts.js b/lib/script_entries/dryrun_scripts.js
index a15b0b2..9c78ea0 100644
--- a/lib/script_entries/dryrun_scripts.js
+++ b/lib/script_entries/dryrun_scripts.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var allScripts = require('./all_scripts').allScripts;
diff --git a/lib/script_entries/free_libraries.js b/lib/script_entries/free_libraries.js
index 291b982..bd83eb8 100644
--- a/lib/script_entries/free_libraries.js
+++ b/lib/script_entries/free_libraries.js
@@ -1,26 +1,26 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// THIS MODULE IS DEPRECATED IN FAVOR OF THE NEW WHITELISTING MODULE (LibreJS 6.0)
+// THIS MODULE IS DEPRECATED IN FAVOR OF THE NEW WHITELISTING MODULE (LibreJSXUL 6.0)
 
 var relationChecker = require("../js_checker/relation_checker")
     .relationChecker;
@@ -32,7 +32,7 @@ var scriptsCached = require("./scripts_cache").scriptsCached;
 var dbContents = require("sdk/self").data.load(
     "script_libraries/script-libraries.json");
 
-const AUTHOR_REASON = "This script has been tagged as free software by LibreJS authors.";
+const AUTHOR_REASON = "This script has been tagged as free software by LibreJSXUL authors.";
 
 var freeLibraries = JSON.parse(dbContents); /* a database of the free libraries recognized by default */
 
diff --git a/lib/script_entries/removed_scripts.js b/lib/script_entries/removed_scripts.js
index 2a3b1d3..3b1ecc9 100644
--- a/lib/script_entries/removed_scripts.js
+++ b/lib/script_entries/removed_scripts.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var allScripts = require('./all_scripts').allScripts;
diff --git a/lib/script_entries/scripts_cache.js b/lib/script_entries/scripts_cache.js
index 52ae33f..7589e98 100644
--- a/lib/script_entries/scripts_cache.js
+++ b/lib/script_entries/scripts_cache.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 var relationCheckerObj = require("../js_checker/relation_checker")
     .relationChecker;
diff --git a/lib/settings/settings_tab.js b/lib/settings/settings_tab.js
index 6e28ef6..a6a7cdb 100644
--- a/lib/settings/settings_tab.js
+++ b/lib/settings/settings_tab.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 const tabs = require("sdk/tabs");
 const data = require("sdk/self").data;
diff --git a/lib/settings/storage.js b/lib/settings/storage.js
index abd42e6..7569f21 100644
--- a/lib/settings/storage.js
+++ b/lib/settings/storage.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 /*jshint esnext: true */
 
@@ -168,7 +168,7 @@ let librejsStorage = {
                 entry.result = {
                     'type': 4,
                     'reason': 'This script has been tagged as free ' +
-                        'software by LibreJS authors.'
+                        'software by LibreJSXUL authors.'
                 };
             }
             entry.relationChecker = rc;
diff --git a/lib/ui.js b/lib/ui.js
index 9229c4c..1354b76 100644
--- a/lib/ui.js
+++ b/lib/ui.js
@@ -1,22 +1,22 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 let data = require("sdk/self").data;
@@ -121,7 +121,7 @@ let UI = exports.UI = {
 
         var toggleButton = ToggleButton({
             id: 'librejs-toggle-switch',
-            label: 'LibreJS',
+            label: 'LibreJSXUL',
             icon: {
                 '16': './widget/images/librejs.png',
                 '32': './widget/images/librejs-32.png',
@@ -140,7 +140,7 @@ let UI = exports.UI = {
         var menuitem = require("menuitem").Menuitem({
             id: 'librejs_settings',
             menuid: 'menu_ToolsPopup',
-            label: 'LibreJS Whitelist',
+            label: 'LibreJSXUL Whitelist',
             onCommand: function() {
                 settings_tab.settingsManager.open();
             },
diff --git a/lib/ui/notification.js b/lib/ui/notification.js
index c49b083..02d05f5 100644
--- a/lib/ui/notification.js
+++ b/lib/ui/notification.js
@@ -1,26 +1,26 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// this module is used to display a notification when LibreJS 
+// this module is used to display a notification when LibreJSXUL
 // is running to inform the user it is indeed busy working.
 const timer = require("sdk/timers");
 const self = require("sdk/self");
@@ -57,15 +57,15 @@ exports.createNotification = function (jsValue) {
     var self = require('sdk/self');
     var notif = require("notification-box").NotificationBox({
         'value': 'librejs-message',
-        'label': 'LibreJS is analyzing: ' + jsValue + " ...",
+        'label': 'LibreJSXUL is analyzing: ' + jsValue + " ...",
         'priority': 'INFO_LOW',
         'image': self.data.url("assets/images/torchy2.png"),
         /*'buttons': [{'label': "Fine",
           'onClick': function () { }}]*/
     });
-    timer.setTimeout(function () { 
+    timer.setTimeout(function () {
         // ensure notifications are ALWAYS removed at some point.
-        console.debug("removing after 2 seconds"); 
+        console.debug("removing after 2 seconds");
         try {
             var n = notif.notificationbox
                 .getNotificationWithValue('librejs-message');
diff --git a/lib/ui/script_panel.js b/lib/ui/script_panel.js
index 12c25ae..535fc6d 100644
--- a/lib/ui/script_panel.js
+++ b/lib/ui/script_panel.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 var urlHandler = require("../url_handler/url_handler");
diff --git a/lib/ui/ui_info.js b/lib/ui/ui_info.js
index 8b5ad81..8ded9ad 100644
--- a/lib/ui/ui_info.js
+++ b/lib/ui/ui_info.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 // page mod executing content script at every page load.
diff --git a/lib/url_handler/url_handler.js b/lib/url_handler/url_handler.js
index 234dff5..3faea17 100644
--- a/lib/url_handler/url_handler.js
+++ b/lib/url_handler/url_handler.js
@@ -1,23 +1,23 @@
 /**
- * GNU LibreJS - A browser add-on to block nonfree nontrivial JavaScript.
+ * GNU LibreJSXUL - A browser add-on to block nonfree nontrivial JavaScript.
  * *
  * Copyright (C) 2011, 2012, 2013, 2014 Loic J. Duros
  * Copyright (C) 2014, 2015 Nik Nyby
  *
- * This file is part of GNU LibreJS.
+ * This file is part of GNU LibreJSXUL.
  *
- * GNU LibreJS is free software: you can redistribute it and/or modify
+ * GNU LibreJSXUL is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * GNU LibreJS is distributed in the hope that it will be useful,
+ * GNU LibreJSXUL is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
+ * along with GNU LibreJSXUL.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /**