diff --git a/po/POTFILES.in b/po/POTFILES.in
index d7e3bf4e..bef85720 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -70,12 +70,12 @@ src/session/view/content/room_details/history_viewer/media.ui
 src/session/view/content/room_details/invite_subpage/invitee_list.rs
 src/session/view/content/room_details/invite_subpage/mod.rs
 src/session/view/content/room_details/invite_subpage/mod.ui
-src/session/view/content/room_details/member_page/members_list_view/extra_lists.rs
-src/session/view/content/room_details/member_page/members_list_view/member_row.ui
-src/session/view/content/room_details/member_page/members_list_view/membership_subpage_row.rs
-src/session/view/content/room_details/member_page/member_menu.ui
-src/session/view/content/room_details/member_page/mod.rs
-src/session/view/content/room_details/member_page/mod.ui
+src/session/view/content/room_details/members_page/members_list_view/extra_lists.rs
+src/session/view/content/room_details/members_page/members_list_view/member_row.ui
+src/session/view/content/room_details/members_page/members_list_view/membership_subpage_row.rs
+src/session/view/content/room_details/members_page/member_menu.ui
+src/session/view/content/room_details/members_page/mod.rs
+src/session/view/content/room_details/members_page/mod.ui
 src/session/view/content/room_details/mod.ui
 src/session/view/content/room_history/event_actions.ui
 src/session/view/content/room_history/item_row.rs
