diff --git a/src/App/App.csproj b/src/App/App.csproj
index 9ace65059..b8ed781c6 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -67,7 +67,7 @@
     <Compile Include="Abstractions\Services\ISecureStorageService.cs" />
     <Compile Include="Abstractions\Services\ISqlService.cs" />
     <Compile Include="Constants.cs" />
-    <Compile Include="Controls\AddCipherToolbarItem.cs" />
+    <Compile Include="Controls\AddCipherToolbarItem2.cs" />
     <Compile Include="Controls\HybridWebView.cs" />
     <Compile Include="Controls\ExtendedToolbarItem.cs" />
     <Compile Include="Controls\DismissModalToolBarItem.cs" />
@@ -193,7 +193,7 @@
     <Compile Include="Pages\Vault\VaultCustomFieldsPage.cs" />
     <Compile Include="Pages\Vault\VaultAutofillListCiphersPage.cs" />
     <Compile Include="Pages\Vault\VaultAttachmentsPage.cs" />
-    <Compile Include="Pages\Vault\VaultSearchCiphersPage.cs" />
+    <Compile Include="Pages\Vault\VaultListCiphersPage.cs" />
     <Compile Include="Pages\Vault\VaultListGroupingsPage.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Abstractions\Repositories\ICipherRepository.cs" />
