diff --git a/src/App/Abstractions/Repositories/ISiteApiRepository.cs b/src/App/Abstractions/Repositories/ILoginApiRepository.cs
similarity index 100%
rename from src/App/Abstractions/Repositories/ISiteApiRepository.cs
rename to src/App/Abstractions/Repositories/ILoginApiRepository.cs
diff --git a/src/App/Abstractions/Repositories/ISiteRepository.cs b/src/App/Abstractions/Repositories/ILoginRepository.cs
similarity index 100%
rename from src/App/Abstractions/Repositories/ISiteRepository.cs
rename to src/App/Abstractions/Repositories/ILoginRepository.cs
diff --git a/src/App/Abstractions/Services/ISiteService.cs b/src/App/Abstractions/Services/ILoginService.cs
similarity index 100%
rename from src/App/Abstractions/Services/ISiteService.cs
rename to src/App/Abstractions/Services/ILoginService.cs
diff --git a/src/App/App.csproj b/src/App/App.csproj
index f75c5dc7c..89f75bfc3 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -47,7 +47,7 @@
     <Compile Include="Abstractions\Services\IKeyDerivationService.cs" />
     <Compile Include="Abstractions\Services\ILogService.cs" />
     <Compile Include="Abstractions\Services\IReflectionService.cs" />
-    <Compile Include="Abstractions\Services\ISiteService.cs" />
+    <Compile Include="Abstractions\Services\ILoginService.cs" />
     <Compile Include="Abstractions\Services\IFolderService.cs" />
     <Compile Include="App.cs" />
     <Compile Include="Abstractions\Services\ISecureStorageService.cs" />
@@ -84,7 +84,7 @@
     <Compile Include="Models\Api\Request\FolderRequest.cs" />
     <Compile Include="Models\Api\Request\DeviceRequest.cs" />
     <Compile Include="Models\Api\Request\RegisterRequest.cs" />
-    <Compile Include="Models\Api\Request\SiteRequest.cs" />
+    <Compile Include="Models\Api\Request\LoginRequest.cs" />
     <Compile Include="Models\Api\Request\PasswordHintRequest.cs" />
     <Compile Include="Models\Api\Request\TokenRequest.cs" />
     <Compile Include="Models\Api\Request\TokenTwoFactorRequest.cs" />
@@ -94,15 +94,15 @@
     <Compile Include="Models\Api\Response\FolderResponse.cs" />
     <Compile Include="Models\Api\Response\ListResponse.cs" />
     <Compile Include="Models\Api\Response\DeviceResponse.cs" />
-    <Compile Include="Models\Api\Response\SiteResponse.cs" />
+    <Compile Include="Models\Api\Response\LoginResponse.cs" />
     <Compile Include="Models\Api\Response\TokenResponse.cs" />
     <Compile Include="Models\Api\Response\ProfileResponse.cs" />
-    <Compile Include="Models\Api\SiteDataModel.cs" />
+    <Compile Include="Models\Api\LoginDataModel.cs" />
     <Compile Include="Models\Cipher.cs" />
     <Compile Include="Models\CipherString.cs" />
     <Compile Include="Models\Data\FolderData.cs" />
     <Compile Include="Abstractions\IDataObject.cs" />
-    <Compile Include="Models\Data\SiteData.cs" />
+    <Compile Include="Models\Data\LoginData.cs" />
     <Compile Include="Models\DomainName.cs" />
     <Compile Include="Models\Folder.cs" />
     <Compile Include="Models\Page\AppExtensionPageModel.cs" />
@@ -111,8 +111,8 @@
     <Compile Include="Models\Page\PasswordGeneratorPageModel.cs" />
     <Compile Include="Models\PlatformCulture.cs" />
     <Compile Include="Models\PushNotification.cs" />
-    <Compile Include="Models\Site.cs" />
-    <Compile Include="Models\Page\VaultViewSitePageModel.cs" />
+    <Compile Include="Models\Login.cs" />
+    <Compile Include="Models\Page\VaultViewLoginPageModel.cs" />
     <Compile Include="Pages\HomePage.cs" />
     <Compile Include="Pages\Lock\LockPasswordPage.cs" />
     <Compile Include="Pages\LoginTwoFactorPage.cs" />
@@ -135,21 +135,21 @@
     <Compile Include="Pages\Settings\SettingsPage.cs" />
     <Compile Include="Pages\Settings\SettingsListFoldersPage.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Abstractions\Repositories\ISiteRepository.cs" />
+    <Compile Include="Abstractions\Repositories\ILoginRepository.cs" />
     <Compile Include="Repositories\ApiRepository.cs" />
     <Compile Include="Repositories\AccountsApiRepository.cs" />
     <Compile Include="Repositories\BaseApiRepository.cs" />
     <Compile Include="Abstractions\Repositories\IApiRepository.cs" />
     <Compile Include="Abstractions\Repositories\IFolderApiRepository.cs" />
