diff --git a/lib/pages/chat.dart b/lib/pages/chat.dart
index 01e8ef921..fabbd5cdd 100644
--- a/lib/pages/chat.dart
+++ b/lib/pages/chat.dart
@@ -653,5 +653,5 @@ class ChatController extends State<Chat> {
       });
 
   @override
-  Widget build(BuildContext context) => ChatUI(this);
+  Widget build(BuildContext context) => ChatView(this);
 }
diff --git a/lib/pages/chat_details.dart b/lib/pages/chat_details.dart
index b691fed72..812e9989a 100644
--- a/lib/pages/chat_details.dart
+++ b/lib/pages/chat_details.dart
@@ -299,5 +299,5 @@ class ChatDetailsController extends State<ChatDetails> {
   }
 
   @override
-  Widget build(BuildContext context) => ChatDetailsUI(this);
+  Widget build(BuildContext context) => ChatDetailsView(this);
 }
diff --git a/lib/pages/chat_encryption_settings.dart b/lib/pages/chat_encryption_settings.dart
index 1f25eadf2..263af4d09 100644
--- a/lib/pages/chat_encryption_settings.dart
+++ b/lib/pages/chat_encryption_settings.dart
@@ -61,5 +61,5 @@ class ChatEncryptionSettingsController extends State<ChatEncryptionSettings> {
   }
 
   @override
-  Widget build(BuildContext context) => ChatEncryptionSettingsUI(this);
+  Widget build(BuildContext context) => ChatEncryptionSettingsView(this);
 }
diff --git a/lib/pages/chat_list.dart b/lib/pages/chat_list.dart
index a8864b28d..6a80ae68f 100644
--- a/lib/pages/chat_list.dart
+++ b/lib/pages/chat_list.dart
@@ -246,7 +246,7 @@ class ChatListController extends State<ChatList> {
   }
 
   @override
-  Widget build(BuildContext context) => ChatListUI(this);
+  Widget build(BuildContext context) => ChatListView(this);
 }
 
 enum ChatListPopupMenuItemActions {
diff --git a/lib/pages/chat_permissions_settings.dart b/lib/pages/chat_permissions_settings.dart
index f0dc7e6ed..4b8258dd0 100644
--- a/lib/pages/chat_permissions_settings.dart
+++ b/lib/pages/chat_permissions_settings.dart
@@ -92,5 +92,5 @@ class ChatPermissionsSettingsController extends State<ChatPermissionsSettings> {
   }
 
   @override
-  Widget build(BuildContext context) => ChatPermissionsSettingsUI(this);
+  Widget build(BuildContext context) => ChatPermissionsSettingsView(this);
 }
diff --git a/lib/pages/device_settings.dart b/lib/pages/device_settings.dart
index 43799592a..e0093f567 100644
--- a/lib/pages/device_settings.dart
+++ b/lib/pages/device_settings.dart
@@ -136,5 +136,5 @@ class DevicesSettingsController extends State<DevicesSettings> {
     ..sort((a, b) => b.lastSeenTs.compareTo(a.lastSeenTs));
 
   @override
-  Widget build(BuildContext context) => DevicesSettingsUI(this);
+  Widget build(BuildContext context) => DevicesSettingsView(this);
 }
diff --git a/lib/pages/homeserver_picker.dart b/lib/pages/homeserver_picker.dart
index 1e6b39754..f33c3af68 100644
--- a/lib/pages/homeserver_picker.dart
+++ b/lib/pages/homeserver_picker.dart
@@ -134,5 +134,5 @@ class HomeserverPickerController extends State<HomeserverPicker> {
   }
 
   @override
-  Widget build(BuildContext context) => HomeserverPickerUI(this);
+  Widget build(BuildContext context) => HomeserverPickerView(this);
 }
diff --git a/lib/pages/image_viewer.dart b/lib/pages/image_viewer.dart
index 898ccde59..2618f02e2 100644
--- a/lib/pages/image_viewer.dart
+++ b/lib/pages/image_viewer.dart
@@ -38,5 +38,5 @@ class ImageViewerController extends State<ImageViewer> {
   }
 
   @override
-  Widget build(BuildContext context) => ImageViewerUI(this);
+  Widget build(BuildContext context) => ImageViewerView(this);
 }