diff --git a/src/App/Controls/AddCipherToolbarItem.cs b/src/App/Controls/AddCipherToolbarItem2.cs
similarity index 68%
rename from src/App/Controls/AddCipherToolbarItem.cs
rename to src/App/Controls/AddCipherToolbarItem2.cs
index e70137a30..73acca3a7 100644
--- a/src/App/Controls/AddCipherToolbarItem.cs
+++ b/src/App/Controls/AddCipherToolbarItem2.cs
@@ -4,9 +4,9 @@ using Xamarin.Forms;
 
 namespace Bit.App.Controls
 {
-    public class AddCipherToolbarItem : ExtendedToolbarItem
+    public class AddCipherToolBarItem : ExtendedToolbarItem
     {
-        public AddCipherToolbarItem(Page page, string folderId)
+        public AddCipherToolBarItem(Page page, string folderId)
             : base(() => Helpers.AddCipher(page, folderId))
         {
             Text = AppResources.Add;
diff --git a/src/App/Pages/MainPage.cs b/src/App/Pages/MainPage.cs
index e61ca9b48..652476648 100644
--- a/src/App/Pages/MainPage.cs
+++ b/src/App/Pages/MainPage.cs
@@ -11,7 +11,7 @@ namespace Bit.App.Pages
             TintColor = Color.FromHex("3c8dbc");
 
             var settingsNavigation = new ExtendedNavigationPage(new SettingsPage());
-            var favoritesNavigation = new ExtendedNavigationPage(new VaultSearchCiphersPage(favorites: true));
+            var favoritesNavigation = new ExtendedNavigationPage(new VaultListCiphersPage(favorites: true));
             var vaultNavigation = new ExtendedNavigationPage(new VaultListGroupingsPage());
             var toolsNavigation = new ExtendedNavigationPage(new ToolsPage());
 
diff --git a/src/App/Pages/Vault/VaultAutofillListCiphersPage.cs b/src/App/Pages/Vault/VaultAutofillListCiphersPage.cs
index 52e6245bf..54e343d6f 100644
--- a/src/App/Pages/Vault/VaultAutofillListCiphersPage.cs
+++ b/src/App/Pages/Vault/VaultAutofillListCiphersPage.cs
@@ -293,7 +293,7 @@ namespace Bit.App.Pages
             {
                 _page.GoogleAnalyticsService.TrackExtensionEvent("CloseToSearch",
                     _page.Uri.StartsWith("http") ? "Website" : "App");
-                Application.Current.MainPage = new ExtendedNavigationPage(new VaultSearchCiphersPage(uri: _page.Uri));
+                Application.Current.MainPage = new ExtendedNavigationPage(new VaultListCiphersPage(uri: _page.Uri));
                 _page.UserDialogs.Toast(string.Format(AppResources.BitwardenAutofillServiceSearch, _page._name),
                     TimeSpan.FromSeconds(10));
             }
diff --git a/src/App/Pages/Vault/VaultSearchCiphersPage.cs b/src/App/Pages/Vault/VaultListCiphersPage.cs
similarity index 97%
rename from src/App/Pages/Vault/VaultSearchCiphersPage.cs
rename to src/App/Pages/Vault/VaultListCiphersPage.cs
index c0701411c..66e8ff197 100644
--- a/src/App/Pages/Vault/VaultSearchCiphersPage.cs
+++ b/src/App/Pages/Vault/VaultListCiphersPage.cs
@@ -15,7 +15,7 @@ using System.Collections.Generic;
 
 namespace Bit.App.Pages
 {
-    public class VaultSearchCiphersPage : ExtendedContentPage
+    public class VaultListCiphersPage : ExtendedContentPage
     {
         private readonly ICipherService _cipherService;
         private readonly IConnectivity _connectivity;
@@ -33,7 +33,7 @@ namespace Bit.App.Pages
         private readonly string _groupingName = null;
         private readonly string _uri = null;
 
-        public VaultSearchCiphersPage(bool folder = false, string folderId = null,
+        public VaultListCiphersPage(bool folder = false, string folderId = null,
             string collectionId = null, string groupingName = null, bool favorites = false, string uri = null)
             : base(true)
         {
@@ -62,13 +62,13 @@ namespace Bit.App.Pages
         public ListView ListView { get; set; }
         public SearchBar Search { get; set; }
         public StackLayout ResultsStackLayout { get; set; }
-        private AddCipherToolbarItem AddCipherItem { get; set; }
+        private AddCipherToolBarItem AddCipherItem { get; set; }
 
         private void Init()
         {
             if(!string.IsNullOrWhiteSpace(_uri) || _folder || !string.IsNullOrWhiteSpace(_folderId))
             {
-                AddCipherItem = new AddCipherToolbarItem(this, _folderId);
+                AddCipherItem = new AddCipherToolBarItem(this, _folderId);
                 ToolbarItems.Add(AddCipherItem);
             }
 
diff --git a/src/App/Pages/Vault/VaultListGroupingsPage.cs b/src/App/Pages/Vault/VaultListGroupingsPage.cs
index 5af457308..7772808f0 100644
--- a/src/App/Pages/Vault/VaultListGroupingsPage.cs
+++ b/src/App/Pages/Vault/VaultListGroupingsPage.cs
@@ -56,13 +56,13 @@ namespace Bit.App.Pages
         public ListView ListView { get; set; }
         public StackLayout NoDataStackLayout { get; set; }
         public ActivityIndicator LoadingIndicator { get; set; }
-        private AddCipherToolbarItem AddCipherItem { get; set; }
+        private AddCipherToolBarItem AddCipherItem { get; set; }
         private SearchToolBarItem SearchItem { get; set; }
 
         private void Init()
         {
             SearchItem = new SearchToolBarItem(this);
-            AddCipherItem = new AddCipherToolbarItem(this, null);
+            AddCipherItem = new AddCipherToolBarItem(this, null);
             ToolbarItems.Add(SearchItem);
             ToolbarItems.Add(AddCipherItem);
 
@@ -255,11 +255,11 @@ namespace Bit.App.Pages
             Page page;
             if(grouping.Folder)
             {
-                page = new VaultSearchCiphersPage(folder: true, folderId: grouping.Id, groupingName: grouping.Name);
+                page = new VaultListCiphersPage(folder: true, folderId: grouping.Id, groupingName: grouping.Name);
             }
             else
             {
-                page = new VaultSearchCiphersPage(collectionId: grouping.Id, groupingName: grouping.Name);
+                page = new VaultListCiphersPage(collectionId: grouping.Id, groupingName: grouping.Name);
             }
 
             await Navigation.PushAsync(page);
@@ -268,7 +268,7 @@ namespace Bit.App.Pages
 
         private async void Search()
         {
-            var page = new ExtendedNavigationPage(new VaultSearchCiphersPage());
+            var page = new ExtendedNavigationPage(new VaultListCiphersPage());
             await Navigation.PushModalAsync(page);
         }