diff --git a/public/scripts/index.js b/public/scripts/index.js
index 888479f..f5a89f0 100644
--- a/public/scripts/index.js
+++ b/public/scripts/index.js
@@ -56,7 +56,7 @@ class VideoChatApp {
         });
         rtcConn.onIceCandidate((e) => {
             if (e.candidate) {
-                this.#socket.emit("ice-candidate", {candidate: e.candidate, to: socketId});
+                this.#socket.emit("ice-candidate-received", {candidate: e.candidate, to: socketId});
             }
         });
         rtcConn.addStream(this.#localUserMediaStream);
@@ -68,7 +68,7 @@ class VideoChatApp {
         let rtcConn = this.#createRtcConnection(this.#remoteVideo, socketId)
         const offer = await rtcConn.createOffer()
         console.log("call user", offer)
-        this.#socket.emit("call-user", {offer, to: socketId, user: this.#user});
+        this.#socket.emit("call-made", {offer, to: socketId, user: this.#user});
     }
 
     #setUpUserListComponent(userListComponent) {
@@ -86,7 +86,7 @@ class VideoChatApp {
                 console.log(e)
             }
         });
-        this.#socket.on("ice-candidate-post", async data => {
+        this.#socket.on("ice-candidate-received", async data => {
             for (let i = this.#rtcConns.length - 1; i >= 0; i--) {
                 try {
                     await this.#rtcConns[i].addIceCandidate(data.candidate)
@@ -101,7 +101,7 @@ class VideoChatApp {
         this.#socket.on("update-user-list", ({users}) => {
             this.#userListComponent.updateUserList(users);
         });
-        this.#socket.on("remove-user", ({socketId}) => {
+        this.#socket.on("user-removed", ({socketId}) => {
             const elToRemove = document.getElementById(socketId);
             if (elToRemove) {
                 elToRemove.remove();
@@ -113,7 +113,7 @@ class VideoChatApp {
         console.log("call made", data)
         let rtcConn = this.#createRtcConnection(this.#remoteVideo, data.socket)
         const answer = await rtcConn.createAnswer(data.offer)
-        this.#socket.emit("make-answer", {answer, to: data.socket});
+        this.#socket.emit("answer-made", {answer, to: data.socket});
     }
 }
 
diff --git a/python/websocket.py b/python/websocket.py
index 253e6d8..01de1aa 100644
--- a/python/websocket.py
+++ b/python/websocket.py
@@ -22,17 +22,17 @@ def __init__(self, conn, sockets: [], socket_to_user_map: {}, conn_manager: RtcC
         self.socket_to_user = socket_to_user_map
 
     def add_event_listeners(self):
-        self.event_listeners["ice-candidate"] = self.handle_ice_candidate
-        self.event_listeners["make-answer"] = self.handle_call_accepted
-        self.event_listeners["call-user"] = self.handle_call_user
-        self.event_listeners["reject-call"] = self.handle_reject_call
+        self.event_listeners["ice-candidate-received"] = self.handle_ice_candidate
+        self.event_listeners["answer-made"] = self.handle_call_accepted
+        self.event_listeners["call-made"] = self.handle_call_user
+        self.event_listeners["call-rejected"] = self.handle_reject_call
         self.event_listeners["join"] = self.handle_user_connected
 
     async def handle_ice_candidate(self, payload):
         logger.info(f"ice-candidate: {self.socket_id}")
         target_socket = self.get_socket_conn(payload["to"])
         await target_socket.send_json({
-            "event": "ice-candidate-post",
+            "event": "ice-candidate-received",
             "data": {
                 "socket": self.socket_id,
                 "candidate": payload["candidate"]
@@ -120,7 +120,7 @@ async def handle_user_disconnected(self):
 
         for s in self.active_sockets:
             await s.send_json({
-                "event": "remove-user",
+                "event": "user-removed",
                 "data": {
                     "socketId": self.socket_id
                 }