Index: lib/subscriptionClasses.js
===================================================================
--- a/lib/subscriptionClasses.js
+++ b/lib/subscriptionClasses.js
@@ -18,17 +18,17 @@
 "use strict";
 
 /**
  * @fileOverview Definition of Subscription class and its subclasses.
  */
 
 const {ActiveFilter, BlockingFilter,
        WhitelistFilter, ElemHideBase} = require("./filterClasses");
-const {FilterNotifier} = require("./filterNotifier");
+const {filterNotifier} = require("./filterNotifier");
 const {extend} = require("./coreUtils");
 
 /**
  * Abstract base class for filter subscriptions
  *
  * @param {string} url    download location of the subscription
  * @param {string} [title]  title of the filter subscription
  * @constructor
@@ -76,17 +76,17 @@
     return this._title;
   },
   set title(value)
   {
     if (value != this._title)
     {
       let oldValue = this._title;
       this._title = value;
-      FilterNotifier.emit("subscription.title", this, value, oldValue);
+      filterNotifier.emit("subscription.title", this, value, oldValue);
     }
     return this._title;
   },
 
   /**
    * Determines whether the title should be editable
    * @type {boolean}
    */
@@ -95,17 +95,17 @@
     return this._fixedTitle;
   },
   set fixedTitle(value)
   {
     if (value != this._fixedTitle)
     {
       let oldValue = this._fixedTitle;
       this._fixedTitle = value;
-      FilterNotifier.emit("subscription.fixedTitle", this, value, oldValue);
+      filterNotifier.emit("subscription.fixedTitle", this, value, oldValue);
     }
     return this._fixedTitle;
   },
 
   /**
    * Defines whether the filters in the subscription should be disabled
    * @type {boolean}
    */
@@ -114,17 +114,17 @@
     return this._disabled;
   },
   set disabled(value)
   {
     if (value != this._disabled)
     {
       let oldValue = this._disabled;
       this._disabled = value;
-      FilterNotifier.emit("subscription.disabled", this, value, oldValue);
+      filterNotifier.emit("subscription.disabled", this, value, oldValue);
     }
     return this._disabled;
   },
 
   /**
    * Serializes the subscription to an array of strings for writing
    * out on the disk.
    * @param {string[]} buffer  buffer to push the serialization results into
@@ -365,17 +365,17 @@
     return this._homepage;
   },
   set homepage(value)
   {
     if (value != this._homepage)
     {
       let oldValue = this._homepage;
       this._homepage = value;
-      FilterNotifier.emit("subscription.homepage", this, value, oldValue);
+      filterNotifier.emit("subscription.homepage", this, value, oldValue);
     }
     return this._homepage;
   },
 
   /**
    * Time of the last subscription download (in seconds since the
    * beginning of the epoch)
    * @type {number}
@@ -385,17 +385,17 @@
     return this._lastDownload;
   },
   set lastDownload(value)
   {
     if (value != this._lastDownload)
     {
       let oldValue = this._lastDownload;
       this._lastDownload = value;
-      FilterNotifier.emit("subscription.lastDownload", this, value, oldValue);
+      filterNotifier.emit("subscription.lastDownload", this, value, oldValue);
     }
     return this._lastDownload;
   },
 
   /**
    * See Subscription.serialize()
    * @inheritdoc
    */
@@ -460,17 +460,17 @@
   get downloadStatus()
   {
     return this._downloadStatus;
   },
   set downloadStatus(value)
   {
     let oldValue = this._downloadStatus;
     this._downloadStatus = value;
-    FilterNotifier.emit("subscription.downloadStatus", this, value, oldValue);
+    filterNotifier.emit("subscription.downloadStatus", this, value, oldValue);
     return this._downloadStatus;
   },
 
   /**
    * Time of the last successful download (in seconds since the beginning of the
    * epoch).
    */
   lastSuccess: 0,
@@ -487,17 +487,17 @@
     return this._lastCheck;
   },
   set lastCheck(value)
   {
     if (value != this._lastCheck)
     {
       let oldValue = this._lastCheck;
       this._lastCheck = value;
-      FilterNotifier.emit("subscription.lastCheck", this, value, oldValue);
+      filterNotifier.emit("subscription.lastCheck", this, value, oldValue);
     }
     return this._lastCheck;
   },
 
   /**
    * Hard expiration time of the filter subscription (in seconds since
    * the beginning of the epoch)
    * @type {number}
@@ -520,17 +520,17 @@
     return this._errors;
   },
   set errors(value)
   {
     if (value != this._errors)
     {
       let oldValue = this._errors;
       this._errors = value;
-      FilterNotifier.emit("subscription.errors", this, value, oldValue);
+      filterNotifier.emit("subscription.errors", this, value, oldValue);
     }
     return this._errors;
   },
 
   /**
    * Version of the subscription data retrieved on last successful download
    * @type {number}
    */