diff --git a/lib/pages/invitation_selection.dart b/lib/pages/invitation_selection.dart
index 4afb58b15..5c28acf53 100644
--- a/lib/pages/invitation_selection.dart
+++ b/lib/pages/invitation_selection.dart
@@ -116,5 +116,5 @@ class InvitationSelectionController extends State<InvitationSelection> {
   }
 
   @override
-  Widget build(BuildContext context) => InvitationSelectionUI(this);
+  Widget build(BuildContext context) => InvitationSelectionView(this);
 }
diff --git a/lib/pages/new_group.dart b/lib/pages/new_group.dart
index 5aebbcd9b..2173a1f01 100644
--- a/lib/pages/new_group.dart
+++ b/lib/pages/new_group.dart
@@ -40,5 +40,5 @@ class NewGroupController extends State<NewGroup> {
   }
 
   @override
-  Widget build(BuildContext context) => NewGroupUI(this);
+  Widget build(BuildContext context) => NewGroupView(this);
 }
diff --git a/lib/pages/new_private_chat.dart b/lib/pages/new_private_chat.dart
index 2d6abcbec..62198ebf8 100644
--- a/lib/pages/new_private_chat.dart
+++ b/lib/pages/new_private_chat.dart
@@ -112,5 +112,5 @@ class NewPrivateChatController extends State<NewPrivateChat> {
       );
 
   @override
-  Widget build(BuildContext context) => NewPrivateChatUI(this);
+  Widget build(BuildContext context) => NewPrivateChatView(this);
 }
diff --git a/lib/pages/search.dart b/lib/pages/search.dart
index 78c356b3d..8bc8f1f73 100644
--- a/lib/pages/search.dart
+++ b/lib/pages/search.dart
@@ -139,5 +139,5 @@ class SearchController extends State<Search> {
   }
 
   @override
-  Widget build(BuildContext context) => SearchUI(this);
+  Widget build(BuildContext context) => SearchView(this);
 }
diff --git a/lib/pages/settings.dart b/lib/pages/settings.dart
index 11536099b..cb9995cf0 100644
--- a/lib/pages/settings.dart
+++ b/lib/pages/settings.dart
@@ -373,6 +373,6 @@ class SettingsController extends State<Settings> {
         return c;
       });
     }
-    return SettingsUI(this);
+    return SettingsView(this);
   }
 }
diff --git a/lib/pages/settings_3pid.dart b/lib/pages/settings_3pid.dart
index 0edccee91..7fb5a2e61 100644
--- a/lib/pages/settings_3pid.dart
+++ b/lib/pages/settings_3pid.dart
@@ -86,5 +86,5 @@ class Settings3PidController extends State<Settings3Pid> {
   }
 
   @override
-  Widget build(BuildContext context) => Settings3PidUI(this);
+  Widget build(BuildContext context) => Settings3PidView(this);
 }
diff --git a/lib/pages/settings_emotes.dart b/lib/pages/settings_emotes.dart
index 142c27c17..2db462c10 100644
--- a/lib/pages/settings_emotes.dart
+++ b/lib/pages/settings_emotes.dart
@@ -295,6 +295,6 @@ class EmotesSettingsController extends State<EmotesSettings> {
         }
       }
     }
-    return EmotesSettingsUI(this);
+    return EmotesSettingsView(this);
   }
 }
diff --git a/lib/pages/settings_ignore_list.dart b/lib/pages/settings_ignore_list.dart
index c057400b5..45d829ce2 100644
--- a/lib/pages/settings_ignore_list.dart
+++ b/lib/pages/settings_ignore_list.dart
@@ -36,5 +36,5 @@ class SettingsIgnoreListController extends State<SettingsIgnoreList> {
   }
 
   @override
-  Widget build(BuildContext context) => SettingsIgnoreListUI(this);
+  Widget build(BuildContext context) => SettingsIgnoreListView(this);
 }
