diff --git a/src/client_container.proto b/src/client_container.proto
index a4826f20c..03890479b 100644
--- a/src/client_container.proto
+++ b/src/client_container.proto
@@ -14,16 +14,17 @@ message ClientMessage {
 
         LOGIN_MUSIC_SESSION = 102; 
         LOGIN_MUSIC_SESSION_ACK = 103;
-        USER_JOINED_MUSIC_SESSION = 104;
+        FRIEND_SESSION_JOIN = 104;
         LEAVE_MUSIC_SESSION = 105;
         LEAVE_MUSIC_SESSION_ACK = 106;
         HEARTBEAT = 107;
         FRIEND_UPDATE = 108;
         SESSION_INVITATION = 109;
-        USER_LEFT_MUSIC_SESSION = 110;
+        MUSICIAN_SESSION_DEPART = 110;
         JOIN_REQUEST = 111;
         FRIEND_REQUEST = 112;
         FRIEND_REQUEST_ACCEPTED = 113;
+        MUSICIAN_SESSION_JOIN = 114;
 
         TEST_SESSION_MESSAGE = 200;
 
@@ -51,16 +52,17 @@ message ClientMessage {
     optional LoginAck                   login_ack = 101; // from server
     optional LoginMusicSession          login_music_session = 102; // to server
     optional LoginMusicSessionAck       login_music_session_ack = 103; // from server 
-    optional UserJoinedMusicSession     user_joined_music_session = 104; // from server to all members
+    optional FriendSessionJoin          friend_session_join = 104; // from server to all members
     optional LeaveMusicSession          leave_music_session = 105;
     optional LeaveMusicSessionAck       leave_music_session_ack = 106;
     optional Heartbeat                  heartbeat = 107;
     optional FriendUpdate               friend_update = 108; // from server to all friends of user
     optional SessionInvitation          session_invitation = 109; // from server to user
-    optional UserLeftMusicSession       user_left_music_session = 110;
+    optional MusicianSessionDepart      musician_session_depart = 110;
     optional JoinRequest                join_request = 111;
     optional FriendRequest              friend_request = 112;
     optional FriendRequestAccepted      friend_request_accepted = 113;
+    optional MusicianSessionJoin        musician_session_join = 114;
 
     // Client-Session messages (to/from)  
     optional TestSessionMessage     test_session_message = 200;
@@ -132,20 +134,29 @@ message LeaveMusicSessionAck {
 
 // route_to: client:
 // sent by server to let the rest of the participants know a user has joined. 
-// this feels a little off; client could initiate this to other clients, right?
-message UserJoinedMusicSession {
+message FriendSessionJoin {
     optional string session_id = 1; // the session ID
     optional string user_id = 2; // this is the user_id and can be used for user unicast messages
     optional string username = 3; // meant to be a display name
+    optional string photo_url = 4;
 }
 
 // route_to: client:
 // sent by server to let the rest of the participants know a user has joined. 
-// this feels a little off; client could initiate this to other clients, right?
-message UserLeftMusicSession {
+message MusicianSessionJoin {
     optional string session_id = 1; // the session ID
     optional string user_id = 2; // this is the user_id and can be used for user unicast messages
     optional string username = 3; // meant to be a display name
+    optional string photo_url = 4;
+}
+
+// route_to: client:
+// sent by server to let the rest of the participants know a user has left. 
+message MusicianSessionDepart {
+    optional string session_id = 1; // the session ID
+    optional string user_id = 2; // this is the user_id and can be used for user unicast messages
+    optional string username = 3; // meant to be a display name
+    optional string photo_url = 4;
 }
 
 message JoinRequest {