diff --git a/client/src/control/response.rs b/client/src/control/response.rs
index f5fc918..ed5df85 100644
--- a/client/src/control/response.rs
+++ b/client/src/control/response.rs
@@ -110,7 +110,7 @@ mod tests {
   use solstice_proto::{User, UserStatus};
 
   use crate::room::{
-    Membership, Message, MessageHistory, RoomState, Visibility,
+    Message, MessageHistory, RoomMembership, RoomState, Visibility,
   };
 
   use super::{
@@ -195,7 +195,7 @@ mod tests {
       RoomJoinResponse {
         room_name: "bleep".to_string(),
         room: RoomState {
-          membership: Membership::Joining,
+          membership: RoomMembership::Joining,
           visibility: Visibility::PrivateOwned,
           operated: false,
           user_count: 3,
@@ -270,7 +270,7 @@ mod tests {
         rooms: vec![(
           "bleep".to_string(),
           RoomState {
-            membership: Membership::Joining,
+            membership: RoomMembership::Joining,
             visibility: Visibility::PrivateOwned,
             operated: false,
             user_count: 3,
diff --git a/client/src/handlers/room_join_request_handler.rs b/client/src/handlers/room_join_request_handler.rs
index a90cb17..d577100 100644
--- a/client/src/handlers/room_join_request_handler.rs
+++ b/client/src/handlers/room_join_request_handler.rs
@@ -75,7 +75,7 @@ mod tests {
   use crate::context::{ContextBundle, ContextOptions};
   use crate::control;
   use crate::message_handler::MessageHandler;
-  use crate::room::{Membership, RoomState, Visibility};
+  use crate::room::{RoomMembership, RoomState, Visibility};
 
   use super::RoomJoinRequestHandler;
 
@@ -100,7 +100,7 @@ mod tests {
   #[test]
   fn run_already_joined_responds_immediately() -> anyhow::Result<()> {
     let mut room = RoomState::new(Visibility::Public, 3);
-    room.membership = Membership::Member;
+    room.membership = RoomMembership::Member;
 
     let mut options = ContextOptions::default();
     options
@@ -156,7 +156,7 @@ mod tests {
         .get_strict("bleep")
         .context("getting room")?
         .membership,
-      Membership::Joining
+      RoomMembership::Joining
     );
 
     // The request is forwarded onwards.
diff --git a/client/src/handlers/room_join_response_handler.rs b/client/src/handlers/room_join_response_handler.rs
index d09d276..c8f9910 100644
--- a/client/src/handlers/room_join_response_handler.rs
+++ b/client/src/handlers/room_join_response_handler.rs
@@ -55,7 +55,7 @@ mod tests {
   use crate::context::{ContextBundle, ContextOptions};
   use crate::control;
   use crate::message_handler::MessageHandler;
-  use crate::room::{Membership, RoomState, Visibility};
+  use crate::room::{RoomMembership, RoomState, Visibility};
 
   use super::RoomJoinResponseHandler;
 
@@ -81,7 +81,7 @@ mod tests {
       .run(&mut bundle.context, &response)
       .unwrap();
 
-    room.membership = Membership::Member;
+    room.membership = RoomMembership::Member;
     room.user_count = 0;
     room.operators = ["shruti"].iter().map(|s| s.to_string()).collect();
     room.owner = Some("kim".to_string());
diff --git a/client/src/room/map.rs b/client/src/room/map.rs
index d313519..39d3e66 100644
--- a/client/src/room/map.rs
+++ b/client/src/room/map.rs
@@ -5,7 +5,7 @@ use log::{error, info, warn};
 use solstice_proto::{server, User};
 use thiserror::Error;
 
-use crate::room::{Membership, RoomState, Visibility};
+use crate::room::{RoomMembership, RoomState, Visibility};
 
 /// The error returned by RoomMap functions.
 #[derive(Debug, Error)]
@@ -14,7 +14,7 @@ pub enum RoomError {
   RoomNotFound(#[from] RoomNotFoundError),
 
   #[error("cannot change membership from {0:?} to {1:?}")]
-  MembershipChangeInvalid(Membership, Membership),
+  MembershipChangeInvalid(RoomMembership, RoomMembership),
 }
 
 #[derive(Debug, Error)]
@@ -133,14 +133,14 @@ impl RoomMap {
     let room = self.get_mut_strict(room_name)?;
 
     match room.membership {
-      Membership::NonMember => {
-        room.membership = Membership::Joining;
+      RoomMembership::NonMember => {
+        room.membership = RoomMembership::Joining;
         Ok(())
       }
 
       membership => Err(RoomError::MembershipChangeInvalid(
         membership,
-        Membership::Joining,
+        RoomMembership::Joining,
       )),
     }
   }
@@ -158,7 +158,7 @@ impl RoomMap {
     let room = self.get_mut_strict(room_name)?;
 
     // Log what's happening.
-    if let Membership::Joining = room.membership {
+    if let RoomMembership::Joining = room.membership {
       info!("Joined room {:?}", room_name);
     } else {
       warn!(
@@ -168,7 +168,7 @@ impl RoomMap {
     }
 
     // Update the room struct.
-    room.membership = Membership::Member;
+    room.membership = RoomMembership::Member;
     room.user_count = members.len();
     room.owner = owner;
 
@@ -193,14 +193,14 @@ impl RoomMap {
     let room = self.get_mut_strict(room_name)?;
 
     match room.membership {
-      Membership::Member => {
-        room.membership = Membership::Leaving;
+      RoomMembership::Member => {
+        room.membership = RoomMembership::Leaving;
         Ok(())
       }
 
       membership => Err(RoomError::MembershipChangeInvalid(
         membership,
-        Membership::Leaving,
+        RoomMembership::Leaving,
       )),
     }
   }
@@ -210,7 +210,7 @@ impl RoomMap {
     let room = self.get_mut_strict(room_name)?;
 
     match room.membership {
-      Membership::Leaving => info!("Left room {:?}", room_name),
+      RoomMembership::Leaving => info!("Left room {:?}", room_name),
 
       membership => warn!(
         "Left room {:?} with wrong membership: {:?}",
@@ -218,7 +218,7 @@ impl RoomMap {
       ),
     }
 
-    room.membership = Membership::NonMember;
+    room.membership = RoomMembership::NonMember;
     Ok(())
   }
 
@@ -268,7 +268,7 @@ mod tests {
   use solstice_proto::server::RoomListResponse;
 
   use crate::room::{
-    Membership, Message, MessageHistory, RoomState, Visibility,
+    Message, MessageHistory, RoomMembership, RoomState, Visibility,
   };
 
   use super::RoomMap;
@@ -276,8 +276,8 @@ mod tests {
   #[test]
   fn deserialize_membership() {
     assert_eq!(
-      serde_json::from_str::<Membership>(r#""Member""#).unwrap(),
-      Membership::Member
+      serde_json::from_str::<RoomMembership>(r#""Member""#).unwrap(),
+      RoomMembership::Member
     );
   }
 
@@ -339,7 +339,7 @@ mod tests {
       )
       .unwrap(),
       RoomState {
-        membership: Membership::Joining,
+        membership: RoomMembership::Joining,
         visibility: Visibility::PrivateOwned,
         operated: false,
         user_count: 3,
diff --git a/client/src/room/state.rs b/client/src/room/state.rs
index 29276d0..d9f8f69 100644
--- a/client/src/room/state.rs
+++ b/client/src/room/state.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
 /// This enumeration is the list of possible membership states for a chat room.
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize, Deserialize)]
-pub enum Membership {
+pub enum RoomMembership {
   /// The user is not a member of this room.
   NonMember,
   /// The user has requested to join the room, but hasn't heard back from the
@@ -108,7 +108,7 @@ impl MessageHistory {
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
 pub struct RoomState {
   /// The membership state of the user for the room.
-  pub membership: Membership,
+  pub membership: RoomMembership,
   /// The visibility of the room.
   pub visibility: Visibility,
   /// True if the user is one of the room's operators, False if the user is a
@@ -132,7 +132,7 @@ impl RoomState {
   /// Creates a new room with the given visibility and user count.
   pub fn new(visibility: Visibility, user_count: usize) -> Self {
     Self {
-      membership: Membership::NonMember,
+      membership: RoomMembership::NonMember,
       visibility: visibility,
       operated: false,
       user_count: user_count,