diff --git a/content/bookmarks.js b/content/bookmarks.js
index bc122d0a..7f51628b 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -509,7 +509,7 @@ liberator.History = function () //{{{
         for (var i = 0; i < rootNode.childCount; i++)
         {
             var node = rootNode.getChild(i);
-            // dump("History child " + node.itemId + ": " + node.title + " - " + node.type + "\n");
+            //liberator.dump("History child " + node.itemId + ": " + node.title + " - " + node.type + "\n");
             if (node.type == node.RESULT_TYPE_URI) // just make sure it's a bookmark
                 history.push([node.uri, node.title || "[No title]"]);
         }
diff --git a/content/commands.js b/content/commands.js
index d701f756..f3385c25 100644
--- a/content/commands.js
+++ b/content/commands.js
@@ -427,7 +427,7 @@ liberator.Commands = function () //{{{
                 }
 
                 var sub = str.substr(i);
-                // dump(i + ": " + sub + " - " + onlyArgumentsRemaining + "\n");
+                //liberator.dump(i + ": " + sub + " - " + onlyArgumentsRemaining + "\n");
                 if ((!onlyArgumentsRemaining) && /^--(\s|$)/.test(sub))
                 {
                     onlyArgumentsRemaining = true;
diff --git a/content/events.js b/content/events.js
index 20484386..1a27b170 100644
--- a/content/events.js
+++ b/content/events.js
@@ -488,7 +488,7 @@ liberator.Events = function () //{{{
     // return true when load successful, or false otherwise
     function waitForPageLoaded()
     {
-        dump("start waiting in loaded state: " + liberator.buffer.loaded + "\n");
+        liberator.dump("start waiting in loaded state: " + liberator.buffer.loaded + "\n");
         var mainThread = Components.classes["@mozilla.org/thread-manager;1"]
                                    .getService(Components.interfaces.nsIThreadManager).mainThread;
         while (mainThread.hasPendingEvents()) // clear queue
@@ -503,7 +503,7 @@ liberator.Events = function () //{{{
         {
             mainThread.processNextEvent(true);
             if ((now - then) % 1000 < 10)
-                dump("waited: " + (now - then) + " ms\n");
+                liberator.dump("waited: " + (now - then) + " ms\n");
 
             if (liberator.buffer.loaded > 0)
             {
@@ -519,7 +519,7 @@ liberator.Events = function () //{{{
         var ret = (liberator.buffer.loaded == 1);
         if (!ret)
             liberator.echoerr("Page did not load completely in " + ms + " milliseconds. Macro stopped.");
-        dump("done waiting: " + ret + "\n");
+        liberator.dump("done waiting: " + ret + "\n");
 
         // sometimes the input widget had focus when replaying a macro
         // maybe this call should be moved somewhere else?
@@ -661,7 +661,7 @@ liberator.Events = function () //{{{
         destroy: function ()
         {
             // removeEventListeners() to avoid mem leaks
-            window.dump("TODO: remove all eventlisteners\n");
+            liberator.dump("TODO: remove all eventlisteners\n");
 
             if (typeof(getBrowser) != "undefined")
                 getBrowser().removeProgressListener(this.progressListener);
@@ -957,9 +957,9 @@ liberator.Events = function () //{{{
             if (elem && elem.readOnly)
                 return;
 
-            // liberator.log("onFocusChange: " + elem);
-            // dump("=+++++++++=\n" + liberator.util.objectToString(event.target) + "\n")
-            // dump (elem + ": " + win + "\n");//" - target: " + event.target + " - origtarget: " + event.originalTarget + " - expltarget: " + event.explicitOriginalTarget + "\n");
+            //liberator.log("onFocusChange: " + elem);
+            //liberator.dump("=+++++++++=\n" + liberator.util.objectToString(event.target) + "\n")
+            //liberator.dump (elem + ": " + win + "\n");//" - target: " + event.target + " - origtarget: " + event.originalTarget + " - expltarget: " + event.explicitOriginalTarget + "\n");
 
             if (elem && (
                    (elem instanceof HTMLInputElement && (elem.type.toLowerCase() == "text" || elem.type.toLowerCase() == "password")) ||
@@ -993,7 +993,7 @@ liberator.Events = function () //{{{
                 {
                     if (liberator.config.isComposeWindow)
                     {
-                        dump("Compose editor got focus\n");
+                        liberator.dump("Compose editor got focus\n");
                         liberator.modes.set(liberator.modes.INSERT, liberator.modes.TEXTAREA);
                     }
                     else if (liberator.mode != liberator.modes.MESSAGE)
@@ -1011,7 +1011,7 @@ liberator.Events = function () //{{{
                // this.wantsModeReset = true;
                // setTimeout(function ()
                // {
-               //     dump("cur: " + liberator.mode + "\n");
+               //     liberator.dump("cur: " + liberator.mode + "\n");
                //     if (liberator.events.wantsModeReset)
                //     {
                //         liberator.events.wantsModeReset = false;
@@ -1115,8 +1115,8 @@ liberator.Events = function () //{{{
             if (!key)
                  return true;
 
-            // liberator.log(key + " in mode: " + liberator.mode);
-            // dump(key + " in mode: " + liberator.mode + "\n");
+            //liberator.log(key + " in mode: " + liberator.mode);
+            //liberator.dump(key + " in mode: " + liberator.mode + "\n");
 
             if (liberator.modes.isRecording)
             {
diff --git a/content/liberator.js b/content/liberator.js
index 19a73b6f..c1e8fc9d 100644
--- a/content/liberator.js
+++ b/content/liberator.js
@@ -564,7 +564,7 @@ const liberator = (function () //{{{
 
         triggerCallback: function (type, mode, data)
         {
-            //dump("type: " + type + " mode: " + mode + "data: " + data + "\n");
+            //liberator.dump("type: " + type + " mode: " + mode + "data: " + data + "\n");
             for (let i = 0; i < callbacks.length; i++)
             {
                 var [thistype, thismode, thisfunc] = callbacks[i];
@@ -602,6 +602,12 @@ const liberator = (function () //{{{
             return false; // so you can do: if (...) return liberator.beep();
         },
 
+        // NOTE: "browser.dom.window.dump.enabled" preference needs to be set
+        dump: function (message)
+        {
+            dump(liberator.config.name.toLowerCase() + ": " + message);
+        },
+
         // with (liberator) means, liberator is the default namespace "inside" eval
         eval: function (str)
         {
@@ -782,7 +788,7 @@ const liberator = (function () //{{{
                     if (elem)
                         window.content.scrollTo(0, elem.getBoundingClientRect().top - 10); // 10px context
                     else
-                        dump('no element: ' + '@class="tag" and text()="' + tag + '"\n' );
+                        liberator.dump('no element: ' + '@class="tag" and text()="' + tag + '"\n' );
                 }, 500);
             }
 
@@ -1069,7 +1075,7 @@ const liberator = (function () //{{{
             if (liberator.has("quickmarks"))
                 liberator.quickmarks.destroy();
 
-            window.dump("All liberator modules destroyed\n");
+            liberator.dump("All liberator modules destroyed\n");
 
             liberator.autocommands.trigger("Quit", "");
         },
diff --git a/content/mail.js b/content/mail.js
index ef263c8a..626f1105 100644
--- a/content/mail.js
+++ b/content/mail.js
@@ -1007,7 +1007,7 @@ liberator.Mail = function () //{{{
                     }
                     catch (e)
                     {
-                        dump("ERROR: " + folder.prettyName + " failed to getMessages\n");
+                        liberator.dump("ERROR: " + folder.prettyName + " failed to getMessages\n");
                         continue;
                     }
 
diff --git a/content/modes.js b/content/modes.js
index c1dea5a2..16323428 100644
--- a/content/modes.js
+++ b/content/modes.js
@@ -98,8 +98,8 @@ liberator.modes = (function () //{{{
     function handleModeChange(oldMode, newMode)
     {
         // TODO: fix v.log() to work with verbosity level
-        // liberator.log("switching from mode " + oldMode + " to mode " + newMode, 7);
-        // dump("switching from mode " + oldMode + " to mode " + newMode + "\n");
+        //liberator.log("switching from mode " + oldMode + " to mode " + newMode, 7);
+        //liberator.dump("switching from mode " + oldMode + " to mode " + newMode + "\n");
 
         switch (oldMode)
         {