diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
index d591b26ac..5eb023947 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
@@ -141,7 +141,7 @@
                 </StackLayout>
 
                 <StackLayout
-                    IsVisible="{Binding ShowTOTPFilter}"
+                    IsVisible="{Binding ShowTotpFilter}"
                     Orientation="Horizontal"
                     HorizontalOptions="FillAndExpand"
                     Margin="0,5,10,0">
@@ -155,12 +155,10 @@
                         AutomationProperties.IsInAccessibleTree="True"
                         AutomationProperties.Name="{u:I18n DisplayItemsContainingTOTP}" />
                     <Switch
-                        IsToggled="{Binding TOTPFilterEnable}"
+                        IsToggled="{Binding TotpFilterEnable}"
                         StyleClass="box-value"
                         HorizontalOptions="End"
-                        Toggled="Switch_Toggled"
-                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n DisplayItemsContainingTOTP}"  />
+                        Toggled="TotpFilter_Toggled"  />
                 </StackLayout>
 
                 <StackLayout
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
index e4aa9a883..87302cf35 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
@@ -185,7 +185,7 @@ namespace Bit.App.Pages
         {
             base.OnDisappearing();
             IsBusy = false;
-            _vm.TOTPFilterEnable = false;
+            _vm.TotpFilterEnable = false;
             _broadcasterService.Unsubscribe(_pageName);
             _vm.DisableRefreshing();
             _accountAvatar?.OnDisappearing();
@@ -298,9 +298,9 @@ namespace Bit.App.Pages
             await _accountListOverlay.HideAsync();
         }
 
-        void Switch_Toggled(System.Object sender, Xamarin.Forms.ToggledEventArgs e)
+        void TotpFilter_Toggled(System.Object sender, Xamarin.Forms.ToggledEventArgs e)
         {
-            _vm.TOTPFilterCommand.Execute(null);
+            _vm.TotpFilterCommand.Execute(null);
         }
     }
 }
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPageOTPListItem.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPageTOTPListItem.cs
similarity index 100%
rename from src/App/Pages/Vault/GroupingsPage/GroupingsPageOTPListItem.cs
rename to src/App/Pages/Vault/GroupingsPage/GroupingsPageTOTPListItem.cs
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
index b60bc2774..214cf364e 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
@@ -83,7 +83,7 @@ namespace Bit.App.Pages
             VaultFilterCommand = new AsyncCommand(VaultFilterOptionsAsync,
                 onException: ex => _logger.Exception(ex),
                 allowsMultipleExecutions: false);
-            TOTPFilterCommand = new AsyncCommand(LoadAsync,
+            TotpFilterCommand = new AsyncCommand(LoadAsync,
                 onException: ex => _logger.Exception(ex),
                 allowsMultipleExecutions: false);
 
@@ -163,12 +163,12 @@ namespace Bit.App.Pages
             get => _showVaultFilter;
             set => SetProperty(ref _showVaultFilter, value);
         }
-        public bool ShowTOTPFilter
+        public bool ShowTotpFilter
         {
             get => _showTOTPFilter;
             set => SetProperty(ref _showTOTPFilter, value);
         }
-        public bool TOTPFilterEnable
+        public bool TotpFilterEnable
         {
             get => _totpFilterEnable;
             set => SetProperty(ref _totpFilterEnable, value);
@@ -193,7 +193,7 @@ namespace Bit.App.Pages
         public Command RefreshCommand { get; set; }
         public Command<CipherView> CipherOptionsCommand { get; set; }
         public ICommand VaultFilterCommand { get; }
-        public ICommand TOTPFilterCommand { get; }
+        public ICommand TotpFilterCommand { get; }
         public bool LoadedOnce { get; set; }
 
         public async Task LoadAsync()
@@ -235,7 +235,7 @@ namespace Bit.App.Pages
             Loading = true;
             ShowList = false;
             ShowAddCipherButton = !Deleted;
-            ShowTOTPFilter = Type == CipherType.Login && canAccessPremium;
+            ShowTotpFilter = Type == CipherType.Login && canAccessPremium;
 
             var groupedItems = new List<GroupingsPageListGroup>();
             var page = Page as GroupingsPage;
@@ -316,7 +316,7 @@ namespace Bit.App.Pages
                 }
                 if (Ciphers?.Any() ?? false)
                 {
-                    if (TOTPFilterEnable)
+                    if (TotpFilterEnable)
                     {
                         var ciphersListItems = Ciphers.Where(c => c.IsDeleted == Deleted && !string.IsNullOrEmpty(c.Login.Totp))
                             .Select(c => new GroupingsPageTOTPListItem(c, true)).ToList();
@@ -333,7 +333,7 @@ namespace Bit.App.Pages
                             {
                                 item.TotpTickAsync();
                             }
-                            return TOTPFilterEnable;
+                            return TotpFilterEnable;
                         }); 
                     }
                     else