diff --git a/common/locale/en-US/autocommands.xml b/common/locale/en-US/autocommands.xml
index 9a8dc927..a2f72585 100644
--- a/common/locale/en-US/autocommands.xml
+++ b/common/locale/en-US/autocommands.xml
@@ -30,7 +30,7 @@
             variables.
         </p>
 
-        <p>Add <a>cmd</a> to the list of commands Vimperator will execute on <a>event</a> for a URL matching <a>pat</a>:</p>
+        <p>Add <a>cmd</a> to the list of commands &liberator.appname; will execute on <a>event</a> for a URL matching <a>pat</a>:</p>
 
         <ul>
             <li><ex>:autocmd[!]</ex> <a>events</a> <a>pat</a>: list/remove autocommands filtered by <a>events</a> and <a>pat</a></li>
diff --git a/common/locale/en-US/browsing.xml b/common/locale/en-US/browsing.xml
index 6ee3a6d3..2a15bcf3 100644
--- a/common/locale/en-US/browsing.xml
+++ b/common/locale/en-US/browsing.xml
@@ -10,9 +10,9 @@
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h2 tag="surfing browsing">Browsing</h2>
 
-Vimperator overrides nearly all Firefox keys in order to make browsing more
+&liberator.appname; overrides nearly all &liberator.host; keys in order to make browsing more
 pleasant for Vim users. On the rare occasions when you want to pass a keystroke
-to Firefox, or to the web page, and have it retain its original meaning you
+to &liberator.host;, or to the web page, and have it retain its original meaning you
 have 2 possibilities:
 
 <item>
@@ -20,7 +20,7 @@ have 2 possibilities:
     <spec>CTRL-Z</spec>
     <description>
         <p>
-            Disable all Vimperator keys except <k name="Esc"/> and pass them to the next event
+            Disable all &liberator.appname; keys except <k name="Esc"/> and pass them to the next event
             handler. This is especially useful if JavaScript controlled forms (e.g., the
             RichEdit form fields of Gmail) don't work anymore. To exit this mode, press
             <k name="Esc"/>. If you also need to pass <k name="Esc"/> in this mode to the web page,
@@ -36,10 +36,10 @@ have 2 possibilities:
     <description>
         <p>
             If you only need to pass a single key to a JavaScript form field or another
-            extension prefix the key with <k name="C-v"/>. Also works to unshadow Firefox
-            shortcuts like <k name="C-o"/> which are otherwise hidden in Vimperator. When
-            Vimperator mode is temporarily disabled with <k name="C-z"/>, <k name="C-v"/> will pass
-            the next key to Vimperator instead of the web page.
+            extension prefix the key with <k name="C-v"/>. Also works to unshadow &liberator.host;
+            shortcuts like <k name="C-o"/> which are otherwise hidden in &liberator.appname;. When
+            &liberator.appname; mode is temporarily disabled with <k name="C-z"/>, <k name="C-v"/> will pass
+            the next key to &liberator.appname; instead of the web page.
         </p>
     </description>
 </item>
@@ -86,7 +86,7 @@ have 2 possibilities:
                 opens a Google search for linus torvalds).
            </li>
            <li>
-               Passed directly to Firefox in all other cases
+               Passed directly to &liberator.host; in all other cases
                (<ex>:open www.osnews.com, www.slashdot.org</ex>
                opens OSNews in the current, and Slashdot in a new
                background tab).
@@ -440,7 +440,7 @@ have 2 possibilities:
     <description>
         <p>
             Quit current tab. If this is the last tab in the window, close the window. If
-            this was the last window, close Vimperator. When quitting Vimperator, the
+            this was the last window, close &liberator.appname;. When quitting &liberator.appname;, the
             session is not stored.
         </p>
     </description>
@@ -452,7 +452,7 @@ have 2 possibilities:
     <spec>:quita<oa>ll</oa></spec>
     <description>
         <p>
-            Quit Vimperator. Quit Vimperator, no matter how many tabs/windows are open.
+            Quit &liberator.appname;. Quit &liberator.appname;, no matter how many tabs/windows are open.
             The session is not stored.
         </p>
     </description>
@@ -483,7 +483,7 @@ have 2 possibilities:
     <spec>:xa<oa>ll</oa></spec>
     <description>
         <p>
-            Save the session and quit. Quit Vimperator, no matter how many tabs/windows
+            Save the session and quit. Quit &liberator.appname;, no matter how many tabs/windows
             are open. The session is stored. <ex>:wq</ex> is different from Vim, as it
             closes the window instead of just one tab by popular demand. Complain on the
             mailing list if you want to change that.
