diff --git a/zed-rpc/proto/zed.proto b/zed-rpc/proto/zed.proto
index 2ce3846a8f9d58876974fc251ef32d594aa4f11e..4a505d53d56c36cd01ddf77cc5dc682ea8d8c77b 100644
--- a/zed-rpc/proto/zed.proto
+++ b/zed-rpc/proto/zed.proto
@@ -19,8 +19,8 @@ message Envelope {
         UpdateBuffer update_buffer = 14;
         SaveBuffer save_buffer = 15;
         BufferSaved buffer_saved = 16;
-        AddGuest add_guest = 17;
-        RemoveGuest remove_guest = 18;
+        AddPeer add_peer = 17;
+        RemovePeer remove_peer = 18;
     }
 }
 
@@ -57,12 +57,12 @@ message CloseWorktree {
     uint64 worktree_id = 1;
 }
 
-message AddGuest {
+message AddPeer {
     uint64 worktree_id = 1;
-    Peer guest = 2;
+    Peer peer = 2;
 }
 
-message RemoveGuest {
+message RemovePeer {
     uint64 worktree_id = 1;
     uint32 peer_id = 2;
 }
diff --git a/zed-rpc/src/proto.rs b/zed-rpc/src/proto.rs
index 53001c202088d1360c16f6fe23c2512c26ded87d..6eb34b26d8e260f6cf869c74f79a99d4d6ce4272 100644
--- a/zed-rpc/src/proto.rs
+++ b/zed-rpc/src/proto.rs
@@ -76,8 +76,8 @@ request_message!(OpenBuffer, OpenBufferResponse);
 message!(CloseBuffer);
 message!(UpdateBuffer);
 request_message!(SaveBuffer, BufferSaved);
-message!(AddGuest);
-message!(RemoveGuest);
+message!(AddPeer);
+message!(RemovePeer);
 
 /// A stream of protobuf messages.
 pub struct MessageStream<T> {
diff --git a/zed/src/editor/buffer.rs b/zed/src/editor/buffer.rs
index 918dce39db6f769b636d1ac5c3cd572f6d5d08d5..4db999922dd26148d2d8032467f97614a93a5a09 100644
--- a/zed/src/editor/buffer.rs
+++ b/zed/src/editor/buffer.rs
@@ -1539,7 +1539,7 @@ impl Buffer {
         self.operations.push(operation);
     }
 
-    pub fn remove_guest(&mut self, replica_id: ReplicaId, cx: &mut ModelContext<Self>) {
+    pub fn remove_peer(&mut self, replica_id: ReplicaId, cx: &mut ModelContext<Self>) {
         self.selections
             .retain(|set_id, _| set_id.replica_id != replica_id);
         cx.notify();
diff --git a/zed/src/worktree.rs b/zed/src/worktree.rs
index 4aedb450fb9c092dcf371013ee43fe174320de94..9a16975598d2f9a6059d4b4c9e935d66d78f553d 100644
--- a/zed/src/worktree.rs
+++ b/zed/src/worktree.rs
@@ -53,8 +53,8 @@ lazy_static! {
 }
 
 pub fn init(cx: &mut MutableAppContext, rpc: rpc::Client) {
-    rpc.on_message(remote::add_guest, cx);
-    rpc.on_message(remote::remove_guest, cx);
+    rpc.on_message(remote::add_peer, cx);
+    rpc.on_message(remote::remove_peer, cx);
     rpc.on_message(remote::open_buffer, cx);
     rpc.on_message(remote::close_buffer, cx);
     rpc.on_message(remote::update_buffer, cx);
@@ -240,25 +240,25 @@ impl Worktree {
         }
     }
 
-    pub fn add_guest(
+    pub fn add_peer(
         &mut self,
-        envelope: TypedEnvelope<proto::AddGuest>,
+        envelope: TypedEnvelope<proto::AddPeer>,
         cx: &mut ModelContext<Worktree>,
     ) -> Result<()> {
         match self {
-            Worktree::Local(worktree) => worktree.add_guest(envelope, cx),
-            Worktree::Remote(worktree) => worktree.add_guest(envelope, cx),
+            Worktree::Local(worktree) => worktree.add_peer(envelope, cx),
+            Worktree::Remote(worktree) => worktree.add_peer(envelope, cx),
         }
     }
 
-    pub fn remove_guest(
+    pub fn remove_peer(
         &mut self,
-        envelope: TypedEnvelope<proto::RemoveGuest>,
+        envelope: TypedEnvelope<proto::RemovePeer>,
         cx: &mut ModelContext<Worktree>,
     ) -> Result<()> {
         match self {
-            Worktree::Local(worktree) => worktree.remove_guest(envelope, cx),
-            Worktree::Remote(worktree) => worktree.remove_guest(envelope, cx),
+            Worktree::Local(worktree) => worktree.remove_peer(envelope, cx),
+            Worktree::Remote(worktree) => worktree.remove_peer(envelope, cx),
         }
     }
 
@@ -543,24 +543,21 @@ impl LocalWorktree {
         Ok(())
     }
 
-    pub fn add_guest(
+    pub fn add_peer(
         &mut self,
-        envelope: TypedEnvelope<proto::AddGuest>,
+        envelope: TypedEnvelope<proto::AddPeer>,
         cx: &mut ModelContext<Worktree>,
     ) -> Result<()> {
-        let guest = envelope
-            .payload
-            .guest
-            .ok_or_else(|| anyhow!("empty peer"))?;
+        let peer = envelope.payload.peer.ok_or_else(|| anyhow!("empty peer"))?;
         self.peers
-            .insert(PeerId(guest.peer_id), guest.replica_id as ReplicaId);
+            .insert(PeerId(peer.peer_id), peer.replica_id as ReplicaId);
         cx.notify();
         Ok(())
     }
 
-    pub fn remove_guest(
+    pub fn remove_peer(
         &mut self,
-        envelope: TypedEnvelope<proto::RemoveGuest>,
+        envelope: TypedEnvelope<proto::RemovePeer>,
         cx: &mut ModelContext<Worktree>,
     ) -> Result<()> {
         let peer_id = PeerId(envelope.payload.peer_id);
@@ -571,7 +568,7 @@ impl LocalWorktree {
         self.shared_buffers.remove(&peer_id);
         for (_, buffer) in &self.open_buffers {
             if let Some(buffer) = buffer.upgrade(&cx) {
-                buffer.update(cx, |buffer, cx| buffer.remove_guest(replica_id, cx));
+                buffer.update(cx, |buffer, cx| buffer.remove_peer(replica_id, cx));
             }
         }
         cx.notify();
@@ -922,24 +919,21 @@ impl RemoteWorktree {
         })
     }
 
-    pub fn add_guest(
+    pub fn add_peer(
         &mut self,
-        envelope: TypedEnvelope<proto::AddGuest>,
+        envelope: TypedEnvelope<proto::AddPeer>,
         cx: &mut ModelContext<Worktree>,
     ) -> Result<()> {
-        let guest = envelope
-            .payload
-            .guest
-            .ok_or_else(|| anyhow!("empty peer"))?;
+        let peer = envelope.payload.peer.ok_or_else(|| anyhow!("empty peer"))?;
         self.peers
-            .insert(PeerId(guest.peer_id), guest.replica_id as ReplicaId);
+            .insert(PeerId(peer.peer_id), peer.replica_id as ReplicaId);
         cx.notify();
         Ok(())
     }
 
-    pub fn remove_guest(
+    pub fn remove_peer(
         &mut self,
-        envelope: TypedEnvelope<proto::RemoveGuest>,
+        envelope: TypedEnvelope<proto::RemovePeer>,
         cx: &mut ModelContext<Worktree>,
     ) -> Result<()> {
         let peer_id = PeerId(envelope.payload.peer_id);
@@ -949,7 +943,7 @@ impl RemoteWorktree {
             .ok_or_else(|| anyhow!("unknown peer {:?}", peer_id))?;
         for (_, buffer) in &self.open_buffers {
             if let Some(buffer) = buffer.upgrade(&cx) {
-                buffer.update(cx, |buffer, cx| buffer.remove_guest(replica_id, cx));
+                buffer.update(cx, |buffer, cx| buffer.remove_peer(replica_id, cx));
             }
         }
         cx.notify();
@@ -2091,8 +2085,8 @@ impl<'a> Iterator for ChildEntriesIter<'a> {
 mod remote {
     use super::*;
 
-    pub async fn add_guest(
-        envelope: TypedEnvelope<proto::AddGuest>,
+    pub async fn add_peer(
+        envelope: TypedEnvelope<proto::AddPeer>,
         rpc: &rpc::Client,
         cx: &mut AsyncAppContext,
     ) -> anyhow::Result<()> {
@@ -2100,11 +2094,11 @@ mod remote {
             .read()
             .await
             .shared_worktree(envelope.payload.worktree_id, cx)?
-            .update(cx, |worktree, cx| worktree.add_guest(envelope, cx))
+            .update(cx, |worktree, cx| worktree.add_peer(envelope, cx))
     }
 
-    pub async fn remove_guest(
-        envelope: TypedEnvelope<proto::RemoveGuest>,
+    pub async fn remove_peer(
+        envelope: TypedEnvelope<proto::RemovePeer>,
         rpc: &rpc::Client,
         cx: &mut AsyncAppContext,
     ) -> anyhow::Result<()> {
@@ -2112,7 +2106,7 @@ mod remote {
             .read()
             .await
             .shared_worktree(envelope.payload.worktree_id, cx)?
-            .update(cx, |worktree, cx| worktree.remove_guest(envelope, cx))
+            .update(cx, |worktree, cx| worktree.remove_peer(envelope, cx))
     }
 
     pub async fn open_buffer(