diff --git a/toolkit/components/passwordmgr/public/nsILoginManager.idl b/toolkit/components/passwordmgr/public/nsILoginManager.idl
index 6f2dcfc0160..c2d58faa14a 100644
--- a/toolkit/components/passwordmgr/public/nsILoginManager.idl
+++ b/toolkit/components/passwordmgr/public/nsILoginManager.idl
@@ -74,10 +74,10 @@ interface nsILoginManager : nsISupports {
 
 
     /**
-    * Clear all logins known to login manager.
+    * Remove all logins known to login manager.
     *
     * The browser sanitization feature allows the user to clear any stored
-    * passwords. This interface allows that to be done without gettng each
+    * passwords. This interface allows that to be done without getting each
     * login first (which might require knowing the master password).
     *
     */
diff --git a/toolkit/components/passwordmgr/public/nsILoginManagerStorage.idl b/toolkit/components/passwordmgr/public/nsILoginManagerStorage.idl
index 3b734f7a73d..0b16fd1a254 100644
--- a/toolkit/components/passwordmgr/public/nsILoginManagerStorage.idl
+++ b/toolkit/components/passwordmgr/public/nsILoginManagerStorage.idl
@@ -98,10 +98,10 @@ interface nsILoginManagerStorage : nsISupports {
 
 
     /**
-    * Clear all stored logins.
+    * Remove all stored logins.
     *
     * The browser sanitization feature allows the user to clear any stored
-    * passwords. This interface allows that to be done without gettng each
+    * passwords. This interface allows that to be done without getting each
     * login first (which might require knowing the master password).
     *
     */
diff --git a/toolkit/components/passwordmgr/src/nsLoginManager.js b/toolkit/components/passwordmgr/src/nsLoginManager.js
index 4d7f299871c..98d6c040450 100644
--- a/toolkit/components/passwordmgr/src/nsLoginManager.js
+++ b/toolkit/components/passwordmgr/src/nsLoginManager.js
@@ -456,13 +456,13 @@ LoginManager.prototype = {
 
 
     /*
-     * clearAllLogins
+     * removeAllLogins
      *
-     * Clears all stored logins.
+     * Remove all stored logins.
      */
-    clearAllLogins : function () {
-        this.log("Clearing all logins");
-        this._storage.clearAllLogins();
+    removeAllLogins : function () {
+        this.log("Removing all logins");
+        this._storage.removeAllLogins();
     },
 
     /*
diff --git a/toolkit/components/passwordmgr/src/storage-Legacy.js b/toolkit/components/passwordmgr/src/storage-Legacy.js
index b0ad68f6a46..a14d2495711 100644
--- a/toolkit/components/passwordmgr/src/storage-Legacy.js
+++ b/toolkit/components/passwordmgr/src/storage-Legacy.js
@@ -238,11 +238,11 @@ LoginManagerStorage_legacy.prototype = {
 
 
     /*
-     * clearAllLogins
+     * removeAllLogins
      *
-     * Clears all logins from storage.
+     * Removes all logins from storage.
      */
-    clearAllLogins : function () {
+    removeAllLogins : function () {
         this._logins = {};
         // Disabled hosts kept, as one presumably doesn't want to erase those.