diff --git a/NEWS b/NEWS
index 6a11772c..5b6aa330 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,12 @@
 <pre>
 2008-XX-XX:
     * version 2.0 (probably)
+    * renamed Startup and Quit autocmd events to VimperatorEnter and
+      VimperatorLeave respectively
     * add 'helpfile' option
     * add 'wildignore' option
     * add :finish command
-    * new events BookmarkPost, ShellCmdPost, QuitPre
+    * new events BookmarkAdd, ShellCmdPost, VimperatorLeavePre
     * add 'cdpath' option
     * allow :dialog to open the cookies manager
     * add 'loadplugins' option
diff --git a/content/liberator.js b/content/liberator.js
index 702a3e7d..6fc767d0 100644
--- a/content/liberator.js
+++ b/content/liberator.js
@@ -1075,7 +1075,7 @@ const liberator = (function () //{{{
                         option.reset();
                 }
 
-                liberator.autocommands.trigger("Startup", "");
+                liberator.autocommands.trigger(liberator.config.name + "Enter", "");
             }, 0);
 
             liberator.statusline.update();
@@ -1085,7 +1085,7 @@ const liberator = (function () //{{{
 
         shutdown: function ()
         {
-            liberator.autocommands.trigger("QuitPre", "");
+            liberator.autocommands.trigger(liberator.config.name + "LeavePre", "");
 
             // save our preferences
             liberator.commandline.destroy();
@@ -1096,7 +1096,7 @@ const liberator = (function () //{{{
 
             liberator.dump("All liberator modules destroyed\n");
 
-            liberator.autocommands.trigger("Quit", "");
+            liberator.autocommands.trigger(liberator.config.name + "Leave", "");
         },
 
         sleep: function (ms)
diff --git a/content/muttator.js b/content/muttator.js
index e4f80c36..fd9db88d 100644
--- a/content/muttator.js
+++ b/content/muttator.js
@@ -46,11 +46,12 @@ liberator.config = { //{{{
     get visualbellWindow() { return document.getElementById(this.mainWindowID); },
     isComposeWindow: false,
 
-    autocommands: [["FolderLoaded", "Triggered after switching folders in Thunderbird"],
-                   ["PageLoadPre",  "Triggered after a page load is initiated"],
-                   ["PageLoad",     "Triggered when a page gets (re)loaded/opened"],
-                   ["Quit",         "Triggered before exiting Thunderbird"],
-                   ["Startup",      "Triggered after Thunderbird starts"]],
+    autocommands: [["FolderLoaded",  "Triggered after switching folders in Thunderbird"],
+                   ["PageLoadPre",   "Triggered after a page load is initiated"],
+                   ["PageLoad",      "Triggered when a page gets (re)loaded/opened"],
+                   ["MuttatorEnter", "Triggered after Thunderbird starts"],
+                   ["MuttatorLeave", "Triggered before exiting Thunderbird"],
+                   ["MuttatorLeavePre", "Triggered before exiting Thunderbird"]],
 
     dialogs: [
         ["about",            "About Thunderbird",
diff --git a/content/vimperator.js b/content/vimperator.js
index 80432842..6f58b8e0 100644
--- a/content/vimperator.js
+++ b/content/vimperator.js
@@ -38,14 +38,14 @@ liberator.config = { //{{{
 
     get visualbellWindow() { return getBrowser().mPanelContainer; },
 
-    autocommands: [["BookmarkAdd",   "Triggered after a page is bookmarked"],
-                   ["LocationChange", "Triggered when changing tabs or when naviagtion to a new location"],
-                   ["PageLoadPre",    "Triggered after a page load is initiated"],
-                   ["PageLoad",       "Triggered when a page gets (re)loaded/opened"],
-                   ["QuitPre",        "Triggered before exiting Firefox, just before destroying each module"],
-                   ["Quit",           "Triggered before exiting Firefox"],
-                   ["ShellCmdPost",   "Triggered after executing a shell command with :!cmd"],
-                   ["Startup",        "Triggered after Firefox starts"]],
+    autocommands: [["BookmarkAdd",        "Triggered after a page is bookmarked"],
+                   ["LocationChange",     "Triggered when changing tabs or when naviagtion to a new location"],
+                   ["PageLoadPre",        "Triggered after a page load is initiated"],
+                   ["PageLoad",           "Triggered when a page gets (re)loaded/opened"],
+                   ["ShellCmdPost",       "Triggered after executing a shell command with :!cmd"],
+                   ["VimperatorEnter",    "Triggered after Firefox starts"],
+                   ["VimperatorLeavePre", "Triggered before exiting Firefox, just before destroying each module"],
+                   ["VimperatorLeave",    "Triggered before exiting Firefox"]],
 
     dialogs: [
         ["about",            "About Firefox",
diff --git a/locale/en-US/autocommands.txt b/locale/en-US/autocommands.txt
index 608754ea..1f6e4994 100644
--- a/locale/en-US/autocommands.txt
+++ b/locale/en-US/autocommands.txt
@@ -19,15 +19,15 @@ Add {cmd} to the list of commands Vimperator will execute on {event} for a URL m
 
 Available {events}:
 
-`----------------`--------------------------------------------
-*BookmarkAdd*    Triggered after a page is bookmarked
-*LocationChange* Triggered when changing tabs or when navigating to a new location
-*PageLoadPre*    Triggered after a page load is initiated.
-*PageLoad*       Triggered when a page gets (re)loaded/opened
-*QuitPre*        Triggered before exiting Firefox, just before destroying each module
-*Quit*           Triggered before exiting Firefox
-*ShellCmdPost*   Triggered after executing a shell command with :!cmd
-*Startup*        Triggered after Firefox starts
+`--------------------`----------------------------------------
+*BookmarkAdd*        Triggered after a page is bookmarked
+*LocationChange*     Triggered when changing tabs or when navigating to a new location
+*PageLoadPre*        Triggered after a page load is initiated.
+*PageLoad*           Triggered when a page gets (re)loaded/opened
+*ShellCmdPost*       Triggered after executing a shell command with :!cmd
+*VimperatorEnter*    Triggered after Firefox starts
+*VimperatorLeavePre* Triggered before exiting Firefox, just before destroying each module
+*VimperatorLeave*    Triggered before exiting Firefox
 --------------------------------------------------------------
 
 {pat} is a regular expression, use .* if you want to match all URLs. Note: This