diff --git a/content/bookmarks.js b/content/bookmarks.js
index acc2bc4f..d17b594d 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -739,7 +739,7 @@ function QuickMarks() //{{{
     /////////////////////////////////////////////////////////////////////////////{{{
 
     var qmarks = {};
-    var saved_marks = Options.getPref("quickmarks", "").split("\n");
+    var saved_marks = vimperator.options.getPref("quickmarks", "").split("\n");
 
     // load the saved quickmarks -- TODO: change to sqlite
     for (var i = 0; i < saved_marks.length - 1; i += 2)
@@ -833,7 +833,7 @@ function QuickMarks() //{{{
             saved_qmarks += qmarks[i] + "\n";
         }
 
-        Options.setPref("quickmarks", saved_qmarks);
+        vimperator.options.setPref("quickmarks", saved_qmarks);
     }
     //}}}
 } //}}}
diff --git a/content/events.js b/content/events.js
index 7bb349b8..ed49fd8b 100644
--- a/content/events.js
+++ b/content/events.js
@@ -499,7 +499,7 @@ function Events() //{{{
                 case vimperator.modes.CARET:
                     // setting this option will trigger an observer which will care about all other details
                     // like setting the NORMAL mode
-                    Options.setFirefoxPref("accessibility.browsewithcaret", false);
+                    vimperator.options.setFirefoxPref("accessibility.browsewithcaret", false);
                     break;
 
                 case vimperator.modes.INSERT:
@@ -905,7 +905,7 @@ function Events() //{{{
             switch (aData)
             {
                 case "accessibility.browsewithcaret":
-                    var value = Options.getFirefoxPref("accessibility.browsewithcaret", false);
+                    var value = vimperator.options.getFirefoxPref("accessibility.browsewithcaret", false);
                     vimperator.mode = value ? vimperator.modes.CARET : vimperator.modes.NORMAL;
                     break;
             }
diff --git a/content/mappings.js b/content/mappings.js
index baa36ff5..774fc683 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -352,7 +352,7 @@ function Mappings() //{{{
         {
             // setting this option triggers an observer
             // which takes care of the mode setting
-            Options.setFirefoxPref("accessibility.browsewithcaret", true);
+            vimperator.options.setFirefoxPref("accessibility.browsewithcaret", true);
         },
         {
             short_help: "Start caret mode",
diff --git a/content/modes.js b/content/modes.js
index 003d2a33..5d43ffa2 100644
--- a/content/modes.js
+++ b/content/modes.js
@@ -103,9 +103,9 @@ vimperator.modes = (function()
 
         if (newmode == vimperator.modes.NORMAL)
         {
-            var value = Options.getFirefoxPref("accessibility.browsewithcaret", false);
+            var value = vimperator.options.getFirefoxPref("accessibility.browsewithcaret", false);
             if (value)
-                Options.setFirefoxPref("accessibility.browsewithcaret", false);
+                vimperator.options.setFirefoxPref("accessibility.browsewithcaret", false);
 
             vimperator.statusline.updateUrl();
             vimperator.focusContent();
diff --git a/content/options.js b/content/options.js
index 152baaec..31b72a9d 100644
--- a/content/options.js
+++ b/content/options.js
@@ -75,7 +75,7 @@ function Option(names, type, extra_info) //{{{
         }
     }
 
-    // NOTE: forced defaults need to use Options.getPref
+    // NOTE: forced defaults need to use vimperator.options.getPref
     this.__defineGetter__("value",
         function()
         {
@@ -363,22 +363,22 @@ function Options() //{{{
 
     // TODO: separate Preferences from Options? Would these utility functions
     // be better placed in the 'core' vimperator namespace somewhere?
-    Options.setPref = function(name, value)
+    this.setPref = function(name, value)
     {
         return storePreference(name, value, true);
     }
 
-    Options.getPref = function(name, forced_default)
+    this.getPref = function(name, forced_default)
     {
         return loadPreference(name, forced_default, true);
     }
 
-    Options.setFirefoxPref = function(name, value)
+    this.setFirefoxPref = function(name, value)
     {
         return storePreference(name, value);
     }
 
-    Options.getFirefoxPref = function(name, forced_default)
+    this.getFirefoxPref = function(name, forced_default)
     {
         return loadPreference(name, forced_default);
     }
@@ -688,7 +688,7 @@ function Options() //{{{
     addOption(new Option(["visualbell", "vb"], "boolean",
         {
             short_help: "Use visual bell instead of beeping on errors",
-            setter: function(value) { Options.setFirefoxPref("accessibility.typeaheadfind.enablesound", !value); },
+            setter: function(value) { vimperator.options.setFirefoxPref("accessibility.typeaheadfind.enablesound", !value); },
             default_value: false
         }
     ));
diff --git a/content/ui.js b/content/ui.js
index 116bea11..61abcaac 100644
--- a/content/ui.js
+++ b/content/ui.js
@@ -57,14 +57,14 @@ function CommandLine() //{{{
 
         load: function()
         {
-            this.cmd = Options.getPref("commandline_cmd_history", "").split("\n");
-            this.search = Options.getPref("commandline_search_history", "").split("\n");
+            this.cmd = vimperator.options.getPref("commandline_cmd_history", "").split("\n");
+            this.search = vimperator.options.getPref("commandline_search_history", "").split("\n");
         },
 
         save: function()
         {
-            Options.setPref("commandline_cmd_history", this.cmd.join("\n"));
-            Options.setPref("commandline_search_history", this.search.join("\n"));
+            vimperator.options.setPref("commandline_cmd_history", this.cmd.join("\n"));
+            vimperator.options.setPref("commandline_search_history", this.search.join("\n"));
         },
 
         add: function(str)
diff --git a/content/vimperator.js b/content/vimperator.js
index 6060515e..4f43f6dd 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -286,7 +286,7 @@ const vimperator = (function() //{{{
         // if msg is an object, it is beautified
         log: function(msg, level)
         {
-            //if (Options.getPref("verbose") >= level) // FIXME: hangs vimperator, probably timing issue --mst
+            //if (vimperator.options.getPref("verbose") >= level) // FIXME: hangs vimperator, probably timing issue --mst
             if (typeof msg == "object")
                 msg = this.objectToString(msg, false);
 
@@ -366,9 +366,9 @@ const vimperator = (function() //{{{
         quit: function(save_session)
         {
             if (save_session)
-                Options.setFirefoxPref("browser.startup.page", 3); // start with saved session
+                vimperator.options.setFirefoxPref("browser.startup.page", 3); // start with saved session
             else
-                Options.setFirefoxPref("browser.startup.page", 1); // start with default homepage session
+                vimperator.options.setFirefoxPref("browser.startup.page", 1); // start with default homepage session
 
             goQuitApplication();
         },
@@ -614,16 +614,16 @@ const vimperator = (function() //{{{
             vimperator.registerCallback("complete", vimperator.modes.EX, function(str) { return vimperator.completion.exTabCompletion(str); } );
 
             // first time intro message
-            if (Options.getPref("firsttime", true))
+            if (vimperator.options.getPref("firsttime", true))
             {
                 setTimeout(function() {
                     vimperator.help(null, null, null, { inTab: true });
-                    Options.setPref("firsttime", false);
+                    vimperator.options.setPref("firsttime", false);
                 }, 1000);
             }
 
             // disable caret browsing initially
-            //Options.setFirefoxPref("accessibility.browsewithcaret", false);
+            //vimperator.options.setFirefoxPref("accessibility.browsewithcaret", false);
             //vimperator.focusContent();
 
             // always start in normal mode