diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json
index ef50a8e22b..7e10dc8c3e 100644
--- a/src/_locales/de/messages.json
+++ b/src/_locales/de/messages.json
@@ -95,9 +95,9 @@
     "message": "Passwort Generieren (kopiert)",
     "description": "Generate Password (copied)"
   },
-  "noMatchingSites": {
+  "noMatchingLogins": {
     "message": "Keine passende Seite.",
-    "description": "No matching sites."
+    "description": "No matching logins."
   },
   "vaultLocked": {
     "message": "Der Tresor ist gesperrt.",
@@ -105,11 +105,11 @@
   },
   "autoFillInfo": {
     "message": "Für den aktuellen Browser-Tab gibt es keine passenden Seiten, welche automatisch ausgefüllt werden können.",
-    "description": "There are no sites available to auto-fill for the current browser tab."
+    "description": "There are no logins available to auto-fill for the current browser tab."
   },
-  "addSite": {
+  "addLogin": {
     "message": "Seite Hinzufügen",
-    "description": "Add a Site"
+    "description": "Add a Login"
   },
   "passwordHint": {
     "message": "Passwort-Hinweis",
@@ -311,13 +311,13 @@
     "message": "Bearbeiten",
     "description": "Edit"
   },
-  "noSitesInList": {
+  "noLoginsInList": {
     "message": "In dieser Liste sind keine Seiten vorhanden.",
-    "description": "There are no sites in list."
+    "description": "There are no logins in list."
   },
-  "siteInformation": {
+  "loginInformation": {
     "message": "Seiten-Informationen",
-    "description": "Site Information"
+    "description": "Login Information"
   },
   "username": {
     "message": "Nutzername",
@@ -335,21 +335,21 @@
     "message": "Notizen",
     "description": "Notes"
   },
-  "editSite": {
+  "editLogin": {
     "message": "Seite Bearbeiten",
-    "description": "Edit Site"
+    "description": "Edit Login"
   },
   "folder": {
     "message": "Ordner",
     "description": "Folder"
   },
-  "deleteSite": {
+  "deleteLogin": {
     "message": "Seite Löschen",
-    "description": "Delete Site"
+    "description": "Delete Login"
   },
-  "viewSite": {
+  "viewLogin": {
     "message": "Seite Anzeigen",
-    "description": "View Site"
+    "description": "View Login"
   },
   "launchWebsite": {
     "message": "Website Öffnen",
@@ -481,7 +481,7 @@
   },
   "autofillError": {
     "message": "Die Felder dieser Seite konnten nicht automatisch ausgefüllt werden. Bitte Nutzernamen und/oder Passwort manuell kopieren.",
-    "description": "Unable to auto-fill the selected site on this page. Copy/paste your username and/or password instead."
+    "description": "Unable to auto-fill the selected login on this page. Copy/paste your username and/or password instead."
   },
   "loggedOut": {
     "message": "Ausgeloggt",
@@ -575,21 +575,21 @@
     "message": "URI",
     "description": "URI"
   },
-  "addedSite": {
+  "addedLogin": {
     "message": "Seite hinzugefügt",
     "description": "Added site"
   },
-  "editedSite": {
+  "editedLogin": {
     "message": "Seite bearbeitet",
-    "description": "Edited site"
+    "description": "Edited login"
   },
-  "deleteSiteConfirmation": {
+  "deleteLoginConfirmation": {
     "message": "Bist du sicher, dass du diese Seite löschen möchtest?",
-    "description": "Are you sure you want to delete this site?"
+    "description": "Are you sure you want to delete this login?"
   },
-  "deletedSite": {
+  "deletedLogin": {
     "message": "Seite gelöscht",
-    "description": "Deleted site"
+    "description": "Deleted login"
   },
   "overwritePassword": {
     "message": "Passwort Ersetzen",
diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index a3cc555bfc..c526eb1826 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -95,21 +95,21 @@
     "message": "Generate Password (copied)",
     "description": "Generate Password (copied)"
   },
-  "noMatchingSites": {
-    "message": "No matching sites.",
-    "description": "No matching sites."
+  "noMatchingLogins": {
+    "message": "No matching logins.",
+    "description": "No matching logins."
   },
   "vaultLocked": {
     "message": "Vault is locked.",
     "description": "Vault is locked."
   },
   "autoFillInfo": {
-    "message": "There are no sites available to auto-fill for the current browser tab.",
-    "description": "There are no sites available to auto-fill for the current browser tab."
+    "message": "There are no logins available to auto-fill for the current browser tab.",
+    "description": "There are no logins available to auto-fill for the current browser tab."
   },
-  "addSite": {
-    "message": "Add a Site",
-    "description": "Add a Site"
+  "addLogin": {
+    "message": "Add a Login",
+    "description": "Add a Login"
   },
   "passwordHint": {
     "message": "Password Hint",
@@ -311,13 +311,13 @@
     "message": "Edit",
     "description": "Edit"
   },
-  "noSitesInList": {
-    "message": "There are no sites to list.",
-    "description": "There are no sites to list."
+  "noLoginsInList": {
+    "message": "There are no logins to list.",
+    "description": "There are no logins to list."
   },
-  "siteInformation": {
-    "message": "Site Information",
-    "description": "Site Information"
+  "loginInformation": {
+    "message": "Login Information",
+    "description": "Login Information"
   },
   "username": {
     "message": "Username",
@@ -335,21 +335,21 @@
     "message": "Notes",
     "description": "Notes"
   },
-  "editSite": {
-    "message": "Edit Site",
-    "description": "Edit Site"
+  "editLogin": {
+    "message": "Edit Login",
+    "description": "Edit Login"
   },
   "folder": {
     "message": "Folder",
     "description": "Folder"
   },
-  "deleteSite": {
-    "message": "Delete Site",
-    "description": "Delete Site"
+  "deleteLogin": {
+    "message": "Delete Login",
+    "description": "Delete Login"
   },
-  "viewSite": {
-    "message": "View Site",
-    "description": "View Site"
+  "viewLogin": {
+    "message": "View Login",
+    "description": "View Login"
   },
   "launchWebsite": {
     "message": "Launch Website",
@@ -480,8 +480,8 @@
     "description": "' copied'. This is part of a sentence so be sure to leave the space prefix. For example: 'Password copied'"
   },
   "autofillError": {
-    "message": "Unable to auto-fill the selected site on this page. Copy/paste your username and/or password instead.",
-    "description": "Unable to auto-fill the selected site on this page. Copy/paste your username and/or password instead."
+    "message": "Unable to auto-fill the selected login on this page. Copy/paste your username and/or password instead.",
+    "description": "Unable to auto-fill the selected login on this page. Copy/paste your username and/or password instead."
   },
   "loggedOut": {
     "message": "Logged out",
@@ -575,21 +575,21 @@
     "message": "URI",
     "description": "URI"
   },
-  "addedSite": {
-    "message": "Added site",
-    "description": "Added site"
+  "addedLogin": {
+    "message": "Added login",
+    "description": "Added login"
   },
-  "editedSite": {
-    "message": "Edited site",
-    "description": "Edited site"
+  "editedLogin": {
+    "message": "Edited login",
+    "description": "Edited login"
   },
-  "deleteSiteConfirmation": {
-    "message": "Are you sure you want to delete this site?",
-    "description": "Are you sure you want to delete this site?"
+  "deleteLoginConfirmation": {
+    "message": "Are you sure you want to delete this login?",
+    "description": "Are you sure you want to delete this login?"
   },
-  "deletedSite": {
-    "message": "Deleted site",
-    "description": "Deleted site"
+  "deletedLogin": {
+    "message": "Deleted login",
+    "description": "Deleted login"
   },
   "overwritePassword": {
     "message": "Overwrite Password",
@@ -621,7 +621,7 @@
   },
   "noneFolder": {
     "message": "(none)",
-    "description": "(none) - this is the folder for uncategorized sites"
+    "description": "(none) - this is the folder for uncategorized logins"
   },
   "features": {
     "message": "Features",
@@ -631,13 +631,13 @@
     "message": "We use Google Analytics to better learn how the extension is being used so that we can make it better. All data collection is completely anonymous.",
     "description": "We use Google Analytics to better learn how the extension is being used so that we can make it better. All data collection is completely anonymous."
   },
-  "disableAddSiteNotification": {
-    "message": "Disable Add Site Notification",
-    "description": "Disable Add Site Notification"
+  "disableAddLoginNotification": {
+    "message": "Disable Add Login Notification",
+    "description": "Disable Add Login Notification"
   },
-  "addSiteNotificationDesc": {
-    "message": "The \"Add Site Notification\" automatically prompts you to save new sites to your vault whenever you log into them for the first time.",
-    "description": "The \"Add Site Notification\" automatically prompts you to save new sites to your vault whenever you log into them for the first time."
+  "addLoginNotificationDesc": {
+    "message": "The \"Add Login Notification\" automatically prompts you to save new logins to your vault whenever you log into them for the first time.",
+    "description": "The \"Add Login Notification\" automatically prompts you to save new logins to your vault whenever you log into them for the first time."
   },
   "notificationAddDesc": {
     "message": "Should bitwarden remember this password for you?",
diff --git a/src/_locales/fi/messages.json b/src/_locales/fi/messages.json
index c948d56a46..81a48f7c35 100644
--- a/src/_locales/fi/messages.json
+++ b/src/_locales/fi/messages.json
@@ -95,9 +95,9 @@
     "message": "Luo salasana (kopioitu)",
     "description": "Generate Password (copied)"
   },
-  "noMatchingSites": {
+  "noMatchingLogins": {
     "message": "Ei täsmääviä sivustoja.",
-    "description": "No matching sites."
+    "description": "No matching logins."
   },
   "vaultLocked": {
     "message": "Holvi on lukittu.",
@@ -105,11 +105,11 @@
   },
   "autoFillInfo": {
     "message": "Selaimen nykyiselle välilehdelle ei ole automaattisesti täytettäviä kohteita.",
-    "description": "There are no sites available to auto-fill for the current browser tab."
+    "description": "There are no logins available to auto-fill for the current browser tab."
   },
-  "addSite": {
+  "addLogin": {
     "message": "Lisää sivusto",
-    "description": "Add a Site"
+    "description": "Add a Login"
   },
   "passwordHint": {
     "message": "Salasanavihje",
@@ -311,13 +311,13 @@
     "message": "Muokkaa",
     "description": "Edit"
   },
-  "noSitesInList": {
+  "noLoginsInList": {
     "message": "Ei sivustoja.",
-    "description": "There are no sites in list."
+    "description": "There are no logins in list."
   },
-  "siteInformation": {
+  "loginInformation": {
     "message": "Sivuston tiedot",
-    "description": "Site Information"
+    "description": "Login Information"
   },
   "username": {
     "message": "Käyttäjänimi",
@@ -335,21 +335,21 @@
     "message": "Merkinnät",
     "description": "Notes"
   },
-  "editSite": {
+  "editLogin": {
     "message": "Muokkaa sivustoa",
-    "description": "Edit Site"
+    "description": "Edit Login"
   },
   "folder": {
     "message": "Kansio",
     "description": "Folder"
   },
-  "deleteSite": {
+  "deleteLogin": {
     "message": "Poista sivusto",
-    "description": "Delete Site"
+    "description": "Delete Login"
   },
-  "viewSite": {
+  "viewLogin": {
     "message": "Tarkastele sivustoa",
-    "description": "View Site"
+    "description": "View Login"
   },
   "launchWebsite": {
     "message": "Avaa sivusto",
@@ -481,7 +481,7 @@
   },
   "autofillError": {
     "message": "Automaattinen täydennys tälle sivustolle ei onnistu. Kopioi ja liitä käyttäjänimesi/salasanasi manuaalisesti.",
-    "description": "Unable to auto-fill the selected site on this page. Copy/paste your username and/or password instead."
+    "description": "Unable to auto-fill the selected login on this page. Copy/paste your username and/or password instead."
   },
   "loggedOut": {
     "message": "Kirjauduttu ulos",
@@ -575,21 +575,21 @@
     "message": "URI",
     "description": "URI"
   },
-  "addedSite": {
+  "addedLogin": {
     "message": "Sivusto lisätty",
-    "description": "Added site"
+    "description": "Added login"
   },
-  "editedSite": {
+  "editedLogin": {
     "message": "Sivustoa muokattu",
-    "description": "Edited site"
+    "description": "Edited login"
   },
-  "deleteSiteConfirmation": {
+  "deleteLoginConfirmation": {
     "message": "Haluatko varmasti poistaa tämän sivuston?",
-    "description": "Are you sure you want to delete this site?"
+    "description": "Are you sure you want to delete this login?"
   },
-  "deletedSite": {
+  "deletedLogin": {
     "message": "Sivusto poistettu",
-    "description": "Deleted site"
+    "description": "Deleted login"
   },
   "overwritePassword": {
     "message": "Salasanan korvaus",
diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json
index 6929eb1b20..0b5feb170e 100644
--- a/src/_locales/fr/messages.json
+++ b/src/_locales/fr/messages.json
@@ -95,9 +95,9 @@
     "message": "Générer un mot de passe (copié)",
     "description": "Generate Password (copied)"
   },
-  "noMatchingSites": {
+  "noMatchingLogins": {
     "message": "Aucun site correspondant.",
-    "description": "No matching sites."
+    "description": "No matching logins."
   },
   "vaultLocked": {
     "message": "Le coffre est verrouillé.",
@@ -105,11 +105,11 @@
   },
   "autoFillInfo": {
     "message": "Il n'existe aucun site disponible pour le remplissage automatique pour l'onglet actuel du navigateur.",
-    "description": "There are no sites available to auto-fill for the current browser tab."
+    "description": "There are no logins available to auto-fill for the current browser tab."
   },
-  "addSite": {
+  "addLogin": {
     "message": "Ajouter un site",
-    "description": "Add a Site"
+    "description": "Add a Login"
   },
   "passwordHint": {
     "message": "Indice mot de passe",
@@ -311,13 +311,13 @@
     "message": "Modifier",
     "description": "Edit"
   },
-  "noSitesInList": {
+  "noLoginsInList": {
     "message": "Aucun site correspondant.",
-    "description": "There are no sites to list."
+    "description": "There are no logins to list."
   },
-  "siteInformation": {
+  "loginInformation": {
     "message": "Informations du site",
-    "description": "Site Information"
+    "description": "Login Information"
   },
   "username": {
     "message": "Nom d'utilisateur",
@@ -335,21 +335,21 @@
     "message": "Notes",
     "description": "Notes"
   },
-  "editSite": {
+  "editLogin": {
     "message": "Modifier site",
-    "description": "Edit Site"
+    "description": "Edit Login"
   },
   "folder": {
     "message": "Dossier",
     "description": "Folder"
   },
-  "deleteSite": {
+  "deleteLogin": {
     "message": "Supprimer site",
-    "description": "Delete Site"
+    "description": "Delete Login"
   },
-  "viewSite": {
+  "viewLogin": {
     "message": "Afficher site",
-    "description": "View Site"
+    "description": "View Login"
   },
   "launchWebsite": {
     "message": "Lancer le site web",
@@ -481,7 +481,7 @@
   },
   "autofillError": {
     "message": "Impossible de remplir automatiquement le site sélectionné sur cette page. Copiez/collez plutôt votre nom d'utilisateur et/ou votre mot de pase.",
-    "description": "Unable to auto-fill the selected site on this page. Copy/paste your username and/or password instead."
+    "description": "Unable to auto-fill the selected login on this page. Copy/paste your username and/or password instead."
   },
   "loggedOut": {
     "message": "Déconnecté",
@@ -575,21 +575,21 @@
     "message": "URI",
     "description": "URI"
   },
-  "addedSite": {
+  "addedLogin": {
     "message": "Site ajouté",
-    "description": "Added site"
+    "description": "Added login"
   },
-  "editedSite": {
+  "editedLogin": {
     "message": "Site modifié",
-    "description": "Edited site"
+    "description": "Edited login"
   },
-  "deleteSiteConfirmation": {
+  "deleteLoginConfirmation": {
     "message": "Êtes-vous sûr(e) de vouloir supprimer ce site ?",
-    "description": "Are you sure you want to delete this site?"
+    "description": "Are you sure you want to delete this login?"
   },
-  "deletedSite": {
+  "deletedLogin": {
     "message": "Site supprimé",
-    "description": "Deleted site"
+    "description": "Deleted login"
   },
   "overwritePassword": {
     "message": "Écreaser le mot de passe",
@@ -621,6 +621,6 @@
   },
   "noneFolder": {
     "message": "(aucun)",
-    "description": "(none) - this is the folder for uncategorized sites"
+    "description": "(none) - this is the folder for uncategorized logins"
   }
 }
diff --git a/src/_locales/nl/messages.json b/src/_locales/nl/messages.json
index 77e2318a5d..7588e7de9e 100644
--- a/src/_locales/nl/messages.json
+++ b/src/_locales/nl/messages.json
@@ -95,9 +95,9 @@
     "message": "Genereer Wachtwoord (gekopieerd)",
     "description": "Generate Password (copied)"
   },
-  "noMatchingSites": {
+  "noMatchingLogins": {
     "message": "Geen corresponderende websites..",
-    "description": "No matching sites."
+    "description": "No matching logins."
   },
   "vaultLocked": {
     "message": "Kluis zit op slot.",
@@ -105,11 +105,11 @@
   },
   "autoFillInfo": {
     "message": "Er zijn geen beschikbare websites om het huidge browser-tabblad automatisch in te vullen.",
-    "description": "There are no sites available to auto-fill for the current browser tab."
+    "description": "There are no logins available to auto-fill for the current browser tab."
   },
-  "addSite": {
+  "addLogin": {
     "message": "Voeg een website toe",
-    "description": "Add a Site"
+    "description": "Add a Login"
   },
   "passwordHint": {
     "message": "Wachtwoordhint",
@@ -311,13 +311,13 @@
     "message": "Bewerk",
     "description": "Edit"
   },
-  "noSitesInList": {
+  "noLoginsInList": {
     "message": "Er zijn geen websites in de lijst.",
-    "description": "There are no sites in list."
+    "description": "There are no logins in list."
   },
   "siteInformation": {
     "message": "Website-informatie",
-    "description": "Site Information"
+    "description": "Login Information"
   },
   "username": {
     "message": "Gebruikersnaam",
@@ -335,21 +335,21 @@
     "message": "Aantekeningen",
     "description": "Notes"
   },
-  "editSite": {
+  "editLogin": {
     "message": "Bewerk Website",
-    "description": "Edit Site"
+    "description": "Edit Login"
   },
   "folder": {
     "message": "Map",
     "description": "Folder"
   },
-  "deleteSite": {
+  "deleteLogin": {
     "message": "Verwijder Website",
-    "description": "Delete Site"
+    "description": "Delete Login"
   },
-  "viewSite": {
+  "viewLogin": {
     "message": "Bekijk Website",
-    "description": "View Site"
+    "description": "View Login"
   },
   "launchWebsite": {
     "message": "Open Website",
@@ -481,7 +481,7 @@
   },
   "autofillError": {
     "message": "Automatisch invullen mislukt. Kopieer en plak je gebruikersnaam en/of wachtwoord handmatig.",
-    "description": "Unable to auto-fill the selected site on this page. Copy/paste your username and/or password instead."
+    "description": "Unable to auto-fill the selected login on this page. Copy/paste your username and/or password instead."
   },
   "loggedOut": {
     "message": "Uitgelogd",
@@ -575,21 +575,21 @@
     "message": "URI",
     "description": "URI"
   },
-  "addedSite": {
+  "addedLogin": {
     "message": "Website toegevoegd",
-    "description": "Added site"
+    "description": "Added login"
   },
-  "editedSite": {
+  "editedLogin": {
     "message": "Website bewerkt",
-    "description": "Edited site"
+    "description": "Edited login"
   },
-  "deleteSiteConfirmation": {
+  "deleteLoginConfirmation": {
     "message": "Weet je zeker dat je deze website wilt verwijderen?",
-    "description": "Are you sure you want to delete this site?"
+    "description": "Are you sure you want to delete this login?"
   },
-  "deletedSite": {
+  "deletedLogin": {
     "message": "Verwijderde website",
-    "description": "Deleted site"
+    "description": "Deleted login"
   },
   "overwritePassword": {
     "message": "Overschrijf Wachtwoord",
@@ -621,7 +621,7 @@
   },
   "noneFolder": {
     "message": "(geen)",
-    "description": "(none) - this is the folder for uncategorized sites"
+    "description": "(none) - this is the folder for uncategorized logins"
   },
   "features": {
     "message": "Features",
@@ -631,13 +631,13 @@
     "message": "We gebruiken Google Analytics om te weten te komen hoe de extensie gebruikt wordt, zodat we deze kunnen verbeteren. Alle verzamelde data is anoniem.",
     "description": "We use Google Analytics to better learn how the extension is being used so that we can make it better. All data collection is completely anonymous."
   },
-  "disableAddSiteNotification": {
+  "disableAddLoginNotification": {
     "message": "Zet Notificatie bij Nieuwe Site Uit",
-    "description": "Disable Add Site Notification"
+    "description": "Disable Add Login Notification"
   },
-  "addSiteNotificationDesc": {
+  "addLoginNotificationDesc": {
     "message": "De \"Notificatie bij Nieuwe Site\" vraagt automatisch om nieuwe sites op te slaan in je kluis wanneer je voor de eerste keer inlogt.",
-    "description": "The \"Add Site Notification\" automatically prompts you to save new sites to your vault whenever you log into them for the first time."
+    "description": "The \"Add Login Notification\" automatically prompts you to save new logins to your vault whenever you log into them for the first time."
   },
   "notificationAddDesc": {
     "message": "Moet bitwarden dit wachtwoord onthouden?",
diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json
index 65dac9cd0d..1a702d8831 100644
--- a/src/_locales/ru/messages.json
+++ b/src/_locales/ru/messages.json
@@ -95,9 +95,9 @@
     "message": "Сгенерировать пароль (с копированием)",
     "description": "Generate Password (copied)"
   },
-  "noMatchingSites": {
+  "noMatchingLogins": {
     "message": "Нет подходящих сайтов.",
-    "description": "No matching sites."
+    "description": "No matching logins."
   },
   "vaultLocked": {
     "message": "Хранилище заблокировано.",
@@ -105,11 +105,11 @@
   },
   "autoFillInfo": {
     "message": "Нет доступных учетных записей для автозаполнения в текущей вкладке браузера.",
-    "description": "There are no sites available to auto-fill for the current browser tab."
+    "description": "There are no logins available to auto-fill for the current browser tab."
   },
-  "addSite": {
+  "addLogin": {
     "message": "Добавить сайт",
-    "description": "Add a Site"
+    "description": "Add a Login"
   },
   "passwordHint": {
     "message": "Подсказка к паролю",
@@ -311,13 +311,13 @@
     "message": "Изменить",
     "description": "Edit"
   },
-  "noSitesInList": {
+  "noLoginsInList": {
     "message": "Нет сайтов для отображения.",
-    "description": "There are no sites in list."
+    "description": "There are no logins in list."
   },
-  "siteInformation": {
+  "loginInformation": {
     "message": "Информация о сайте",
-    "description": "Site Information"
+    "description": "Login Information"
   },
   "username": {
     "message": "Имя пользователя",
@@ -335,21 +335,21 @@
     "message": "Заметки",
     "description": "Notes"
   },
-  "editSite": {
+  "editLogin": {
     "message": "Изменение сайта",
-    "description": "Edit Site"
+    "description": "Edit Login"
   },
   "folder": {
     "message": "Папка",
     "description": "Folder"
   },
-  "deleteSite": {
+  "deleteLogin": {
     "message": "Удалить сайт",
-    "description": "Delete Site"
+    "description": "Delete Login"
   },
-  "viewSite": {
+  "viewLogin": {
     "message": "Просмотр сайта",
-    "description": "View Site"
+    "description": "View Login"
   },
   "launchWebsite": {
     "message": "Открыть сайт",
@@ -481,7 +481,7 @@
   },
   "autofillError": {
     "message": "Не получается автоматически заполнить данные сайта на этой странице. Скопируйте и вставьте логин/пароль напрямую из своего хранилища.",
-    "description": "Unable to auto-fill the selected site on this page. Copy/paste your username and/or password instead."
+    "description": "Unable to auto-fill the selected login on this page. Copy/paste your username and/or password instead."
   },
   "loggedOut": {
     "message": "Вы вышли из хранилища",
@@ -575,21 +575,21 @@
     "message": "URI",
     "description": "URI"
   },
-  "addedSite": {
+  "addedLogin": {
     "message": "Сайт добавлен",
-    "description": "Added site"
+    "description": "Added login"
   },
-  "editedSite": {
+  "editedLogin": {
     "message": "Сайт отредактирован",
-    "description": "Edited site"
+    "description": "Edited login"
   },
-  "deleteSiteConfirmation": {
+  "deleteLoginConfirmation": {
     "message": "Вы хотите удалить этот сайт?",
-    "description": "Are you sure you want to delete this site?"
+    "description": "Are you sure you want to delete this login?"
   },
-  "deletedSite": {
+  "deletedLogin": {
     "message": "Удалить сайт",
-    "description": "Deleted site"
+    "description": "Deleted login"
   },
   "overwritePassword": {
     "message": "Сменить пароль",
diff --git a/src/_locales/sv/messages.json b/src/_locales/sv/messages.json
index 75ade5964a..16ad2aa54a 100644
--- a/src/_locales/sv/messages.json
+++ b/src/_locales/sv/messages.json
@@ -95,9 +95,9 @@
     "message": "Skapa lösenord (kopierad)",
     "description": "Generate Password (copied)"
   },
-  "noMatchingSites": {
+  "noMatchingLogins": {
     "message": "Inga matchande inloggningar.",
-    "description": "No matching sites."
+    "description": "No matching logins."
   },
   "vaultLocked": {
     "message": "Valvet är låst.",
@@ -105,11 +105,11 @@
   },
   "autoFillInfo": {
     "message": "Det finns inga inloggningar tillgängliga för automatisk ifyllnad på den nuvarande fliken.",
-    "description": "There are no sites available to auto-fill for the current browser tab."
+    "description": "There are no logins available to auto-fill for the current browser tab."
   },
-  "addSite": {
+  "addLogin": {
     "message": "Lägg till en inloggning",
-    "description": "Add a Site"
+    "description": "Add a Login"
   },
   "passwordHint": {
     "message": "Lösenordsledtråd",
@@ -311,13 +311,13 @@
     "message": "Ändra",
     "description": "Edit"
   },
-  "noSitesInList": {
+  "noLoginsInList": {
     "message": "Det finns inga inloggningar att lista.",
-    "description": "There are no sites to list."
+    "description": "There are no logins to list."
   },
-  "siteInformation": {
+  "loginInformation": {
     "message": "Inloggningsinformation",
-    "description": "Site Information"
+    "description": "Login Information"
   },
   "username": {
     "message": "Användarnamn",
@@ -335,21 +335,21 @@
     "message": "Anteckningar",
     "description": "Notes"
   },
-  "editSite": {
+  "editLogin": {
     "message": "Ändra inloggning",
-    "description": "Edit Site"
+    "description": "Edit Login"
   },
   "folder": {
     "message": "Mapp",
     "description": "Folder"
   },
-  "deleteSite": {
+  "deleteLogin": {
     "message": "Ta bort inloggning",
-    "description": "Delete Site"
+    "description": "Delete Login"
   },
-  "viewSite": {
+  "viewLogin": {
     "message": "Visa inloggning",
-    "description": "View Site"
+    "description": "View Login"
   },
   "launchWebsite": {
     "message": "Öppna webbplats",
@@ -481,7 +481,7 @@
   },
   "autofillError": {
     "message": "Kunde inte automatiskt fylla i din inloggningsinformation på den här webbsidan. Klipp/klistra ditt användarnamn och/eller lösenord istället.",
-    "description": "Unable to auto-fill the selected site on this page. Copy/paste your username and/or password instead."
+    "description": "Unable to auto-fill the selected login on this page. Copy/paste your username and/or password instead."
   },
   "loggedOut": {
     "message": "Loggade ut",
@@ -575,21 +575,21 @@
     "message": "URI (länk)",
     "description": "URI"
   },
-  "addedSite": {
+  "addedLogin": {
     "message": "Skapade inloggning",
-    "description": "Added site"
+    "description": "Added login"
   },
-  "editedSite": {
+  "editedLogin": {
     "message": "Ändrade inloggning",
-    "description": "Edited site"
+    "description": "Edited login"
   },
-  "deleteSiteConfirmation": {
+  "deleteLoginConfirmation": {
     "message": "Är du säker på att du vill ta bort den här inloggningen?",
-    "description": "Are you sure you want to delete this site?"
+    "description": "Are you sure you want to delete this login?"
   },
-  "deletedSite": {
+  "deletedLogin": {
     "message": "Tog bort inloggning",
-    "description": "Deleted site"
+    "description": "Deleted login"
   },
   "overwritePassword": {
     "message": "Skriv över lösenord",
@@ -631,13 +631,13 @@
     "message": "Vi använder Google Analytics för att bättre förstå hur tillägget används av användare så att vi kan göra förbättringar. All information samlas in anonymt.",
     "description": "We use Google Analytics to better learn how the extension is being used so that we can make it better. All data collection is completely anonymous."
   },
-  "disableAddSiteNotification": {
+  "disableAddLoginNotification": {
     "message": "Stäng av 'lägg till inloggning'-meddelanden",
-    "description": "Disable Add Site Notification"
+    "description": "Disable Add Login Notification"
   },
-  "addSiteNotificationDesc": {
+  "addLoginNotificationDesc": {
     "message": "'Lägg till inloggning'-meddelanden frågar dig om du vill lägga till en inloggning automatiskt till ditt valv, när du använder en inloggning som inte redan finns i ditt valv.",
-    "description": "The \"Add Site Notification\" automatically prompts you to save new sites to your vault whenever you log into them for the first time."
+    "description": "The \"Add Login Notification\" automatically prompts you to save new logins to your vault whenever you log into them for the first time."
   },
   "notificationAddDesc": {
     "message": "Ska bitwarden komma ihåg det här lösenordet åt dig?",
diff --git a/src/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json
index 9aa149398a..c5b5b3ede1 100644
--- a/src/_locales/zh_CN/messages.json
+++ b/src/_locales/zh_CN/messages.json
@@ -95,9 +95,9 @@
     "message": "生成密码 (并复制)",
     "description": "Generate Password (copied)"
   },
-  "noMatchingSites": {
+  "noMatchingLogins": {
     "message": "没有匹配的网站。",
-    "description": "No matching sites."
+    "description": "No matching logins."
   },
   "vaultLocked": {
     "message": "密码库已锁定",
@@ -105,11 +105,11 @@
   },
   "autoFillInfo": {
     "message": "当前浏览器标签中没有可以自动填充的网站。",
-    "description": "There are no sites available to auto-fill for the current browser tab."
+    "description": "There are no logins available to auto-fill for the current browser tab."
   },
-  "addSite": {
+  "addLogin": {
     "message": "添加网站",
-    "description": "Add a Site"
+    "description": "Add a Login"
   },
   "passwordHint": {
     "message": "密码提示",
@@ -311,13 +311,13 @@
     "message": "编辑",
     "description": "Edit"
   },
-  "noSitesInList": {
+  "noLoginsInList": {
     "message": "列表里没有网站。",
-    "description": "There are no sites in list."
+    "description": "There are no logins in list."
   },
-  "siteInformation": {
+  "loginInformation": {
     "message": "网站信息",
-    "description": "Site Information"
+    "description": "Login Information"
   },
   "username": {
     "message": "用户名",
@@ -335,21 +335,21 @@
     "message": "笔记",
     "description": "Notes"
   },
-  "editSite": {
+  "editLogin": {
     "message": "编辑网站",
-    "description": "Edit Site"
+    "description": "Edit Login"
   },
   "folder": {
     "message": "文件夹",
     "description": "Folder"
   },
-  "deleteSite": {
+  "deleteLogin": {
     "message": "删除网站",
-    "description": "Delete Site"
+    "description": "Delete Login"
   },
-  "viewSite": {
+  "viewLogin": {
     "message": "查看网站",
-    "description": "View Site"
+    "description": "View Login"
   },
   "launchWebsite": {
     "message": "打开网站",
@@ -481,7 +481,7 @@
   },
   "autofillError": {
     "message": "无法在此页面自动填充所选择的网站。请手工 复制/粘贴 您的用户名、密码。",
-    "description": "Unable to auto-fill the selected site on this page. Copy/paste your username and/or password instead."
+    "description": "Unable to auto-fill the selected login on this page. Copy/paste your username and/or password instead."
   },
   "loggedOut": {
     "message": "已登出",
@@ -575,21 +575,21 @@
     "message": "URI",
     "description": "URI"
   },
-  "addedSite": {
+  "addedLogin": {
     "message": "已添加的网站",
-    "description": "Added site"
+    "description": "Added login"
   },
-  "editedSite": {
+  "editedLogin": {
     "message": "已编辑的网站",
-    "description": "Edited site"
+    "description": "Edited login"
   },
-  "deleteSiteConfirmation": {
+  "deleteLoginConfirmation": {
     "message": "您确定要删除此网站吗？",
-    "description": "Are you sure you want to delete this site?"
+    "description": "Are you sure you want to delete this login?"
   },
-  "deletedSite": {
+  "deletedLogin": {
     "message": "已删除的的网站",
-    "description": "Deleted site"
+    "description": "Deleted login"
   },
   "overwritePassword": {
     "message": "覆盖密码",
@@ -621,6 +621,6 @@
   },
   "noneFolder": {
     "message": "(无)",
-    "description": "(none) - this is the folder for uncategorized sites"
+    "description": "(none) - this is the folder for uncategorized logins"
   }
 }
diff --git a/src/background.js b/src/background.js
index 8bfbc798f0..c6662a112c 100644
--- a/src/background.js
+++ b/src/background.js
@@ -7,9 +7,9 @@ var cryptoService = new CryptoService(constantsService);
 var tokenService = new TokenService();
 var apiService = new ApiService(tokenService);
 var userService = new UserService(tokenService, apiService, cryptoService);
-var siteService = new SiteService(cryptoService, userService, apiService);
+var loginService = new LoginService(cryptoService, userService, apiService);
 var folderService = new FolderService(cryptoService, userService, apiService);
-var syncService = new SyncService(siteService, folderService, userService, apiService);
+var syncService = new SyncService(loginService, folderService, userService, apiService);
 var autofillService = new AutofillService();
 var passwordGenerationService = new PasswordGenerationService();
 var appIdService = new AppIdService();
@@ -28,7 +28,7 @@ chrome.commands.onCommand.addListener(function (command) {
 });
 
 var loadMenuRan = false,
-    siteToAutoFill = null,
+    loginToAutoFill = null,
     pageDetailsToAutoFill = [],
     autofillTimeout = null;
 
@@ -230,35 +230,35 @@ function loadMenuAndUpdateBadge(url, tabId, loadContextMenuOptions) {
 
     chrome.browserAction.setBadgeBackgroundColor({ color: '#294e5f' });
 
-    siteService.getAllDecryptedForDomain(tabDomain).then(function (sites) {
-        sortSites(sites);
-        for (var i = 0; i < sites.length; i++) {
+    loginService.getAllDecryptedForDomain(tabDomain).then(function (logins) {
+        sortLogins(logins);
+        for (var i = 0; i < logins.length; i++) {
             if (loadContextMenuOptions) {
-                loadSiteContextMenuOptions(sites[i]);
+                loadLoginContextMenuOptions(logins[i]);
             }
         }
 
-        if (sites.length > 0 && sites.length < 9) {
+        if (logins.length > 0 && logins.length < 9) {
             chrome.browserAction.setBadgeText({
-                text: sites.length.toString(),
+                text: logins.length.toString(),
                 tabId: tabId
             });
         }
-        else if (sites.length > 0) {
+        else if (logins.length > 0) {
             chrome.browserAction.setBadgeText({
                 text: '9+',
                 tabId: tabId
             });
         }
         else {
-            loadNoSitesContextMenuOptions(i18nService.noMatchingSites);
+            loadNoLoginsContextMenuOptions(i18nService.noMatchingLogins);
             chrome.browserAction.setBadgeText({
                 text: '',
                 tabId: tabId
             });
         }
     }, function () {
-        loadNoSitesContextMenuOptions(i18nService.vaultLocked);
+        loadNoLoginsContextMenuOptions(i18nService.vaultLocked);
         chrome.browserAction.setBadgeText({
             text: '',
             tabId: tabId
@@ -284,29 +284,29 @@ chrome.contextMenus.onClicked.addListener(function (info, tab) {
             return;
         }
 
-        siteService.getAllDecrypted().then(function (sites) {
-            for (var i = 0; i < sites.length; i++) {
-                if (sites[i].id === id) {
+        loginService.getAllDecrypted().then(function (logins) {
+            for (var i = 0; i < logins.length; i++) {
+                if (logins[i].id === id) {
                     if (info.parentMenuItemId === 'autofill') {
                         ga('send', {
                             hitType: 'event',
                             eventAction: 'Autofilled From Context Menu'
                         });
-                        startAutofillPage(sites[i]);
+                        startAutofillPage(logins[i]);
                     }
                     else if (info.parentMenuItemId === 'copy-username') {
                         ga('send', {
                             hitType: 'event',
                             eventAction: 'Copied Username From Context Menu'
                         });
-                        copyToClipboard(sites[i].username);
+                        copyToClipboard(logins[i].username);
                     }
                     else if (info.parentMenuItemId === 'copy-password') {
                         ga('send', {
                             hitType: 'event',
                             eventAction: 'Copied Password From Context Menu'
                         });
-                        copyToClipboard(sites[i].password);
+                        copyToClipboard(logins[i].password);
                     }
                     return;
                 }
@@ -357,10 +357,10 @@ function addLogin(login, tab) {
         return;
     }
 
-    siteService.getAllDecryptedForDomain(loginDomain).then(function (sites) {
+    loginService.getAllDecryptedForDomain(loginDomain).then(function (logins) {
         var match = false;
-        for (var i = 0; i < sites.length; i++) {
-            if (sites[i].username === login.username) {
+        for (var i = 0; i < logins.length; i++) {
+            if (logins[i].username === login.username) {
                 match = true;
                 break;
             }
@@ -407,7 +407,7 @@ function saveAddLogin(tab) {
         if (loginsToAdd[i].tabId === tab.id) {
             var loginToAdd = loginsToAdd[i];
             loginsToAdd.splice(i, 1);
-            siteService.encrypt({
+            loginService.encrypt({
                 id: null,
                 folderId: null,
                 favorite: false,
@@ -416,12 +416,12 @@ function saveAddLogin(tab) {
                 username: loginToAdd.username,
                 password: loginToAdd.password,
                 notes: null
-            }).then(function (siteModel) {
-                var site = new Site(siteModel, true);
-                siteService.saveWithServer(site).then(function (site) {
+            }).then(function (loginModel) {
+                var login = new Login(loginModel, true);
+                loginService.saveWithServer(login).then(function (login) {
                     ga('send', {
                         hitType: 'event',
-                        eventAction: 'Added Site from Notification Bar'
+                        eventAction: 'Added Login from Notification Bar'
                     });
                 });
             });
@@ -467,8 +467,8 @@ function checkLoginsToAdd(tab) {
     }
 }
 
-function startAutofillPage(site) {
-    siteToAutoFill = site;
+function startAutofillPage(login) {
+    loginToAutoFill = login;
     chrome.tabs.query({ active: true, currentWindow: true }, function (tabs) {
         var tabId = null;
         if (tabs.length > 0) {
@@ -500,15 +500,15 @@ function autofillPage() {
             return;
         }
 
-        if (siteToAutoFill && pageDetailsToAutoFill && pageDetailsToAutoFill.length) {
+        if (loginToAutoFill && pageDetailsToAutoFill && pageDetailsToAutoFill.length) {
             for (var i = 0; i < pageDetailsToAutoFill.length; i++) {
                 // make sure we're still on correct tab
                 if (pageDetailsToAutoFill[i].tabId !== tabId) {
                     continue;
                 }
 
-                var fillScript = autofillService.generateFillScript(pageDetailsToAutoFill[i].details, siteToAutoFill.username,
-                    siteToAutoFill.password);
+                var fillScript = autofillService.generateFillScript(pageDetailsToAutoFill[i].details, loginToAutoFill.username,
+                    loginToAutoFill.password);
                 if (tabId && fillScript && fillScript.script && fillScript.script.length) {
                     chrome.tabs.sendMessage(tabId, {
                         command: 'fillForm',
@@ -521,13 +521,13 @@ function autofillPage() {
         }
 
         // reset
-        siteToAutoFill = null;
+        loginToAutoFill = null;
         pageDetailsToAutoFill = [];
     });
 }
 
-function sortSites(sites) {
-    sites.sort(function (a, b) {
+function sortLogins(logins) {
+    logins.sort(function (a, b) {
         var nameA = (a.name + '_' + a.username).toUpperCase();
         var nameB = (b.name + '_' + b.username).toUpperCase();
 
@@ -542,17 +542,17 @@ function sortSites(sites) {
     });
 }
 
-function loadSiteContextMenuOptions(site) {
-    var title = site.name + (site.username && site.username !== '' ? ' (' + site.username + ')' : '');
-    loadContextMenuOptions(title, site.id, site);
+function loadLoginContextMenuOptions(login) {
+    var title = login.name + (login.username && login.username !== '' ? ' (' + login.username + ')' : '');
+    loadContextMenuOptions(title, login.id, login);
 }
 
-function loadNoSitesContextMenuOptions(noSitesMessage) {
-    loadContextMenuOptions(noSitesMessage, 'noop', null);
+function loadNoLoginsContextMenuOptions(noLoginsMessage) {
+    loadContextMenuOptions(noLoginsMessage, 'noop', null);
 }
 
-function loadContextMenuOptions(title, idSuffix, site) {
-    if (!site || (site.password && site.password !== '')) {
+function loadContextMenuOptions(title, idSuffix, login) {
+    if (!login || (login.password && login.password !== '')) {
         chrome.contextMenus.create({
             type: 'normal',
             id: 'autofill_' + idSuffix,
@@ -562,7 +562,7 @@ function loadContextMenuOptions(title, idSuffix, site) {
         });
     }
 
-    if (!site || (site.username && site.username !== '')) {
+    if (!login || (login.username && login.username !== '')) {
         chrome.contextMenus.create({
             type: 'normal',
             id: 'copy-username_' + idSuffix,
@@ -572,7 +572,7 @@ function loadContextMenuOptions(title, idSuffix, site) {
         });
     }
 
-    if (!site || (site.password && site.password !== '')) {
+    if (!login || (login.password && login.password !== '')) {
         chrome.contextMenus.create({
             type: 'normal',
             id: 'copy-password_' + idSuffix,
@@ -660,7 +660,7 @@ function checkLock() {
                         cryptoService.clearKey(function () {
                             setIcon();
                             folderService.clearCache();
-                            siteService.clearCache();
+                            loginService.clearCache();
                             refreshBadgeAndMenu();
                         });
                     }
diff --git a/src/manifest.json b/src/manifest.json
index ea319f9cb6..fe26ae6a74 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -48,7 +48,7 @@
       "services/apiService.js",
       "services/userService.js",
       "services/folderService.js",
-      "services/siteService.js",
+      "services/loginService.js",
       "services/syncService.js",
       "services/autofillService.js",
       "services/appIdService.js",
diff --git a/src/popup/app/vault/vaultAddSiteController.js b/src/popup/app/vault/vaultAddLoginController.js
similarity index 100%
rename from src/popup/app/vault/vaultAddSiteController.js
rename to src/popup/app/vault/vaultAddLoginController.js
diff --git a/src/popup/app/vault/vaultEditSiteController.js b/src/popup/app/vault/vaultEditLoginController.js
similarity index 100%
rename from src/popup/app/vault/vaultEditSiteController.js
rename to src/popup/app/vault/vaultEditLoginController.js
diff --git a/src/popup/app/vault/vaultViewSiteController.js b/src/popup/app/vault/vaultViewLoginController.js
similarity index 100%
rename from src/popup/app/vault/vaultViewSiteController.js
rename to src/popup/app/vault/vaultViewLoginController.js
diff --git a/src/popup/app/vault/views/vaultAddSite.html b/src/popup/app/vault/views/vaultAddLogin.html
similarity index 100%
rename from src/popup/app/vault/views/vaultAddSite.html
rename to src/popup/app/vault/views/vaultAddLogin.html
diff --git a/src/popup/app/vault/views/vaultEditSite.html b/src/popup/app/vault/views/vaultEditLogin.html
similarity index 100%
rename from src/popup/app/vault/views/vaultEditSite.html
rename to src/popup/app/vault/views/vaultEditLogin.html
diff --git a/src/popup/app/vault/views/vaultViewSite.html b/src/popup/app/vault/views/vaultViewLogin.html
similarity index 97%
rename from src/popup/app/vault/views/vaultViewSite.html
rename to src/popup/app/vault/views/vaultViewLogin.html
index b561709c75..5c62da6c44 100644
--- a/src/popup/app/vault/views/vaultViewSite.html
+++ b/src/popup/app/vault/views/vaultViewLogin.html
@@ -19,12 +19,12 @@
                     {{login.name}}
                 </div>
                 <div class="list-section-item" ng-if="login.uri">
-                    <a class="btn-list" href="" title="{{i18n.launchWebsite}}" ng-click="launchWebsite(site)"
+                    <a class="btn-list" href="" title="{{i18n.launchWebsite}}" ng-click="launchWebsite(login)"
                        ng-show="login.showLaunch">
                         <i class="fa fa-lg fa-share-square-o"></i>
                     </a>
                     <span class="item-label">{{i18n.website}}</span>
-                    {{site.website}}
+                    {{login.website}}
                 </div>
                 <div class="list-section-item" ng-if="login.username">
                     <a class="btn-list" href="" title="{{i18n.copyUsername}}" ngclipboard ngclipboard-error="clipboardError(e)"