@@ -506,7 +506,7 @@ have 2 possibilities:
     <spec>ZZ</spec>
     <description>
         <p>
-            Quit and save the session. Quit Vimperator, no matter how many tabs/windows
+            Quit and save the session. Quit &liberator.appname;, no matter how many tabs/windows
             are open. The session is stored. Works like <ex>:xall</ex>.
         </p>
     </description>
diff --git a/common/locale/en-US/buffer.xml b/common/locale/en-US/buffer.xml
index d1d5a20e..20bd1de9 100644
--- a/common/locale/en-US/buffer.xml
+++ b/common/locale/en-US/buffer.xml
@@ -10,7 +10,7 @@
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h2 tag="buffer document">Buffer</h2>
 
-Vimperator holds exactly one buffer object for each tab. It is usually an
+&liberator.appname; holds exactly one buffer object for each tab. It is usually an
 (X)HTML document with advanced features.
 
 <h2 tag="buffer-information">Buffer information</h2>
@@ -357,7 +357,7 @@ default zoom levels are 30%, 50%, 67%, 80%, 90%, 100%, 110%, 120%, 133%, 150%,
 
 The available zoom range can be changed by setting the
 <link topic="http://kb.mozillazine.org/Zoom.minPercent">'zoom.minPercent'</link> and
-<link topic="http://kb.mozillazine.org/Zoom.maxPercent">'zoom.maxPercent'</link> Firefox
+<link topic="http://kb.mozillazine.org/Zoom.maxPercent">'zoom.maxPercent'</link> &liberator.host;
 preferences. The zoom levels can be changed using the
 <link topic="http://kb.mozillazine.org/Toolkit.zoomManager.zoomValues">'toolkit.ZoomManager.zoomLevels'</link>
 preference.
diff --git a/common/locale/en-US/eval.xml b/common/locale/en-US/eval.xml
index 045613a2..abae9dbb 100644
--- a/common/locale/en-US/eval.xml
+++ b/common/locale/en-US/eval.xml
@@ -83,12 +83,12 @@
 
         <p>
             The special version <ex>:javascript!</ex> opens the JavaScript console of
-            Firefox.
+            &liberator.host;.
         </p>
 
         <p>
             <k name="Tab"/> completion is available for <ex>:javascript <a>cmd</a><k name="Tab"/></ex> (but not
-            yet for the <ex>:js &lt;&lt;EOF</ex> multiline widget). Be aware that Vimperator needs
+            yet for the <ex>:js &lt;&lt;EOF</ex> multiline widget). Be aware that &liberator.appname; needs
             to run <a>cmd</a> through eval() to get the completions, which could have unwanted
             side effects.
         </p>
diff --git a/common/locale/en-US/gui.xml b/common/locale/en-US/gui.xml
index dec62447..ca61a464 100644
--- a/common/locale/en-US/gui.xml
+++ b/common/locale/en-US/gui.xml
@@ -51,7 +51,7 @@
 
 <item>
     <tags>:dia :dialog</tags>
-    <spec>:dia<oa>log</oa> <oa>firefox-dialog</oa></spec>
+    <spec>:dia<oa>log</oa> <oa>&liberator.host;-dialog</oa></spec>
     <description>
         <p>Open a &liberator.host; dialog.</p>
 
diff --git a/common/locale/en-US/hints.xml b/common/locale/en-US/hints.xml
index 08703769..1cb5360e 100644
--- a/common/locale/en-US/hints.xml
+++ b/common/locale/en-US/hints.xml
@@ -10,7 +10,7 @@
     xmlns:html="http://www.w3.org/1999/xhtml">
 <h1 tag="quick-hints hints">Hints</h1>
 
-Hints are the way in which Vimperator allows you to follow links on a page. By
+Hints are the way in which &liberator.appname; allows you to follow links on a page. By
 providing each link with a suitable hint, you can access all links with a
 similar amount of minimal effort. This contrasts strongly with the traditional
 approaches offered by the mouse, in which you must first find and then aim for
@@ -46,7 +46,7 @@ tedious unless you always visit the first link on a page.
             Start QuickHint mode, but open link in a new tab. Like normal QuickHint
             mode (activated with <k>f</k>) but opens the link in a new tab. The new
             tab will be loaded in background according to the
-            <str>browser.tabs.loadInBackground</str> Firefox preference.
+            <str>browser.tabs.loadInBackground</str> &liberator.host; preference.
         </p>
     </description>
 </item>