-    <Compile Include="Abstractions\Repositories\ISiteApiRepository.cs" />
+    <Compile Include="Abstractions\Repositories\ILoginApiRepository.cs" />
     <Compile Include="Repositories\AuthApiRepository.cs" />
     <Compile Include="Abstractions\Repositories\IAuthApiRepository.cs" />
     <Compile Include="Repositories\DeviceApiRepository.cs" />
     <Compile Include="Repositories\CipherApiRepository.cs" />
     <Compile Include="Abstractions\Repositories\ICipherApiRepository.cs" />
-    <Compile Include="Repositories\SiteApiRepository.cs" />
+    <Compile Include="Repositories\LoginApiRepository.cs" />
     <Compile Include="Repositories\FolderApiRepository.cs" />
-    <Compile Include="Repositories\SiteRepository.cs" />
+    <Compile Include="Repositories\LoginRepository.cs" />
     <Compile Include="Repositories\FolderRepository.cs" />
     <Compile Include="Abstractions\Repositories\IFolderRepository.cs" />
     <Compile Include="Abstractions\Repositories\IRepository.cs" />
@@ -189,16 +189,16 @@
     <Compile Include="Abstractions\Services\ISyncService.cs" />
     <Compile Include="Abstractions\Services\IPasswordGenerationService.cs" />
     <Compile Include="Services\SyncService.cs" />
-    <Compile Include="Services\SiteService.cs" />
+    <Compile Include="Services\LoginService.cs" />
     <Compile Include="Services\AuthService.cs" />
     <Compile Include="Services\CryptoService.cs" />
     <Compile Include="Models\Page\VaultListPageModel.cs" />
     <Compile Include="Pages\LoginPage.cs" />
     <Compile Include="Pages\Settings\SettingsAddFolderPage.cs" />
-    <Compile Include="Pages\Vault\VaultAddSitePage.cs" />
-    <Compile Include="Pages\Vault\VaultViewSitePage.cs" />
-    <Compile Include="Pages\Vault\VaultEditSitePage.cs" />
-    <Compile Include="Pages\Vault\VaultListSitesPage.cs" />
+    <Compile Include="Pages\Vault\VaultAddLoginPage.cs" />
+    <Compile Include="Pages\Vault\VaultViewLoginPage.cs" />
+    <Compile Include="Pages\Vault\VaultEditLoginPage.cs" />
+    <Compile Include="Pages\Vault\VaultListLoginsPage.cs" />
     <Compile Include="Services\PasswordGenerationService.cs" />
     <Compile Include="Utilities\Extentions.cs" />
     <Compile Include="Utilities\ExtendedObservableCollection.cs" />
