diff --git a/src/main/java/de/pnreichmuth/timekeep_backend/entities/Team.java b/src/main/java/de/pnreichmuth/timekeep_backend/entities/Team.java
index ad63ede..e304a64 100644
--- a/src/main/java/de/pnreichmuth/timekeep_backend/entities/Team.java
+++ b/src/main/java/de/pnreichmuth/timekeep_backend/entities/Team.java
@@ -2,6 +2,7 @@ package de.pnreichmuth.timekeep_backend.entities;
 
 import jakarta.persistence.*;
 import lombok.Getter;
+import lombok.NonNull;
 import lombok.Setter;
 
 
@@ -22,7 +23,7 @@ public class Team  {
 
     private boolean firstSemesterTeam;
 
-    @OneToMany(cascade = CascadeType.ALL)
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "racerID")
     private Map<String, Racer> members;
 
     @OneToMany(cascade = CascadeType.ALL)
@@ -54,16 +55,16 @@ public class Team  {
      * @param newMember the Racer object to be added to the team
      */
     public void addMember(Racer newMember){
-        this.members.put(newMember.getName(), newMember);
+        this.members.put(String.format("%s, %s", newMember.getLastName(), newMember.getFirstName()), newMember );
         this.checkFirstSemesterTeam();
     }
 
     /**
      * Removes a member from the team by name
-     * @param name the name of the member to be removed
+     * @param id the UUID of the member to be removed
      */
-    public void removeMember(String name){
-        this.members.remove(name);
+    public void removeMember(UUID id){
+        this.members.remove(id);
         this.checkFirstSemesterTeam();
     }
 }