diff --git a/lib/pages/settings_multiple_emotes.dart b/lib/pages/settings_multiple_emotes.dart
index 378476299..06d9fb778 100644
--- a/lib/pages/settings_multiple_emotes.dart
+++ b/lib/pages/settings_multiple_emotes.dart
@@ -14,5 +14,5 @@ class MultipleEmotesSettings extends StatefulWidget {
 
 class MultipleEmotesSettingsController extends State<MultipleEmotesSettings> {
   @override
-  Widget build(BuildContext context) => MultipleEmotesSettingsUI(this);
+  Widget build(BuildContext context) => MultipleEmotesSettingsView(this);
 }
diff --git a/lib/pages/settings_notifications.dart b/lib/pages/settings_notifications.dart
index dbd4033f7..85eb4f2d1 100644
--- a/lib/pages/settings_notifications.dart
+++ b/lib/pages/settings_notifications.dart
@@ -108,5 +108,5 @@ class SettingsNotificationsController extends State<SettingsNotifications> {
   }
 
   @override
-  Widget build(BuildContext context) => SettingsNotificationsUI(this);
+  Widget build(BuildContext context) => SettingsNotificationsView(this);
 }
diff --git a/lib/pages/settings_style.dart b/lib/pages/settings_style.dart
index 2409463b6..f61a52469 100644
--- a/lib/pages/settings_style.dart
+++ b/lib/pages/settings_style.dart
@@ -57,5 +57,5 @@ class SettingsStyleController extends State<SettingsStyle> {
   }
 
   @override
-  Widget build(BuildContext context) => SettingsStyleUI(this);
+  Widget build(BuildContext context) => SettingsStyleView(this);
 }
diff --git a/lib/pages/sign_up.dart b/lib/pages/sign_up.dart
index 0406187a3..0d1869743 100644
--- a/lib/pages/sign_up.dart
+++ b/lib/pages/sign_up.dart
@@ -67,5 +67,5 @@ class SignUpController extends State<SignUp> {
   }
 
   @override
-  Widget build(BuildContext context) => SignUpUI(this);
+  Widget build(BuildContext context) => SignUpView(this);
 }
diff --git a/lib/pages/sign_up_password.dart b/lib/pages/sign_up_password.dart
index ff2a0454b..d8ae631e9 100644
--- a/lib/pages/sign_up_password.dart
+++ b/lib/pages/sign_up_password.dart
@@ -111,5 +111,5 @@ class SignUpPasswordController extends State<SignUpPassword> {
   }
 
   @override
-  Widget build(BuildContext context) => SignUpPasswordUI(this);
+  Widget build(BuildContext context) => SignUpPasswordView(this);
 }
diff --git a/lib/pages/user_bottom_sheet.dart b/lib/pages/user_bottom_sheet.dart
index b59aea1af..dd161d158 100644
--- a/lib/pages/user_bottom_sheet.dart
+++ b/lib/pages/user_bottom_sheet.dart
@@ -91,5 +91,5 @@ class UserBottomSheetController extends State<UserBottomSheet> {
   }
 
   @override
-  Widget build(BuildContext context) => UserBottomSheetUI(this);
+  Widget build(BuildContext context) => UserBottomSheetView(this);
 }
diff --git a/lib/pages/views/chat_details_view.dart b/lib/pages/views/chat_details_view.dart
index 9b9f8a5b4..2830ecff1 100644
--- a/lib/pages/views/chat_details_view.dart
+++ b/lib/pages/views/chat_details_view.dart
@@ -18,10 +18,10 @@ import 'package:matrix_link_text/link_text.dart';
 
 import '../../utils/url_launcher.dart';
 
