diff --git a/internal/types/message/messages.go b/internal/types/message/messages.go
index 46f34647..078bf4b4 100644
--- a/internal/types/message/messages.go
+++ b/internal/types/message/messages.go
@@ -22,9 +22,9 @@ type SignalProvide struct {
 }
 
 type SignalAnswer struct {
-	Event       string `json:"event"`
-	DisplayName string `json:"displayname"`
-	SDP         string `json:"sdp"`
+	Event string `json:"event"`
+	Name  string `json:"displayname"` // TODO: Change.
+	SDP   string `json:"sdp"`
 }
 
 type MembersList struct {
@@ -34,14 +34,14 @@ type MembersList struct {
 
 type MembersListEntry struct {
 	ID    string `json:"id"`
-	Name  string `json:"displayname"`
+	Name  string `json:"displayname"` // TODO: Change.
 	Admin bool   `json:"admin"`
 }
 
 type Member struct {
 	Event string `json:"event"`
 	ID    string `json:"id"`
-	Name  string `json:"displayname"`
+	Name  string `json:"displayname"` // TODO: Change.
 	Admin bool   `json:"admin"`
 }
 
diff --git a/internal/websocket/handler/signal.go b/internal/websocket/handler/signal.go
index 7edbb47f..b618f3e4 100644
--- a/internal/websocket/handler/signal.go
+++ b/internal/websocket/handler/signal.go
@@ -22,6 +22,6 @@ func (h *MessageHandlerCtx) signalProvide(session types.Session) error {
 }
 
 func (h *MessageHandlerCtx) signalAnswer(session types.Session, payload *message.SignalAnswer) error {
-	session.SetName(payload.DisplayName)
+	session.SetName(payload.Name)
 	return session.SignalAnswer(payload.SDP)
 }