diff --git a/src/App/Models/Api/SiteDataModel.cs b/src/App/Models/Api/LoginDataModel.cs
similarity index 100%
rename from src/App/Models/Api/SiteDataModel.cs
rename to src/App/Models/Api/LoginDataModel.cs
diff --git a/src/App/Models/Api/Request/SiteRequest.cs b/src/App/Models/Api/Request/LoginRequest.cs
similarity index 100%
rename from src/App/Models/Api/Request/SiteRequest.cs
rename to src/App/Models/Api/Request/LoginRequest.cs
diff --git a/src/App/Models/Api/Response/SiteResponse.cs b/src/App/Models/Api/Response/LoginResponse.cs
similarity index 100%
rename from src/App/Models/Api/Response/SiteResponse.cs
rename to src/App/Models/Api/Response/LoginResponse.cs
diff --git a/src/App/Models/Data/SiteData.cs b/src/App/Models/Data/LoginData.cs
similarity index 100%
rename from src/App/Models/Data/SiteData.cs
rename to src/App/Models/Data/LoginData.cs
diff --git a/src/App/Models/Site.cs b/src/App/Models/Login.cs
similarity index 100%
rename from src/App/Models/Site.cs
rename to src/App/Models/Login.cs
diff --git a/src/App/Models/Page/VaultViewSitePageModel.cs b/src/App/Models/Page/VaultViewLoginPageModel.cs
similarity index 100%
rename from src/App/Models/Page/VaultViewSitePageModel.cs
rename to src/App/Models/Page/VaultViewLoginPageModel.cs
diff --git a/src/App/Pages/Vault/VaultAddSitePage.cs b/src/App/Pages/Vault/VaultAddLoginPage.cs
similarity index 100%
rename from src/App/Pages/Vault/VaultAddSitePage.cs
rename to src/App/Pages/Vault/VaultAddLoginPage.cs
diff --git a/src/App/Pages/Vault/VaultEditSitePage.cs b/src/App/Pages/Vault/VaultEditLoginPage.cs
similarity index 100%
rename from src/App/Pages/Vault/VaultEditSitePage.cs
rename to src/App/Pages/Vault/VaultEditLoginPage.cs
diff --git a/src/App/Pages/Vault/VaultListSitesPage.cs b/src/App/Pages/Vault/VaultListLoginsPage.cs
similarity index 100%
rename from src/App/Pages/Vault/VaultListSitesPage.cs
rename to src/App/Pages/Vault/VaultListLoginsPage.cs
diff --git a/src/App/Pages/Vault/VaultViewSitePage.cs b/src/App/Pages/Vault/VaultViewLoginPage.cs
similarity index 100%
rename from src/App/Pages/Vault/VaultViewSitePage.cs
rename to src/App/Pages/Vault/VaultViewLoginPage.cs
diff --git a/src/App/Repositories/SiteApiRepository.cs b/src/App/Repositories/LoginApiRepository.cs
similarity index 100%
rename from src/App/Repositories/SiteApiRepository.cs
rename to src/App/Repositories/LoginApiRepository.cs
diff --git a/src/App/Repositories/SiteRepository.cs b/src/App/Repositories/LoginRepository.cs
similarity index 100%
rename from src/App/Repositories/SiteRepository.cs
rename to src/App/Repositories/LoginRepository.cs
diff --git a/src/App/Services/SiteService.cs b/src/App/Services/LoginService.cs
similarity index 100%
rename from src/App/Services/SiteService.cs
rename to src/App/Services/LoginService.cs
diff --git a/src/iOS.Extension/SiteAddViewController.cs b/src/iOS.Extension/LoginAddViewController.cs
similarity index 100%
rename from src/iOS.Extension/SiteAddViewController.cs
rename to src/iOS.Extension/LoginAddViewController.cs
diff --git a/src/iOS.Extension/SiteAddViewController.designer.cs b/src/iOS.Extension/LoginAddViewController.designer.cs
similarity index 100%
rename from src/iOS.Extension/SiteAddViewController.designer.cs
rename to src/iOS.Extension/LoginAddViewController.designer.cs
diff --git a/src/iOS.Extension/SiteListViewController.cs b/src/iOS.Extension/LoginListViewController.cs
similarity index 100%
rename from src/iOS.Extension/SiteListViewController.cs
rename to src/iOS.Extension/LoginListViewController.cs
diff --git a/src/iOS.Extension/SiteListViewController.designer.cs b/src/iOS.Extension/LoginListViewController.designer.cs
similarity index 100%
rename from src/iOS.Extension/SiteListViewController.designer.cs
rename to src/iOS.Extension/LoginListViewController.designer.cs
diff --git a/src/iOS.Extension/Models/SiteViewModel.cs b/src/iOS.Extension/Models/LoginViewModel.cs
similarity index 100%
rename from src/iOS.Extension/Models/SiteViewModel.cs
rename to src/iOS.Extension/Models/LoginViewModel.cs
diff --git a/src/iOS.Extension/iOS.Extension.csproj b/src/iOS.Extension/iOS.Extension.csproj
index e88a12ae4..a312676a6 100644
--- a/src/iOS.Extension/iOS.Extension.csproj
+++ b/src/iOS.Extension/iOS.Extension.csproj
@@ -234,13 +234,13 @@
     <Compile Include="PasswordGeneratorViewController.designer.cs">
       <DependentUpon>PasswordGeneratorViewController.cs</DependentUpon>
     </Compile>
-    <Compile Include="SiteAddViewController.cs" />
-    <Compile Include="SiteAddViewController.designer.cs">
-      <DependentUpon>SiteAddViewController.cs</DependentUpon>
+    <Compile Include="LoginAddViewController.cs" />
+    <Compile Include="LoginAddViewController.designer.cs">
+      <DependentUpon>LoginAddViewController.cs</DependentUpon>
     </Compile>
-    <Compile Include="SiteListViewController.cs" />
-    <Compile Include="SiteListViewController.designer.cs">
-      <DependentUpon>SiteListViewController.cs</DependentUpon>
+    <Compile Include="LoginListViewController.cs" />
+    <Compile Include="LoginListViewController.designer.cs">
+      <DependentUpon>LoginListViewController.cs</DependentUpon>
     </Compile>
     <Compile Include="Main.cs" />
     <Compile Include="AppDelegate.cs" />
@@ -255,7 +255,7 @@
     <None Include="app.config" />
     <None Include="Info.plist" />
     <None Include="Entitlements.plist" />
-    <Compile Include="Models\SiteViewModel.cs" />
+    <Compile Include="Models\LoginViewModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <InterfaceDefinition Include="MainInterface.storyboard" />
     <None Include="packages.config">