diff --git a/client/src/room/event.rs b/client/src/room/event.rs
index 374d7c4..8969716 100644
--- a/client/src/room/event.rs
+++ b/client/src/room/event.rs
@@ -2,13 +2,11 @@
 
 use anyhow::Context as AnyhowContext;
 use log::error;
-use solstice_proto::server::{
-  RoomJoinRequest, RoomJoinResponse, RoomListResponse, RoomMessageResponse,
-};
+use solstice_proto::server;
 use solstice_proto::ServerRequest;
 
 use crate::context::Context;
-use crate::control::{self, RoomMessageRequest};
+use crate::control;
 use crate::handlers::{
   RoomJoinResponseHandler, RoomListRequestHandler, RoomListResponseHandler,
   RoomMessageRequestHandler, RoomMessageResponseHandler,
@@ -19,11 +17,11 @@ use crate::message_handler::MessageHandler;
 #[derive(Debug, PartialEq, Eq)]
 pub enum RoomEvent {
   JoinRequest(String),
-  JoinResponse(RoomJoinResponse),
+  JoinResponse(server::RoomJoinResponse),
   ListRequest,
-  ListResponse(RoomListResponse),
-  MessageRequest(RoomMessageRequest),
-  MessageResponse(RoomMessageResponse),
+  ListResponse(server::RoomListResponse),
+  MessageRequest(control::RoomMessageRequest),
+  MessageResponse(server::RoomMessageResponse),
 }
 
 /// An interface for room event handlers.
@@ -71,7 +69,7 @@ fn handle_join_request(
 
   context
     .server_request_tx
-    .blocking_send(ServerRequest::RoomJoinRequest(RoomJoinRequest {
+    .blocking_send(ServerRequest::RoomJoinRequest(server::RoomJoinRequest {
       room_name,
     }))
     .context("sending server request")?;