diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go
index 206eaff6..e13cdacb 100644
--- a/internal/types/message/messages.go
+++ b/internal/types/message/messages.go
@@ -48,13 +48,11 @@ type SignalAnswer struct {
 // Member
 /////////////////////////////
 
-// TODO: New.
 type MemberID struct {
 	Event string `json:"event,omitempty"`
 	ID    string `json:"id"`
 }
 
-// TODO: New.
 type MemberData struct {
 	Event   string `json:"event,omitempty"`
 	ID      string `json:"id"`
@@ -137,17 +135,3 @@ type BroadcastStatus struct {
 	IsActive bool   `json:"is_active"`
 	URL      string `json:"url,omitempty"`
 }
-
-// TODO: Remove.
-type Member struct {
-	Event string `json:"event"`
-	ID    string `json:"id"`
-	Name  string `json:"name"`
-	Admin bool   `json:"admin"`
-}
-
-// TODO: Remove.
-type MemberDisconnected struct {
-	Event string `json:"event"`
-	ID    string `json:"id"`
-}
diff --git a/internal/websocket/handler/session.go b/internal/websocket/handler/session.go
index c02a9089..5a42aa11 100644
--- a/internal/websocket/handler/session.go
+++ b/internal/websocket/handler/session.go
@@ -19,11 +19,11 @@ func (h *MessageHandlerCtx) SessionConnected(session types.Session) error {
 
 	// let everyone know there is a new session
 	h.sessions.Broadcast(
-		message.Member{
-			Event: event.MEMBER_CONNECTED,
-			ID:    session.ID(),
-			Name:  session.Name(),
-			Admin: session.Admin(),
+		message.MemberData{
+			Event:   event.MEMBER_CONNECTED,
+			ID:      session.ID(),
+			Name:    session.Name(),
+			IsAdmin: session.Admin(),
 		}, nil)
 
 	return nil
@@ -43,7 +43,7 @@ func (h *MessageHandlerCtx) SessionDisconnected(session types.Session) error {
 
 	// let everyone know session disconnected
 	h.sessions.Broadcast(
-		message.MemberDisconnected{
+		message.MemberID{
 			Event: event.MEMBER_DISCONNECTED,
 			ID:    session.ID(),
 		}, nil);