diff --git a/common/locale/en-US/marks.xml b/common/locale/en-US/marks.xml
index 1579263a..2b6f3995 100644
--- a/common/locale/en-US/marks.xml
+++ b/common/locale/en-US/marks.xml
@@ -11,14 +11,14 @@
 <h1 tag="different-marks marks">Marks</h1>
 
 <p>
-    Vimperator supports a number of different marks:
+    &liberator.appname; supports a number of different marks:
 </p>
 
 <ul>
     <li>Bookmarks which allow you to mark a web page as one of your favorites for easy access.</li>
     <li>QuickMarks allow you to define up to 62 (a-zA-Z0-9) web sites (or groups of web sites) which you visit most often.</li>
     <li>Local marks to store the position within a web page.</li>
-    <li>History is also a special type of marks, as Vimperator automatically remembers sites which you have visited in the past.</li>
+    <li>History is also a special type of marks, as &liberator.appname; automatically remembers sites which you have visited in the past.</li>
 </ul>
 
 <h1 tag="bookmarks">Bookmarks</h1>
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index 9b2f1d9f..ed10968d 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -210,7 +210,7 @@
     character) or <em>$<a>VAR</a></em>. <em>%VAR%</em> is also supported on Windows.
 </p>
 
-<h2 tag="firefox-options preferences">Setting &liberator.host; options</h2>
+<h2 tag="&liberator.host;-options preferences">Setting &liberator.host; options</h2>
 
 <p>&liberator.host; options can be viewed and set with the following commands:</p>
 
diff --git a/common/locale/en-US/print.xml b/common/locale/en-US/print.xml
index 9f7defa3..6e611abc 100644
--- a/common/locale/en-US/print.xml
+++ b/common/locale/en-US/print.xml
@@ -33,7 +33,7 @@
 </item>
 
 
-<h2 tag="firefox-print-dialogs">&liberator.host; printing dialogs</h2>
+<h2 tag="&liberator.host;-print-dialogs">&liberator.host; printing dialogs</h2>
 
 <p>
     The "Print Preview" and "Page Setup" dialogs can be opened via the <ex>:dialog</ex>
diff --git a/common/locale/en-US/starting.xml b/common/locale/en-US/starting.xml
index 0602fe1f..14cead19 100644
--- a/common/locale/en-US/starting.xml
+++ b/common/locale/en-US/starting.xml
@@ -15,7 +15,7 @@
 <p>
     Command-line options can be passed to &liberator.appname; via the -&liberator.name; &liberator.host;
     option. These are passed as single string argument.
-    E.g., firefox -&liberator.name; <str>++cmd 'set exrc' +u 'tempRcFile' ++noplugin</str>
+    E.g., &liberator.hostbin; -&liberator.name; <str>++cmd 'set exrc' +u 'tempRcFile' ++noplugin</str>
 </p>
 
 <item>
diff --git a/vimperator/content/liberator.dtd b/vimperator/content/liberator.dtd
index 6f29dbe0..90a3e921 100644
--- a/vimperator/content/liberator.dtd
+++ b/vimperator/content/liberator.dtd
@@ -1,9 +1,13 @@
 
+<!ENTITY % liberatorBranding SYSTEM "chrome://branding/locale/brand.dtd">
+%liberatorBranding;
+
 <!ENTITY liberator.mainWindow "main-window">
 <!ENTITY liberator.name "vimperator">
 <!ENTITY liberator.idname "VIMPERATOR">
 <!ENTITY liberator.appname "Vimperator">
-<!ENTITY liberator.host "Firefox">
+<!ENTITY liberator.host "&brandShortName;">
+<!ENTITY liberator.hostbin "firefox">
 <!ENTITY liberator.statusBefore "statusbar-display">
 <!ENTITY liberator.statusAfter "">
 
diff --git a/xulmus/content/liberator.dtd b/xulmus/content/liberator.dtd
index e57d34b3..87fdc200 100644
--- a/xulmus/content/liberator.dtd
+++ b/xulmus/content/liberator.dtd
@@ -1,9 +1,13 @@
 
+<!ENTITY % liberatorBranding SYSTEM "chrome://branding/locale/brand.dtd">
+%liberatorBranding;
+
 <!ENTITY liberator.mainWindow "mainplayer">
 <!ENTITY liberator.name "xulmus">
 <!ENTITY liberator.appname "Xulmus">
 <!ENTITY liberator.idname "XULMUS">
-<!ENTITY liberator.host "Songbird">
+<!ENTITY liberator.host "&brandShortName">
+<!ENTITY liberator.hostbin "songbird">
 <!ENTITY liberator.statusBefore "statusbar-display">
 <!ENTITY liberator.statusAfter "">