13 files changed, 73 insertions, 74 deletions
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");