diff --git a/app.py b/app.py
index c775f64..918c006 100644
--- a/app.py
+++ b/app.py
@@ -100,7 +100,7 @@ def chat(room_name):
 
 @socketio.on("join")
 def on_join(data):
-    room_name = data["room"]
+    room_name = data["room_name"]
     room = get_room(room_name)
 
     # this makes the client start listening for new events for this room.
@@ -147,7 +147,7 @@ def on_join(data):
 
 @socketio.on("message")
 def handle_message(data):
-    room_name = data["room"]
+    room_name = data["room_name"]
     room = get_room(room_name)
 
     # Save the message to the database
@@ -213,7 +213,7 @@ def handle_delete_message(data):
         db.session.commit()
 
     # Notify all clients in the room to remove the message from their DOM
-    emit("message_deleted", {"message_id": msg_id}, room=data["room"])
+    emit("message_deleted", {"message_id": msg_id}, room=data["room_name"])
 
 
 def chat_claude(username, room_name, message, model_name="anthropic.claude-v1"):
diff --git a/templates/chat.html b/templates/chat.html
index 353a6e1..331eb69 100644
--- a/templates/chat.html
+++ b/templates/chat.html
@@ -148,14 +148,14 @@ const dompurify_config = {
 function sendMessage() {
     const message = document.getElementById('message').value;
     if (message.trim() !== "") {  // Ensure we're not sending empty messages
-        socket.emit('message', {'username': username, 'message': message, 'room': room_name});
+        socket.emit('message', {'username': username, 'message': message, 'room_name': room_name});
         document.getElementById('message').value = '';
     }
 }
 
 
-function deleteMessage(messageId, room) {
-    socket.emit('delete_message', {'message_id': messageId, 'room': room_name});
+function deleteMessage(messageId, room_name) {
+    socket.emit('delete_message', {'message_id': messageId, 'room_name': room_name});
 }
 
 
@@ -181,7 +181,7 @@ socket.on('update_room_title', (data) => {
 
 
 socket.on('connect', () => {
-    socket.emit('join', {username: username, room: room_name});
+    socket.emit('join', {username: username, room_name: room_name});
 });
 
 socket.on('message', (data) => {