Index: test/filterStorage.js
===================================================================
--- a/test/filterStorage.js
+++ b/test/filterStorage.js
@@ -15,50 +15,50 @@
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 const {createSandbox} = require("./_common");
 
 let Filter = null;
-let FilterNotifier = null;
+let filterNotifier = null;
 let FilterStorage = null;
 let Subscription = null;
 
 exports.setUp = function(callback)
 {
   let sandboxedRequire = createSandbox();
 
   sandboxedRequire("../lib/filterListener");
   (
     {Filter} = sandboxedRequire("../lib/filterClasses"),
-    {FilterNotifier} = sandboxedRequire("../lib/filterNotifier"),
+    {filterNotifier} = sandboxedRequire("../lib/filterNotifier"),
     {FilterStorage} = sandboxedRequire("../lib/filterStorage"),
     {Subscription} = sandboxedRequire("../lib/subscriptionClasses")
   );
 
   callback();
 };
 
 function addListener(listener)
 {
   let makeWrapper = name => (...args) => listener(name, ...args);
 
-  FilterNotifier.on("subscription.added", makeWrapper("subscription.added"));
-  FilterNotifier.on("subscription.removed",
+  filterNotifier.on("subscription.added", makeWrapper("subscription.added"));
+  filterNotifier.on("subscription.removed",
                     makeWrapper("subscription.removed"));
-  FilterNotifier.on("subscription.moved", makeWrapper("subscription.moved"));
+  filterNotifier.on("subscription.moved", makeWrapper("subscription.moved"));
 
-  FilterNotifier.on("filter.added", makeWrapper("filter.added"));
-  FilterNotifier.on("filter.removed", makeWrapper("filter.removed"));
-  FilterNotifier.on("filter.moved", makeWrapper("filter.moved"));
+  filterNotifier.on("filter.added", makeWrapper("filter.added"));
+  filterNotifier.on("filter.removed", makeWrapper("filter.removed"));
+  filterNotifier.on("filter.moved", makeWrapper("filter.moved"));
 
-  FilterNotifier.on("filter.hitCount", makeWrapper("filter.hitCount"));
-  FilterNotifier.on("filter.lastHit", makeWrapper("filter.lastHit"));
+  filterNotifier.on("filter.hitCount", makeWrapper("filter.hitCount"));
+  filterNotifier.on("filter.lastHit", makeWrapper("filter.lastHit"));
 }
 
 function compareSubscriptionList(test, testMessage, list,
                                  knownSubscriptions = null)
 {
   let result = FilterStorage.subscriptions.map(subscription => subscription.url);
   let expected = list.map(subscription => subscription.url);
   test.deepEqual(result, expected, testMessage);