diff --git a/src/App/Pages/Tools/ToolsPage.cs b/src/App/Pages/Tools/ToolsPage.cs
index 8c2dc82fd..0b266ea74 100644
--- a/src/App/Pages/Tools/ToolsPage.cs
+++ b/src/App/Pages/Tools/ToolsPage.cs
@@ -36,7 +36,7 @@ namespace Bit.App.Pages
                 "refresh.png");
             WebCell = new ToolsViewCell(AppResources.WebVault, AppResources.WebVaultDescription, "globe.png");
             ShareCell = new ToolsViewCell(AppResources.ShareVault, AppResources.ShareVaultDescription, "share_tools.png");
-            ImportCell = new ToolsViewCell(AppResources.ImportLogins, AppResources.ImportLoginsDescription, "cloudup.png");
+            ImportCell = new ToolsViewCell(AppResources.ImportItems, AppResources.ImportItemsDescription, "cloudup.png");
 
             var section = new TableSection(" ") { GeneratorCell };
 
@@ -142,7 +142,7 @@ namespace Bit.App.Pages
 
         private async void ImportCell_Tapped(object sender, EventArgs e)
         {
-            if(!await _userDialogs.ConfirmAsync(AppResources.ImportLoginsConfirmation, null, AppResources.Yes,
+            if(!await _userDialogs.ConfirmAsync(AppResources.ImportItemsConfirmation, null, AppResources.Yes,
                 AppResources.Cancel))
             {
                 return;
diff --git a/src/App/Pages/Vault/VaultAddLoginPage.cs b/src/App/Pages/Vault/VaultAddLoginPage.cs
index 9535ff42d..d048b72aa 100644
--- a/src/App/Pages/Vault/VaultAddLoginPage.cs
+++ b/src/App/Pages/Vault/VaultAddLoginPage.cs
@@ -120,7 +120,7 @@ namespace Bit.App.Pages
                 HasUnevenRows = true,
                 Root = new TableRoot
                 {
-                    new TableSection(AppResources.LoginInformation)
+                    new TableSection(AppResources.ItemInformation)
                     {
                         NameCell,
                         UriCell,
@@ -206,7 +206,7 @@ namespace Bit.App.Pages
 
                 if(saveTask.Succeeded)
                 {
-                    _userDialogs.Toast(AppResources.NewLoginCreated);
+                    _userDialogs.Toast(AppResources.NewItemCreated);
                     if(_fromAutofill)
                     {
                         _googleAnalyticsService.TrackExtensionEvent("CreatedLogin");
@@ -227,7 +227,7 @@ namespace Bit.App.Pages
                 }
             }, ToolbarItemOrder.Default, 0);
 
-            Title = AppResources.AddLogin;
+            Title = AppResources.AddItem;
             Content = table;
             ToolbarItems.Add(saveToolBarItem);
             if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
diff --git a/src/App/Pages/Vault/VaultAutofillListCiphersPage.cs b/src/App/Pages/Vault/VaultAutofillListCiphersPage.cs
index 094d38add..546d2b4a2 100644
--- a/src/App/Pages/Vault/VaultAutofillListCiphersPage.cs
+++ b/src/App/Pages/Vault/VaultAutofillListCiphersPage.cs
@@ -65,7 +65,7 @@ namespace Bit.App.Pages
         {
             var noDataLabel = new Label
             {
-                Text = string.Format(AppResources.NoLoginsForUri, _name ?? "--"),
+                Text = string.Format(AppResources.NoItemsForUri, _name ?? "--"),
                 HorizontalTextAlignment = TextAlignment.Center,
                 FontSize = Device.GetNamedSize(NamedSize.Small, typeof(Label)),
                 Style = (Style)Application.Current.Resources["text-muted"]
@@ -73,7 +73,7 @@ namespace Bit.App.Pages
 
             var addCipherButton = new ExtendedButton
             {
-                Text = AppResources.AddALogin,
+                Text = AppResources.AddAnItem,
                 Command = new Command(() => AddCipherAsync()),
                 Style = (Style)Application.Current.Resources["btn-primaryAccent"]
             };
@@ -106,7 +106,7 @@ namespace Bit.App.Pages
                 ListView.RowHeight = -1;
             }
 
-            Title = string.Format(AppResources.LoginsForUri, _name ?? "--");
+            Title = string.Format(AppResources.ItemsForUri, _name ?? "--");
 
             LoadingIndicator = new ActivityIndicator
             {
@@ -170,7 +170,7 @@ namespace Bit.App.Pages
                     .ToList();
                 if(normalLogins?.Any() ?? false)
                 {
-                    autofillGroupings.Add(new VaultListPageModel.AutofillGrouping(normalLogins, AppResources.MatchingLogins));
+                    autofillGroupings.Add(new VaultListPageModel.AutofillGrouping(normalLogins, AppResources.MatchingItems));
                 }
 
                 var fuzzyLogins = ciphers?.Item2.Select(l => new VaultListPageModel.AutofillCipher(l, true))
@@ -180,7 +180,7 @@ namespace Bit.App.Pages
                 if(fuzzyLogins?.Any() ?? false)
                 {
                     autofillGroupings.Add(new VaultListPageModel.AutofillGrouping(fuzzyLogins,
-                        AppResources.PossibleMatchingLogins));
+                        AppResources.PossibleMatchingItems));
                 }
 
                 Device.BeginInvokeOnMainThread(() =>
diff --git a/src/App/Pages/Vault/VaultEditLoginPage.cs b/src/App/Pages/Vault/VaultEditLoginPage.cs
index b077e4be1..32bcec174 100644
--- a/src/App/Pages/Vault/VaultEditLoginPage.cs
+++ b/src/App/Pages/Vault/VaultEditLoginPage.cs
@@ -141,7 +141,7 @@ namespace Bit.App.Pages
                 HasUnevenRows = true,
                 Root = new TableRoot
                 {
-                    new TableSection(AppResources.LoginInformation)
+                    new TableSection(AppResources.ItemInformation)
                     {
                         NameCell,
                         UriCell,
@@ -237,7 +237,7 @@ namespace Bit.App.Pages
 
                 if(saveTask.Succeeded)
                 {
-                    _userDialogs.Toast(AppResources.LoginUpdated);
+                    _userDialogs.Toast(AppResources.ItemUpdated);
                     _googleAnalyticsService.TrackAppEvent("EditedLogin");
                     await Navigation.PopForDeviceAsync();
                 }
@@ -251,7 +251,7 @@ namespace Bit.App.Pages
                 }
             }, ToolbarItemOrder.Default, 0);
 
-            Title = AppResources.EditLogin;
+            Title = AppResources.EditItem;
             Content = table;
             ToolbarItems.Add(saveToolBarItem);
             if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
@@ -414,7 +414,7 @@ namespace Bit.App.Pages
 
             if(deleteTask.Succeeded)
             {
-                _userDialogs.Toast(AppResources.LoginDeleted);
+                _userDialogs.Toast(AppResources.ItemDeleted);
                 _googleAnalyticsService.TrackAppEvent("DeletedLogin");
                 await Navigation.PopForDeviceAsync();
             }
diff --git a/src/App/Pages/Vault/VaultListCiphersPage.cs b/src/App/Pages/Vault/VaultListCiphersPage.cs
index a26dcc59f..585aef1ec 100644
--- a/src/App/Pages/Vault/VaultListCiphersPage.cs
+++ b/src/App/Pages/Vault/VaultListCiphersPage.cs
@@ -119,7 +119,7 @@ namespace Bit.App.Pages
 
             var noDataLabel = new Label
             {
-                Text = _favorites ? AppResources.NoFavorites : AppResources.NoLogins,
+                Text = _favorites ? AppResources.NoFavorites : AppResources.NoItems,
                 HorizontalTextAlignment = TextAlignment.Center,
                 FontSize = Device.GetNamedSize(NamedSize.Small, typeof(Label)),
                 Style = (Style)Application.Current.Resources["text-muted"]
@@ -137,7 +137,7 @@ namespace Bit.App.Pages
             {
                 var addCipherButton = new ExtendedButton
                 {
-                    Text = AppResources.AddALogin,
+                    Text = AppResources.AddAnItem,
                     Command = new Command(() => AddCipher()),
                     Style = (Style)Application.Current.Resources["btn-primaryAccent"]
                 };
diff --git a/src/App/Pages/Vault/VaultViewLoginPage.cs b/src/App/Pages/Vault/VaultViewLoginPage.cs
index d60ce7955..aea5f9e60 100644
--- a/src/App/Pages/Vault/VaultViewLoginPage.cs
+++ b/src/App/Pages/Vault/VaultViewLoginPage.cs
@@ -113,7 +113,7 @@ namespace Bit.App.Pages
             NotesCell.Value.SetBinding(Label.TextProperty, nameof(VaultViewLoginPageModel.Notes));
             NotesCell.Value.LineBreakMode = LineBreakMode.WordWrap;
 
-            LoginInformationSection = new TableSection(AppResources.LoginInformation)
+            LoginInformationSection = new TableSection(AppResources.ItemInformation)
             {
                 nameCell
             };
@@ -150,7 +150,7 @@ namespace Bit.App.Pages
                 UriCell.Button1.WidthRequest = 75;
             }
 
-            Title = AppResources.ViewLogin;
+            Title = AppResources.ViewItem;
             Content = Table;
             BindingContext = Model;
         }
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index 249a9fdbd..1b8f3363b 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -98,11 +98,11 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Add a Login.
+        ///   Looks up a localized string similar to Add an Item.
         /// </summary>
-        public static string AddALogin {
+        public static string AddAnItem {
             get {
-                return ResourceManager.GetString("AddALogin", resourceCulture);
+                return ResourceManager.GetString("AddAnItem", resourceCulture);
             }
         }
         
@@ -116,11 +116,11 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Add Login.
+        ///   Looks up a localized string similar to Add Item.
         /// </summary>
-        public static string AddLogin {
+        public static string AddItem {
             get {
-                return ResourceManager.GetString("AddLogin", resourceCulture);
+                return ResourceManager.GetString("AddItem", resourceCulture);
             }
         }
         
@@ -269,7 +269,7 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Do you want to auto-fill or view this login?.
+        ///   Looks up a localized string similar to Do you want to auto-fill or view this item?.
         /// </summary>
         public static string AutofillOrView {
             get {
@@ -413,7 +413,7 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Are you sure you want to auto-fill this login? It is not a complete match for &quot;{0}&quot;..
+        ///   Looks up a localized string similar to Are you sure you want to auto-fill this item? It is not a complete match for &quot;{0}&quot;..
         /// </summary>
         public static string BitwardenAutofillServiceMatchConfirm {
             get {
@@ -431,7 +431,7 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Tap this notification to auto-fill a login from your vault..
+        ///   Looks up a localized string similar to Tap this notification to auto-fill an item from your vault..
         /// </summary>
         public static string BitwardenAutofillServiceNotificationContent {
             get {
@@ -440,7 +440,7 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Tap this notification to view logins from your vault..
+        ///   Looks up a localized string similar to Tap this notification to view items from your vault..
         /// </summary>
         public static string BitwardenAutofillServiceNotificationContentOld {
             get {
@@ -458,7 +458,7 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You are searching for an auto-fill login for &quot;{0}&quot;..
+        ///   Looks up a localized string similar to You are searching for an auto-fill item for &quot;{0}&quot;..
         /// </summary>
         public static string BitwardenAutofillServiceSearch {
             get {
@@ -854,11 +854,11 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Edit Login.
+        ///   Looks up a localized string similar to Edit Item.
         /// </summary>
-        public static string EditLogin {
+        public static string EditItem {
             get {
-                return ResourceManager.GetString("EditLogin", resourceCulture);
+                return ResourceManager.GetString("EditItem", resourceCulture);
             }
         }
         
@@ -1286,29 +1286,29 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Import Logins.
+        ///   Looks up a localized string similar to Import Items.
         /// </summary>
-        public static string ImportLogins {
+        public static string ImportItems {
             get {
-                return ResourceManager.GetString("ImportLogins", resourceCulture);
+                return ResourceManager.GetString("ImportItems", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You can bulk import logins from the bitwarden.com web vault. Do you want to visit the website now?.
+        ///   Looks up a localized string similar to You can bulk import items from the bitwarden.com web vault. Do you want to visit the website now?.
         /// </summary>
-        public static string ImportLoginsConfirmation {
+        public static string ImportItemsConfirmation {
             get {
-                return ResourceManager.GetString("ImportLoginsConfirmation", resourceCulture);
+                return ResourceManager.GetString("ImportItemsConfirmation", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Quickly bulk import your logins from other password management apps..
+        ///   Looks up a localized string similar to Quickly bulk import your items from other password management apps..
         /// </summary>
-        public static string ImportLoginsDescription {
+        public static string ImportItemsDescription {
             get {
-                return ResourceManager.GetString("ImportLoginsDescription", resourceCulture);
+                return ResourceManager.GetString("ImportItemsDescription", resourceCulture);
             }
         }
         
@@ -1348,6 +1348,51 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Item has been deleted..
+        /// </summary>
+        public static string ItemDeleted {
+            get {
+                return ResourceManager.GetString("ItemDeleted", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Item Information.
+        /// </summary>
+        public static string ItemInformation {
+            get {
+                return ResourceManager.GetString("ItemInformation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Items.
+        /// </summary>
+        public static string Items {
+            get {
+                return ResourceManager.GetString("Items", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Items for {0}.
+        /// </summary>
+        public static string ItemsForUri {
+            get {
+                return ResourceManager.GetString("ItemsForUri", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Item updated..
+        /// </summary>
+        public static string ItemUpdated {
+            get {
+                return ResourceManager.GetString("ItemUpdated", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Last Sync:.
         /// </summary>
@@ -1465,33 +1510,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Login has been deleted..
-        /// </summary>
-        public static string LoginDeleted {
-            get {
-                return ResourceManager.GetString("LoginDeleted", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Login Information.
-        /// </summary>
-        public static string LoginInformation {
-            get {
-                return ResourceManager.GetString("LoginInformation", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No Name.
-        /// </summary>
-        public static string LoginNoName {
-            get {
-                return ResourceManager.GetString("LoginNoName", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Login.
         /// </summary>
@@ -1510,24 +1528,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Logins.
-        /// </summary>
-        public static string Logins {
-            get {
-                return ResourceManager.GetString("Logins", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Logins for {0}.
-        /// </summary>
-        public static string LoginsForUri {
-            get {
-                return ResourceManager.GetString("LoginsForUri", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Login Unavailable.
         /// </summary>
@@ -1537,15 +1537,6 @@ namespace Bit.App.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Login updated..
-        /// </summary>
-        public static string LoginUpdated {
-            get {
-                return ResourceManager.GetString("LoginUpdated", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Log Out.
         /// </summary>
@@ -1637,11 +1628,11 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Matching Logins.
+        ///   Looks up a localized string similar to Matching Items.
         /// </summary>
-        public static string MatchingLogins {
+        public static string MatchingItems {
             get {
-                return ResourceManager.GetString("MatchingLogins", resourceCulture);
+                return ResourceManager.GetString("MatchingItems", resourceCulture);
             }
         }
         
@@ -1727,11 +1718,11 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to New login created..
+        ///   Looks up a localized string similar to New item created..
         /// </summary>
-        public static string NewLoginCreated {
+        public static string NewItemCreated {
             get {
-                return ResourceManager.GetString("NewLoginCreated", resourceCulture);
+                return ResourceManager.GetString("NewItemCreated", resourceCulture);
             }
         }
         
@@ -1781,29 +1772,29 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to There are no logins in your vault..
+        ///   Looks up a localized string similar to There are no items in your vault..
         /// </summary>
-        public static string NoLogins {
+        public static string NoItems {
             get {
-                return ResourceManager.GetString("NoLogins", resourceCulture);
+                return ResourceManager.GetString("NoItems", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to There are no logins in your vault for {0}..
+        ///   Looks up a localized string similar to There are no items in your vault for {0}..
         /// </summary>
-        public static string NoLoginsForUri {
+        public static string NoItemsForUri {
             get {
-                return ResourceManager.GetString("NoLoginsForUri", resourceCulture);
+                return ResourceManager.GetString("NoItemsForUri", resourceCulture);
             }
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to There are no logins in your vault for this website. Tap to add one..
+        ///   Looks up a localized string similar to There are no items in your vault for this website. Tap to add one..
         /// </summary>
-        public static string NoLoginsTap {
+        public static string NoItemsTap {
             get {
-                return ResourceManager.GetString("NoLoginsTap", resourceCulture);
+                return ResourceManager.GetString("NoItemsTap", resourceCulture);
             }
         }
         
@@ -1961,11 +1952,11 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Possible Matching Logins.
+        ///   Looks up a localized string similar to Possible Matching Items.
         /// </summary>
-        public static string PossibleMatchingLogins {
+        public static string PossibleMatchingItems {
             get {
-                return ResourceManager.GetString("PossibleMatchingLogins", resourceCulture);
+                return ResourceManager.GetString("PossibleMatchingItems", resourceCulture);
             }
         }
         
@@ -2204,7 +2195,7 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Create an organization to securely share your logins with other users..
+        ///   Looks up a localized string similar to Create an organization to securely share your items with other users..
         /// </summary>
         public static string ShareVaultDescription {
             get {
@@ -2546,11 +2537,11 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to View Login.
+        ///   Looks up a localized string similar to View Item.
         /// </summary>
-        public static string ViewLogin {
+        public static string ViewItem {
             get {
-                return ResourceManager.GetString("ViewLogin", resourceCulture);
+                return ResourceManager.GetString("ViewItem", resourceCulture);
             }
         }
         
@@ -2591,7 +2582,7 @@ namespace Bit.App.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Manage your logins from any web browser with the bitwarden web vault..
+        ///   Looks up a localized string similar to Manage your items from any web browser with the bitwarden web vault..
         /// </summary>
         public static string WebVaultDescription {
             get {
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index b72120018..61f54e324 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -127,9 +127,9 @@
   <data name="AddFolder" xml:space="preserve">
     <value>Add Folder</value>
   </data>
-  <data name="AddLogin" xml:space="preserve">
-    <value>Add Login</value>
-    <comment>The title for the add login page.</comment>
+  <data name="AddItem" xml:space="preserve">
+    <value>Add Item</value>
+    <comment>The title for the add item page.</comment>
   </data>
   <data name="AnErrorHasOccurred" xml:space="preserve">
     <value>An error has occurred.</value>
@@ -223,7 +223,7 @@
   </data>
   <data name="FolderNone" xml:space="preserve">
     <value>No Folder</value>
-    <comment>Logins that have no folder specified go in this special "catch-all" folder.</comment>
+    <comment>Items that have no folder specified go in this special "catch-all" folder.</comment>
   </data>
   <data name="Folders" xml:space="preserve">
     <value>Folders</value>
@@ -325,14 +325,10 @@
     <value>Show</value>
     <comment>Reveal a hidden value (password).</comment>
   </data>
-  <data name="LoginDeleted" xml:space="preserve">
-    <value>Login has been deleted.</value>
+  <data name="ItemDeleted" xml:space="preserve">
+    <value>Item has been deleted.</value>
     <comment>Confirmation message after successfully deleting a login.</comment>
   </data>
-  <data name="LoginNoName" xml:space="preserve">
-    <value>No Name</value>
-    <comment>Title text to display when there is no name given for a login.</comment>
-  </data>
   <data name="Submit" xml:space="preserve">
     <value>Submit</value>
   </data>
@@ -400,8 +396,8 @@
   <data name="AccountCreated" xml:space="preserve">
     <value>Your new account has been created! You may now log in.</value>
   </data>
-  <data name="AddALogin" xml:space="preserve">
-    <value>Add a Login</value>
+  <data name="AddAnItem" xml:space="preserve">
+    <value>Add an Item</value>
   </data>
   <data name="AppExtension" xml:space="preserve">
     <value>App Extension</value>
@@ -467,8 +463,8 @@
     <value>Creating account...</value>
     <comment>Message shown when interacting with the server</comment>
   </data>
-  <data name="EditLogin" xml:space="preserve">
-    <value>Edit Login</value>
+  <data name="EditItem" xml:space="preserve">
+    <value>Edit Item</value>
   </data>
   <data name="EnableAutomaticSyncing" xml:space="preserve">
     <value>Enable Automatic Syncing</value>
@@ -522,14 +518,14 @@
   <data name="GetPasswordHint" xml:space="preserve">
     <value>Get your master password hint</value>
   </data>
-  <data name="ImportLogins" xml:space="preserve">
-    <value>Import Logins</value>
+  <data name="ImportItems" xml:space="preserve">
+    <value>Import Items</value>
   </data>
-  <data name="ImportLoginsConfirmation" xml:space="preserve">
-    <value>You can bulk import logins from the bitwarden.com web vault. Do you want to visit the website now?</value>
+  <data name="ImportItemsConfirmation" xml:space="preserve">
+    <value>You can bulk import items from the bitwarden.com web vault. Do you want to visit the website now?</value>
   </data>
-  <data name="ImportLoginsDescription" xml:space="preserve">
-    <value>Quickly bulk import your logins from other password management apps.</value>
+  <data name="ImportItemsDescription" xml:space="preserve">
+    <value>Quickly bulk import your items from other password management apps.</value>
   </data>
   <data name="LastSync" xml:space="preserve">
     <value>Last Sync:</value>
@@ -600,17 +596,17 @@
   <data name="Never" xml:space="preserve">
     <value>Never</value>
   </data>
-  <data name="NewLoginCreated" xml:space="preserve">
-    <value>New login created.</value>
+  <data name="NewItemCreated" xml:space="preserve">
+    <value>New item created.</value>
   </data>
   <data name="NoFavorites" xml:space="preserve">
     <value>There are no favorites in your vault.</value>
   </data>
-  <data name="NoLogins" xml:space="preserve">
-    <value>There are no logins in your vault.</value>
+  <data name="NoItems" xml:space="preserve">
+    <value>There are no items in your vault.</value>
   </data>
-  <data name="NoLoginsTap" xml:space="preserve">
-    <value>There are no logins in your vault for this website. Tap to add one.</value>
+  <data name="NoItemsTap" xml:space="preserve">
+    <value>There are no items in your vault for this website. Tap to add one.</value>
   </data>
   <data name="NoUsernamePasswordConfigured" xml:space="preserve">
     <value>This login does not have a username or password configured.</value>
@@ -683,11 +679,11 @@
   <data name="SetPINDirection" xml:space="preserve">
     <value>Enter a 4 digit PIN code to unlock the app with.</value>
   </data>
-  <data name="LoginInformation" xml:space="preserve">
-    <value>Login Information</value>
+  <data name="ItemInformation" xml:space="preserve">
+    <value>Item Information</value>
   </data>
-  <data name="LoginUpdated" xml:space="preserve">
-    <value>Login updated.</value>
+  <data name="ItemUpdated" xml:space="preserve">
+    <value>Item updated.</value>
   </data>
   <data name="Submitting" xml:space="preserve">
     <value>Submitting...</value>
@@ -729,20 +725,20 @@
   <data name="VerificationCode" xml:space="preserve">
     <value>Verification Code</value>
   </data>
-  <data name="ViewLogin" xml:space="preserve">
-    <value>View Login</value>
+  <data name="ViewItem" xml:space="preserve">
+    <value>View Item</value>
   </data>
   <data name="WebVault" xml:space="preserve">
     <value>bitwarden Web Vault</value>
   </data>
   <data name="WebVaultDescription" xml:space="preserve">
-    <value>Manage your logins from any web browser with the bitwarden web vault.</value>
+    <value>Manage your items from any web browser with the bitwarden web vault.</value>
   </data>
   <data name="Lost2FAApp" xml:space="preserve">
     <value>Lost authenticator app?</value>
   </data>
-  <data name="Logins" xml:space="preserve">
-    <value>Logins</value>
+  <data name="Items" xml:space="preserve">
+    <value>Items</value>
     <comment>Screen title</comment>
   </data>
   <data name="ExtensionActivated" xml:space="preserve">
@@ -754,19 +750,19 @@
   <data name="Translations" xml:space="preserve">
     <value>Translations</value>
   </data>
-  <data name="LoginsForUri" xml:space="preserve">
-    <value>Logins for {0}</value>
+  <data name="ItemsForUri" xml:space="preserve">
+    <value>Items for {0}</value>
     <comment>This is used for the autofill service. ex. "Logins for twitter.com"</comment>
   </data>
-  <data name="NoLoginsForUri" xml:space="preserve">
-    <value>There are no logins in your vault for {0}.</value>
-    <comment>This is used for the autofill service. ex. "There are no logins in your vault for twitter.com".</comment>
+  <data name="NoItemsForUri" xml:space="preserve">
+    <value>There are no items in your vault for {0}.</value>
+    <comment>This is used for the autofill service. ex. "There are no items in your vault for twitter.com".</comment>
   </data>
   <data name="BitwardenAutofillServiceNotification" xml:space="preserve">
     <value>When you see a bitwarden auto-fill notification, you can tap it to launch the auto-fill service.</value>
   </data>
   <data name="BitwardenAutofillServiceNotificationContent" xml:space="preserve">
-    <value>Tap this notification to auto-fill a login from your vault.</value>
+    <value>Tap this notification to auto-fill an item from your vault.</value>
   </data>
   <data name="BitwardenAutofillServiceOpenSettings" xml:space="preserve">
     <value>Open Accessibility Settings</value>
@@ -796,28 +792,28 @@
     <value>Auto-fill</value>
   </data>
   <data name="AutofillOrView" xml:space="preserve">
-    <value>Do you want to auto-fill or view this login?</value>
+    <value>Do you want to auto-fill or view this item?</value>
   </data>
   <data name="BitwardenAutofillServiceMatchConfirm" xml:space="preserve">
-    <value>Are you sure you want to auto-fill this login? It is not a complete match for "{0}".</value>
+    <value>Are you sure you want to auto-fill this item? It is not a complete match for "{0}".</value>
   </data>
-  <data name="MatchingLogins" xml:space="preserve">
-    <value>Matching Logins</value>
+  <data name="MatchingItems" xml:space="preserve">
+    <value>Matching Items</value>
   </data>
-  <data name="PossibleMatchingLogins" xml:space="preserve">
-    <value>Possible Matching Logins</value>
+  <data name="PossibleMatchingItems" xml:space="preserve">
+    <value>Possible Matching Items</value>
   </data>
   <data name="Search" xml:space="preserve">
     <value>Search</value>
   </data>
   <data name="BitwardenAutofillServiceSearch" xml:space="preserve">
-    <value>You are searching for an auto-fill login for "{0}".</value>
+    <value>You are searching for an auto-fill item for "{0}".</value>
   </data>
   <data name="ShareVault" xml:space="preserve">
     <value>Share Your Vault</value>
   </data>
   <data name="ShareVaultDescription" xml:space="preserve">
-    <value>Create an organization to securely share your logins with other users.</value>
+    <value>Create an organization to securely share your items with other users.</value>
   </data>
   <data name="DisableGADescription" xml:space="preserve">
     <value>We use analytics to better learn how the app is being used so that we can make it better. All data collection is completely anonymous.</value>
@@ -1028,7 +1024,7 @@
     <value>Web Vault Server URL</value>
   </data>
   <data name="BitwardenAutofillServiceNotificationContentOld" xml:space="preserve">
-    <value>Tap this notification to view logins from your vault.</value>
+    <value>Tap this notification to view items from your vault.</value>
   </data>
   <data name="CustomFields" xml:space="preserve">
     <value>Custom Fields</value>
diff --git a/src/App/Utilities/ApiHttpClient.cs b/src/App/Utilities/ApiHttpClient.cs
index bf787f252..7ec133c50 100644
--- a/src/App/Utilities/ApiHttpClient.cs
+++ b/src/App/Utilities/ApiHttpClient.cs
@@ -35,9 +35,9 @@ namespace Bit.App
             else
             {
                 //BaseAddress = new Uri("http://169.254.80.80:4000"); // Desktop from VS Android Emulator
-                //BaseAddress = new Uri("http://192.168.1.3:4000"); // Desktop
+                BaseAddress = new Uri("http://192.168.1.3:4000"); // Desktop
                 //BaseAddress = new Uri("https://preview-api.bitwarden.com"); // Preview
-                BaseAddress = new Uri("https://api.bitwarden.com"); // Production
+                //BaseAddress = new Uri("https://api.bitwarden.com"); // Production
             }
         }
     }
diff --git a/src/App/Utilities/IdentityHttpClient.cs b/src/App/Utilities/IdentityHttpClient.cs
index 1ef74d1ea..86ed5d925 100644
--- a/src/App/Utilities/IdentityHttpClient.cs
+++ b/src/App/Utilities/IdentityHttpClient.cs
@@ -35,9 +35,9 @@ namespace Bit.App
             else
             {
                 //BaseAddress = new Uri("http://169.254.80.80:33656"); // Desktop from VS Android Emulator
-                //BaseAddress = new Uri("http://192.168.1.3:33656"); // Desktop
+                BaseAddress = new Uri("http://192.168.1.3:33656"); // Desktop
                 //BaseAddress = new Uri("https://preview-identity.bitwarden.com"); // Preview
-                BaseAddress = new Uri("https://identity.bitwarden.com"); // Production
+                //BaseAddress = new Uri("https://identity.bitwarden.com"); // Production
             }
         }
     }
diff --git a/src/iOS.Extension/LoginAddViewController.cs b/src/iOS.Extension/LoginAddViewController.cs
index 42f1ca61b..cbaf1bae4 100644
--- a/src/iOS.Extension/LoginAddViewController.cs
+++ b/src/iOS.Extension/LoginAddViewController.cs
@@ -54,7 +54,7 @@ namespace Bit.iOS.Extension
             _folderService = Resolver.Resolve<IFolderService>();
             _googleAnalyticsService = Resolver.Resolve<IGoogleAnalyticsService>();
 
-            NavItem.Title = AppResources.AddLogin;
+            NavItem.Title = AppResources.AddItem;
             CancelBarButton.Title = AppResources.Cancel;
             SaveBarButton.Title = AppResources.Save;
             View.BackgroundColor = new UIColor(red: 0.94f, green: 0.94f, blue: 0.96f, alpha: 1.0f);
@@ -306,7 +306,7 @@ namespace Bit.iOS.Extension
             {
                 if(section == 0)
                 {
-                    return AppResources.LoginInformation;
+                    return AppResources.ItemInformation;
                 }
                 else if(section == 2)
                 {
diff --git a/src/iOS.Extension/LoginListViewController.cs b/src/iOS.Extension/LoginListViewController.cs
index a091bd4fd..9ae7f1409 100644
--- a/src/iOS.Extension/LoginListViewController.cs
+++ b/src/iOS.Extension/LoginListViewController.cs
@@ -36,7 +36,7 @@ namespace Bit.iOS.Extension
         public async override void ViewDidLoad()
         {
             base.ViewDidLoad();
-            NavItem.Title = AppResources.Logins;
+            NavItem.Title = AppResources.Items;
             if(!CanAutoFill())
             {
                 CancelBarButton.Title = AppResources.Close;
@@ -150,7 +150,7 @@ namespace Bit.iOS.Extension
                 if(_tableItems == null || _tableItems.Count() == 0)
                 {
                     var noDataCell = new UITableViewCell(UITableViewCellStyle.Default, "NoDataCell");
-                    noDataCell.TextLabel.Text = AppResources.NoLoginsTap;
+                    noDataCell.TextLabel.Text = AppResources.NoItemsTap;
                     noDataCell.TextLabel.TextAlignment = UITextAlignment.Center;
                     noDataCell.TextLabel.LineBreakMode = UILineBreakMode.WordWrap;
                     noDataCell.TextLabel.Lines = 0;