diff --git a/src/session/view/content/room_details/member_page/member_menu.rs b/src/session/view/content/room_details/members_page/member_menu.rs
similarity index 98%
rename from src/session/view/content/room_details/member_page/member_menu.rs
rename to src/session/view/content/room_details/members_page/member_menu.rs
index 135052f6..02486bfe 100644
--- a/src/session/view/content/room_details/member_page/member_menu.rs
+++ b/src/session/view/content/room_details/members_page/member_menu.rs
@@ -126,7 +126,7 @@ impl MemberMenu {
     fn popover_menu(&self) -> &gtk::PopoverMenu {
         self.imp().popover.get_or_init(|| {
             gtk::PopoverMenu::from_model(Some(
-                &gtk::Builder::from_resource("/org/gnome/Fractal/ui/session/view/content/room_details/member_page/member_menu.ui")
+                &gtk::Builder::from_resource("/org/gnome/Fractal/ui/session/view/content/room_details/members_page/member_menu.ui")
                     .object::<gio::MenuModel>("menu_model")
                     .unwrap(),
             ))
diff --git a/src/session/view/content/room_details/member_page/member_menu.ui b/src/session/view/content/room_details/members_page/member_menu.ui
similarity index 100%
rename from src/session/view/content/room_details/member_page/member_menu.ui
rename to src/session/view/content/room_details/members_page/member_menu.ui
diff --git a/src/session/view/content/room_details/member_page/members_list_view/extra_lists.rs b/src/session/view/content/room_details/members_page/members_list_view/extra_lists.rs
similarity index 100%
rename from src/session/view/content/room_details/member_page/members_list_view/extra_lists.rs
rename to src/session/view/content/room_details/members_page/members_list_view/extra_lists.rs
diff --git a/src/session/view/content/room_details/member_page/members_list_view/item_row.rs b/src/session/view/content/room_details/members_page/members_list_view/item_row.rs
similarity index 100%
rename from src/session/view/content/room_details/member_page/members_list_view/item_row.rs
rename to src/session/view/content/room_details/members_page/members_list_view/item_row.rs
diff --git a/src/session/view/content/room_details/member_page/members_list_view/member_row.rs b/src/session/view/content/room_details/members_page/members_list_view/member_row.rs
similarity index 94%
rename from src/session/view/content/room_details/member_page/members_list_view/member_row.rs
rename to src/session/view/content/room_details/members_page/members_list_view/member_row.rs
index b1f6818d..dee583c9 100644
--- a/src/session/view/content/room_details/member_page/members_list_view/member_row.rs
+++ b/src/session/view/content/room_details/members_page/members_list_view/member_row.rs
@@ -1,7 +1,7 @@
 use adw::subclass::prelude::BinImpl;
 use gtk::{glib, glib::clone, prelude::*, subclass::prelude::*, CompositeTemplate};
 
-use super::super::{MemberMenu, MemberPage};
+use super::super::{MemberMenu, MembersPage};
 use crate::{
     components::{Avatar, Badge},
     session::model::Member,
@@ -17,7 +17,7 @@ mod imp {
 
     #[derive(Debug, Default, CompositeTemplate)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/member_page/members_list_view/member_row.ui"
+        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/members_page/members_list_view/member_row.ui"
     )]
     pub struct MemberRow {
         pub member: RefCell<Option<Member>>,
@@ -123,8 +123,8 @@ impl MemberRow {
 
     fn member_menu(&self) -> Option<MemberMenu> {
         let member_page = self
-            .ancestor(MemberPage::static_type())
-            .and_downcast::<MemberPage>()?;
+            .ancestor(MembersPage::static_type())
+            .and_downcast::<MembersPage>()?;
         Some(member_page.member_menu().clone())
     }
 }
diff --git a/src/session/view/content/room_details/member_page/members_list_view/member_row.ui b/src/session/view/content/room_details/members_page/members_list_view/member_row.ui
similarity index 100%
rename from src/session/view/content/room_details/member_page/members_list_view/member_row.ui
rename to src/session/view/content/room_details/members_page/members_list_view/member_row.ui
diff --git a/src/session/view/content/room_details/member_page/members_list_view/membership_subpage_item.rs b/src/session/view/content/room_details/members_page/members_list_view/membership_subpage_item.rs
similarity index 97%
rename from src/session/view/content/room_details/member_page/members_list_view/membership_subpage_item.rs
rename to src/session/view/content/room_details/members_page/members_list_view/membership_subpage_item.rs
index 410703fd..b0af8240 100644
--- a/src/session/view/content/room_details/member_page/members_list_view/membership_subpage_item.rs
+++ b/src/session/view/content/room_details/members_page/members_list_view/membership_subpage_item.rs
@@ -20,7 +20,7 @@ mod imp {
 
     #[glib::object_subclass]
     impl ObjectSubclass for MembershipSubpageItem {
-        const NAME: &'static str = "ContentMemberPageMembershipSubpageItem";
+        const NAME: &'static str = "MembersPageMembershipSubpageItem";
         type Type = super::MembershipSubpageItem;
     }
 
diff --git a/src/session/view/content/room_details/member_page/members_list_view/membership_subpage_row.rs b/src/session/view/content/room_details/members_page/members_list_view/membership_subpage_row.rs
similarity index 97%
rename from src/session/view/content/room_details/member_page/members_list_view/membership_subpage_row.rs
rename to src/session/view/content/room_details/members_page/members_list_view/membership_subpage_row.rs
index 64e88089..16eb7722 100644
--- a/src/session/view/content/room_details/member_page/members_list_view/membership_subpage_row.rs
+++ b/src/session/view/content/room_details/members_page/members_list_view/membership_subpage_row.rs
@@ -14,7 +14,7 @@ mod imp {
 
     #[derive(Debug, Default, CompositeTemplate)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/member_page/members_list_view/membership_subpage_row.ui"
+        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/members_page/members_list_view/membership_subpage_row.ui"
     )]
     pub struct MembershipSubpageRow {
         /// The item of this row.
@@ -27,7 +27,7 @@ mod imp {
 
     #[glib::object_subclass]
     impl ObjectSubclass for MembershipSubpageRow {
-        const NAME: &'static str = "ContentMemberPageMembershipSubpageRow";
+        const NAME: &'static str = "MembersPageMembershipSubpageRow";
         type Type = super::MembershipSubpageRow;
         type ParentType = adw::ActionRow;
 
diff --git a/src/session/view/content/room_details/member_page/members_list_view/membership_subpage_row.ui b/src/session/view/content/room_details/members_page/members_list_view/membership_subpage_row.ui
similarity index 79%
rename from src/session/view/content/room_details/member_page/members_list_view/membership_subpage_row.ui
rename to src/session/view/content/room_details/members_page/members_list_view/membership_subpage_row.ui
index d9fc5c0e..8834b4e3 100644
--- a/src/session/view/content/room_details/member_page/members_list_view/membership_subpage_row.ui
+++ b/src/session/view/content/room_details/members_page/members_list_view/membership_subpage_row.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="ContentMemberPageMembershipSubpageRow" parent="AdwActionRow">
-    <property name="title" bind-source="ContentMemberPageMembershipSubpageRow" bind-property="label" bind-flags="sync-create"/>
+  <template class="MembersPageMembershipSubpageRow" parent="AdwActionRow">
+    <property name="title" bind-source="MembersPageMembershipSubpageRow" bind-property="label" bind-flags="sync-create"/>
     <property name="icon-name">users-symbolic</property>
     <property name="activatable">True</property>
     <property name="margin-top">6</property>
diff --git a/src/session/view/content/room_details/member_page/members_list_view/mod.rs b/src/session/view/content/room_details/members_page/members_list_view/mod.rs
similarity index 98%
rename from src/session/view/content/room_details/member_page/members_list_view/mod.rs
rename to src/session/view/content/room_details/members_page/members_list_view/mod.rs
index 9940c907..04a2e1e8 100644
--- a/src/session/view/content/room_details/member_page/members_list_view/mod.rs
+++ b/src/session/view/content/room_details/members_page/members_list_view/mod.rs
@@ -23,7 +23,7 @@ mod imp {
 
     #[derive(Debug, Default, CompositeTemplate)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/member_page/members_list_view/mod.ui"
+        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/members_page/members_list_view/mod.ui"
     )]
     pub struct MembersListView {
         #[template_child]
diff --git a/src/session/view/content/room_details/member_page/members_list_view/mod.ui b/src/session/view/content/room_details/members_page/members_list_view/mod.ui
similarity index 100%
rename from src/session/view/content/room_details/member_page/members_list_view/mod.ui
rename to src/session/view/content/room_details/members_page/members_list_view/mod.ui
diff --git a/src/session/view/content/room_details/member_page/mod.rs b/src/session/view/content/room_details/members_page/mod.rs
similarity index 96%
rename from src/session/view/content/room_details/member_page/mod.rs
rename to src/session/view/content/room_details/members_page/mod.rs
index 7dc88d97..7a474c6b 100644
--- a/src/session/view/content/room_details/member_page/mod.rs
+++ b/src/session/view/content/room_details/members_page/mod.rs
@@ -33,9 +33,9 @@ mod imp {
 
     #[derive(Debug, Default, CompositeTemplate)]
     #[template(
-        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/member_page/mod.ui"
+        resource = "/org/gnome/Fractal/ui/session/view/content/room_details/members_page/mod.ui"
     )]
-    pub struct MemberPage {
+    pub struct MembersPage {
         pub room: glib::WeakRef<Room>,
         #[template_child]
         pub members_search_entry: TemplateChild<gtk::SearchEntry>,
@@ -50,9 +50,9 @@ mod imp {
     }
 
     #[glib::object_subclass]
-    impl ObjectSubclass for MemberPage {
-        const NAME: &'static str = "ContentMemberPage";
-        type Type = super::MemberPage;
+    impl ObjectSubclass for MembersPage {
+        const NAME: &'static str = "MembersPage";
+        type Type = super::MembersPage;
         type ParentType = adw::NavigationPage;
 
         fn class_init(klass: &mut Self::Class) {
@@ -90,7 +90,7 @@ mod imp {
         }
     }
 
-    impl ObjectImpl for MemberPage {
+    impl ObjectImpl for MembersPage {
         fn properties() -> &'static [glib::ParamSpec] {
             static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
                 vec![
@@ -138,16 +138,16 @@ mod imp {
         }
     }
 
-    impl WidgetImpl for MemberPage {}
-    impl NavigationPageImpl for MemberPage {}
+    impl WidgetImpl for MembersPage {}
+    impl NavigationPageImpl for MembersPage {}
 }
 
 glib::wrapper! {
-    pub struct MemberPage(ObjectSubclass<imp::MemberPage>)
+    pub struct MembersPage(ObjectSubclass<imp::MembersPage>)
         @extends gtk::Widget, adw::NavigationPage;
 }
 
-impl MemberPage {
+impl MembersPage {
     pub fn new(room: &Room) -> Self {
         glib::Object::builder().property("room", room).build()
     }
diff --git a/src/session/view/content/room_details/member_page/mod.ui b/src/session/view/content/room_details/members_page/mod.ui
similarity index 98%
rename from src/session/view/content/room_details/member_page/mod.ui
rename to src/session/view/content/room_details/members_page/mod.ui
index 708a86e7..7db903de 100644
--- a/src/session/view/content/room_details/member_page/mod.ui
+++ b/src/session/view/content/room_details/members_page/mod.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="ContentMemberPage" parent="AdwNavigationPage">
+  <template class="MembersPage" parent="AdwNavigationPage">
     <property name="title">Room Members</property>
     <child>
       <object class="AdwToolbarView">
diff --git a/src/session/view/content/room_details/mod.rs b/src/session/view/content/room_details/mod.rs
index dfa70673..fc1fbe15 100644
--- a/src/session/view/content/room_details/mod.rs
+++ b/src/session/view/content/room_details/mod.rs
@@ -1,7 +1,7 @@
 mod general_page;
 mod history_viewer;
 mod invite_subpage;
-mod member_page;
+mod members_page;
 
 use std::convert::From;
 
@@ -12,7 +12,7 @@ pub use self::{
     general_page::GeneralPage,
     history_viewer::{AudioHistoryViewer, FileHistoryViewer, MediaHistoryViewer},
     invite_subpage::InviteSubpage,
-    member_page::MemberPage,
+    members_page::MembersPage,
 };
 use crate::session::model::Room;
 
@@ -160,7 +160,7 @@ impl RoomDetails {
 
         let mut subpages = imp.subpages.borrow_mut();
         let subpage = subpages.entry(name).or_insert_with(|| match name {
-            SubpageName::Members => MemberPage::new(room).upcast(),
+            SubpageName::Members => MembersPage::new(room).upcast(),
             SubpageName::Invite => InviteSubpage::new(room).upcast(),
             SubpageName::MediaHistory => MediaHistoryViewer::new(room).upcast(),
             SubpageName::FileHistory => FileHistoryViewer::new(room).upcast(),
diff --git a/src/ui-resources.gresource.xml b/src/ui-resources.gresource.xml
index 6bb19e6c..df839c74 100644
--- a/src/ui-resources.gresource.xml
+++ b/src/ui-resources.gresource.xml
@@ -54,11 +54,11 @@
     <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_details/history_viewer/media_item.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_details/invite_subpage/invitee_row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_details/invite_subpage/mod.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_details/member_page/member_menu.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_details/member_page/members_list_view/member_row.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_details/member_page/members_list_view/membership_subpage_row.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_details/member_page/members_list_view/mod.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_details/member_page/mod.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_details/members_page/member_menu.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_details/members_page/members_list_view/member_row.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_details/members_page/members_list_view/membership_subpage_row.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_details/members_page/members_list_view/mod.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_details/members_page/mod.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_details/mod.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_history/divider_row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">session/view/content/room_history/event_actions.ui</file>