diff --git a/app/events.py b/app/events.py
index 2273e1f2..568d7fd6 100644
--- a/app/events.py
+++ b/app/events.py
@@ -69,7 +69,7 @@ def user_data_stream(app, user_id, session_id, foreign=False):
         # Gather current values from database.
         user = User.query.get(user_id)
         user_dict = user.to_dict()
-        # Send initial values to the user.
+        # Send initial values to the client.
         socketio.emit(init_event, json.dumps(user_dict), room=session_id)
         while session_id in connected_sessions:
             # Get new values from the database
@@ -78,7 +78,7 @@ def user_data_stream(app, user_id, session_id, foreign=False):
             # Compute JSON patches.
             user_patch = jsonpatch.JsonPatch.from_diff(user_dict,
                                                        new_user_dict)
-            # In case there are patches, send them to the user.
+            # In case there are patches, send them to the client.
             if user_patch:
                 socketio.emit(update_event, user_patch.to_string(),
                               room=session_id)