-class ChatDetailsUI extends StatelessWidget {
+class ChatDetailsView extends StatelessWidget {
   final ChatDetailsController controller;
 
-  const ChatDetailsUI(this.controller, {Key key}) : super(key: key);
+  const ChatDetailsView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/chat_encryption_settings_view.dart b/lib/pages/views/chat_encryption_settings_view.dart
index 26f557e8f..d4c3535b4 100644
--- a/lib/pages/views/chat_encryption_settings_view.dart
+++ b/lib/pages/views/chat_encryption_settings_view.dart
@@ -7,10 +7,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import '../../utils/device_extension.dart';
 
-class ChatEncryptionSettingsUI extends StatelessWidget {
+class ChatEncryptionSettingsView extends StatelessWidget {
   final ChatEncryptionSettingsController controller;
 
-  const ChatEncryptionSettingsUI(this.controller, {Key key}) : super(key: key);
+  const ChatEncryptionSettingsView(this.controller, {Key key})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/chat_list_view.dart b/lib/pages/views/chat_list_view.dart
index 6837d6e78..c36794efc 100644
--- a/lib/pages/views/chat_list_view.dart
+++ b/lib/pages/views/chat_list_view.dart
@@ -10,10 +10,10 @@ import 'package:flutter/material.dart';
 import '../../widgets/matrix.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-class ChatListUI extends StatelessWidget {
+class ChatListView extends StatelessWidget {
   final ChatListController controller;
 
-  const ChatListUI(this.controller, {Key key}) : super(key: key);
+  const ChatListView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/chat_permissions_settings_view.dart b/lib/pages/views/chat_permissions_settings_view.dart
index 93de808d6..90213f267 100644
--- a/lib/pages/views/chat_permissions_settings_view.dart
+++ b/lib/pages/views/chat_permissions_settings_view.dart
@@ -7,10 +7,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 
-class ChatPermissionsSettingsUI extends StatelessWidget {
+class ChatPermissionsSettingsView extends StatelessWidget {
   final ChatPermissionsSettingsController controller;
 
-  const ChatPermissionsSettingsUI(this.controller, {Key key}) : super(key: key);
+  const ChatPermissionsSettingsView(this.controller, {Key key})
+      : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/chat_view.dart b/lib/pages/views/chat_view.dart
index 30aa2a12e..7a87e7d74 100644
--- a/lib/pages/views/chat_view.dart
+++ b/lib/pages/views/chat_view.dart
@@ -29,10 +29,10 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:scroll_to_index/scroll_to_index.dart';
 import 'package:swipe_to_action/swipe_to_action.dart';
 
-class ChatUI extends StatelessWidget {
+class ChatView extends StatelessWidget {
   final ChatController controller;
 
-  const ChatUI(this.controller, {Key key}) : super(key: key);
+  const ChatView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/device_settings_view.dart b/lib/pages/views/device_settings_view.dart
index f79aeafd2..4331fd4f3 100644
--- a/lib/pages/views/device_settings_view.dart
+++ b/lib/pages/views/device_settings_view.dart
@@ -5,10 +5,10 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 
 import '../../widgets/list_items/user_device_list_item.dart';
 
-class DevicesSettingsUI extends StatelessWidget {
+class DevicesSettingsView extends StatelessWidget {
   final DevicesSettingsController controller;
 
-  const DevicesSettingsUI(this.controller, {Key key}) : super(key: key);
+  const DevicesSettingsView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/homeserver_picker_view.dart b/lib/pages/views/homeserver_picker_view.dart
index 0483fd6a8..f91ef6839 100644
--- a/lib/pages/views/homeserver_picker_view.dart
+++ b/lib/pages/views/homeserver_picker_view.dart
@@ -10,10 +10,10 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-class HomeserverPickerUI extends StatelessWidget {
+class HomeserverPickerView extends StatelessWidget {
   final HomeserverPickerController controller;
 
-  const HomeserverPickerUI(this.controller, {Key key}) : super(key: key);
+  const HomeserverPickerView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/image_viewer_view.dart b/lib/pages/views/image_viewer_view.dart
index 7c997d104..cecfdfe67 100644
--- a/lib/pages/views/image_viewer_view.dart
+++ b/lib/pages/views/image_viewer_view.dart
@@ -3,10 +3,10 @@ import 'package:fluffychat/widgets/image_bubble.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-class ImageViewerUI extends StatelessWidget {
+class ImageViewerView extends StatelessWidget {
   final ImageViewerController controller;
 
-  const ImageViewerUI(this.controller, {Key key}) : super(key: key);
+  const ImageViewerView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/invitation_selection_view.dart b/lib/pages/views/invitation_selection_view.dart
index 015516c87..47dcc87e5 100644
--- a/lib/pages/views/invitation_selection_view.dart
+++ b/lib/pages/views/invitation_selection_view.dart
@@ -8,10 +8,10 @@ import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-class InvitationSelectionUI extends StatelessWidget {
+class InvitationSelectionView extends StatelessWidget {
   final InvitationSelectionController controller;
 
-  const InvitationSelectionUI(this.controller, {Key key}) : super(key: key);
+  const InvitationSelectionView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/new_group_view.dart b/lib/pages/views/new_group_view.dart
index a887bcd49..8a3706d80 100644
--- a/lib/pages/views/new_group_view.dart
+++ b/lib/pages/views/new_group_view.dart
@@ -3,10 +3,10 @@ import 'package:fluffychat/widgets/layouts/max_width_body.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-class NewGroupUI extends StatelessWidget {
+class NewGroupView extends StatelessWidget {
   final NewGroupController controller;
 
-  const NewGroupUI(this.controller, {Key key}) : super(key: key);
+  const NewGroupView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/new_private_chat_view.dart b/lib/pages/views/new_private_chat_view.dart
index 5f6714618..ee9f9e006 100644
--- a/lib/pages/views/new_private_chat_view.dart
+++ b/lib/pages/views/new_private_chat_view.dart
@@ -8,10 +8,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 
-class NewPrivateChatUI extends StatelessWidget {
+class NewPrivateChatView extends StatelessWidget {
   final NewPrivateChatController controller;
 
-  const NewPrivateChatUI(this.controller, {Key key}) : super(key: key);
+  const NewPrivateChatView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/search_view.dart b/lib/pages/views/search_view.dart
index 2873fdedc..2bbdae6c2 100644
--- a/lib/pages/views/search_view.dart
+++ b/lib/pages/views/search_view.dart
@@ -11,10 +11,10 @@ import 'package:future_loading_dialog/future_loading_dialog.dart';
 import '../../utils/localized_exception_extension.dart';
 import '../search.dart';
 
-class SearchUI extends StatelessWidget {
+class SearchView extends StatelessWidget {
   final SearchController controller;
 
-  const SearchUI(this.controller, {Key key}) : super(key: key);
+  const SearchView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/settings_3pid_view.dart b/lib/pages/views/settings_3pid_view.dart
index 1352898f7..ea6b0de04 100644
--- a/lib/pages/views/settings_3pid_view.dart
+++ b/lib/pages/views/settings_3pid_view.dart
@@ -5,10 +5,10 @@ import 'package:fluffychat/widgets/matrix.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-class Settings3PidUI extends StatelessWidget {
+class Settings3PidView extends StatelessWidget {
   final Settings3PidController controller;
 
-  const Settings3PidUI(this.controller, {Key key}) : super(key: key);
+  const Settings3PidView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/settings_emotes_view.dart b/lib/pages/views/settings_emotes_view.dart
index ac2810d61..093ed5f2b 100644
--- a/lib/pages/views/settings_emotes_view.dart
+++ b/lib/pages/views/settings_emotes_view.dart
@@ -7,10 +7,10 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 import '../../widgets/matrix.dart';
 import '../settings_emotes.dart';
 
-class EmotesSettingsUI extends StatelessWidget {
+class EmotesSettingsView extends StatelessWidget {
   final EmotesSettingsController controller;
 
-  const EmotesSettingsUI(this.controller, {Key key}) : super(key: key);
+  const EmotesSettingsView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/settings_ignore_list_view.dart b/lib/pages/views/settings_ignore_list_view.dart
index 56bb44894..1a81a68a4 100644
--- a/lib/pages/views/settings_ignore_list_view.dart
+++ b/lib/pages/views/settings_ignore_list_view.dart
@@ -8,10 +8,10 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 import '../settings_ignore_list.dart';
 import '../../widgets/matrix.dart';
 
-class SettingsIgnoreListUI extends StatelessWidget {
+class SettingsIgnoreListView extends StatelessWidget {
   final SettingsIgnoreListController controller;
 
-  const SettingsIgnoreListUI(this.controller, {Key key}) : super(key: key);
+  const SettingsIgnoreListView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/settings_multiple_emotes_view.dart b/lib/pages/views/settings_multiple_emotes_view.dart
index aadfb6e03..896e50242 100644
--- a/lib/pages/views/settings_multiple_emotes_view.dart
+++ b/lib/pages/views/settings_multiple_emotes_view.dart
@@ -5,10 +5,10 @@ import 'package:flutter/material.dart';
 import 'package:famedlysdk/famedlysdk.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-class MultipleEmotesSettingsUI extends StatelessWidget {
+class MultipleEmotesSettingsView extends StatelessWidget {
   final MultipleEmotesSettingsController controller;
 
-  MultipleEmotesSettingsUI(this.controller, {Key key}) : super(key: key);
+  MultipleEmotesSettingsView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/settings_notifications_view.dart b/lib/pages/views/settings_notifications_view.dart
index 80749f93b..8d4266e54 100644
--- a/lib/pages/views/settings_notifications_view.dart
+++ b/lib/pages/views/settings_notifications_view.dart
@@ -11,10 +11,10 @@ import '../../utils/localized_exception_extension.dart';
 import '../settings_notifications.dart';
 import '../../widgets/matrix.dart';
 
-class SettingsNotificationsUI extends StatelessWidget {
+class SettingsNotificationsView extends StatelessWidget {
   final SettingsNotificationsController controller;
 
-  const SettingsNotificationsUI(this.controller, {Key key}) : super(key: key);
+  const SettingsNotificationsView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/settings_style_view.dart b/lib/pages/views/settings_style_view.dart
index ed18e4f78..860a5fc1f 100644
--- a/lib/pages/views/settings_style_view.dart
+++ b/lib/pages/views/settings_style_view.dart
@@ -7,10 +7,10 @@ import '../../config/app_config.dart';
 import '../../widgets/matrix.dart';
 import '../settings_style.dart';
 
-class SettingsStyleUI extends StatelessWidget {
+class SettingsStyleView extends StatelessWidget {
   final SettingsStyleController controller;
 
-  const SettingsStyleUI(this.controller, {Key key}) : super(key: key);
+  const SettingsStyleView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/settings_view.dart b/lib/pages/views/settings_view.dart
index abb91036d..8feca874f 100644
--- a/lib/pages/views/settings_view.dart
+++ b/lib/pages/views/settings_view.dart
@@ -18,10 +18,10 @@ import '../../config/app_config.dart';
 import '../../config/setting_keys.dart';
 import '../settings.dart';
 
-class SettingsUI extends StatelessWidget {
+class SettingsView extends StatelessWidget {
   final SettingsController controller;
 
-  const SettingsUI(this.controller, {Key key}) : super(key: key);
+  const SettingsView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/sign_up_password_view.dart b/lib/pages/views/sign_up_password_view.dart
index dc67e798b..9500dae41 100644
--- a/lib/pages/views/sign_up_password_view.dart
+++ b/lib/pages/views/sign_up_password_view.dart
@@ -4,10 +4,10 @@ import 'package:fluffychat/widgets/layouts/one_page_card.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-class SignUpPasswordUI extends StatelessWidget {
+class SignUpPasswordView extends StatelessWidget {
   final SignUpPasswordController controller;
 
-  const SignUpPasswordUI(this.controller, {Key key}) : super(key: key);
+  const SignUpPasswordView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/sign_up_view.dart b/lib/pages/views/sign_up_view.dart
index fe14b398b..e9aaa46ae 100644
--- a/lib/pages/views/sign_up_view.dart
+++ b/lib/pages/views/sign_up_view.dart
@@ -8,10 +8,10 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-class SignUpUI extends StatelessWidget {
+class SignUpView extends StatelessWidget {
   final SignUpController controller;
 
-  const SignUpUI(this.controller, {Key key}) : super(key: key);
+  const SignUpView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/pages/views/user_bottom_sheet_view.dart b/lib/pages/views/user_bottom_sheet_view.dart
index 513a4506b..cc9f915ee 100644
--- a/lib/pages/views/user_bottom_sheet_view.dart
+++ b/lib/pages/views/user_bottom_sheet_view.dart
@@ -9,10 +9,10 @@ import '../user_bottom_sheet.dart';
 import '../../utils/presence_extension.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 
-class UserBottomSheetUI extends StatelessWidget {
+class UserBottomSheetView extends StatelessWidget {
   final UserBottomSheetController controller;
 
-  const UserBottomSheetUI(this.controller, {Key key}) : super(key: key);
+  const UserBottomSheetView(this.controller, {Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {