diff --git a/app/routers/nodes.py b/app/routers/nodes.py
index e22afc0..b78d734 100644
--- a/app/routers/nodes.py
+++ b/app/routers/nodes.py
@@ -16,15 +16,15 @@ nodes_bp = Blueprint('nodes', __name__)
 pending_requests = {}
 
 
-async def register_client(websocket, client_id, nickname):
+async def register_client(websocket, client_id, client_nickname):
     """Registers a new client connection."""
     current_app.active_clients[client_id] = ActiveClient()
     current_app.active_clients[client_id].websocket = websocket
-    current_app.active_clients[client_id].nickname = nickname
+    current_app.active_clients[client_id].nickname = client_nickname
     print(f"Client {client_id} connected.")
 
     # Create a JWT for the client
-    current_app.active_clients[client_id].access_token = create_access_token(identity={"id": client_id, "username": nickname, "type": "node"})
+    current_app.active_clients[client_id].access_token = create_access_token(identity={"id": client_id, "username": client_nickname, "type": "node"})
 
     # Start a task to listen for messages from this client
     asyncio.create_task(listen_to_client(websocket, client_id))
diff --git a/app/server.py b/app/server.py
index f0924cc..14c1b4e 100644
--- a/app/server.py
+++ b/app/server.py
@@ -42,7 +42,7 @@ async def websocket_server_handler(websocket):
         if handshake_data.get("type") == "handshake" and "id" in handshake_data:
             client_id = handshake_data["id"]
             client_nickname = handshake_data.get("nickname")
-            await register_client(websocket, client_id, nickname)
+            await register_client(websocket, client_id, client_nickname)
             if not app.active_clients[client_id].access_token:
                 abort(500, "Error retrieving access token")
             await websocket.send(json.dumps({"type": "handshake_ack", "status": "success", "access_token": app.active_clients[client_id].access_token}))