diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
index 902d8aa353a..7c5995af510 100755
--- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
+++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
@@ -634,13 +634,13 @@ public class RacingEventServiceImpl implements RacingEventService, RegattaListen
     }
 
     @Override
-    public Regatta getOrCreateRegatta(String baseEventName, String boatClassName, Serializable id) {
+    public Regatta getOrCreateRegatta(String baseRegattaName, String boatClassName, Serializable id) {
         RaceLogStore raceLogStore = MongoRaceLogStoreFactory.INSTANCE.getMongoRaceLogStore(
                 mongoObjectFactory, 
                 domainObjectFactory);
-        Regatta regatta = new RegattaImpl(raceLogStore, baseEventName, getBaseDomainFactory().getOrCreateBoatClass(
+        Regatta regatta = new RegattaImpl(raceLogStore, baseRegattaName, getBaseDomainFactory().getOrCreateBoatClass(
                 boatClassName), this, com.sap.sailing.domain.base.DomainFactory.INSTANCE.createScoringScheme(ScoringSchemeType.LOW_POINT),
-                RegattaImpl.getFullName(baseEventName, boatClassName), null);
+                RegattaImpl.getFullName(baseRegattaName, boatClassName), null);
         //TODO: shall a default regatta have a default course area?
         Regatta result = regattasByName.get(regatta.getName());
         if (result == null) {
@@ -652,13 +652,13 @@ public class RacingEventServiceImpl implements RacingEventService, RegattaListen
     }
 
     @Override
-    public Regatta createRegatta(String baseEventName, String boatClassName,
+    public Regatta createRegatta(String baseRegattaName, String boatClassName,
             Serializable id, Iterable<? extends Series> series, boolean persistent, ScoringScheme scoringScheme, Serializable defaultCourseAreaId) {
         RaceLogStore raceLogStore = MongoRaceLogStoreFactory.INSTANCE.getMongoRaceLogStore(
                 mongoObjectFactory, 
                 domainObjectFactory);
         CourseArea courseArea = getCourseArea(defaultCourseAreaId);
-        Regatta regatta = new RegattaImpl(raceLogStore, baseEventName,
+        Regatta regatta = new RegattaImpl(raceLogStore, baseRegattaName,
                 getBaseDomainFactory().getOrCreateBoatClass(boatClassName), series, persistent, scoringScheme, id, courseArea);
         logger.info("Created regatta " + regatta.getName() + " (" + hashCode() + ") on "+this);
         cacheAndReplicateSpecificRegattaWithoutRaceColumns(regatta);
diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AbstractAddRegattaOperation.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AbstractAddRegattaOperation.java
index 867565b7b0a..61024b8e4ef 100755
--- a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AbstractAddRegattaOperation.java
+++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AbstractAddRegattaOperation.java
@@ -6,19 +6,19 @@ import com.sap.sailing.domain.base.Regatta;
 
 public abstract class AbstractAddRegattaOperation extends AbstractRacingEventServiceOperation<Regatta> {
     private static final long serialVersionUID = 4596134166642095364L;
-    private final String baseEventName;
+    private final String baseRegattaName;
     private final String boatClassName;
     private final Serializable id;
     
     public AbstractAddRegattaOperation(String regattaName, String boatClassName, Serializable id) {
         super();
-        this.baseEventName = regattaName;
+        this.baseRegattaName = regattaName;
         this.boatClassName = boatClassName;
         this.id = id;
     }
 
-    protected String getBaseEventName() {
-        return baseEventName;
+    protected String getBaseRegattaName() {
+        return baseRegattaName;
     }
 
     protected String getBoatClassName() {
diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddDefaultRegatta.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddDefaultRegatta.java
index a0b6b24b8c9..68c16dc1ce7 100755
--- a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddDefaultRegatta.java
+++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddDefaultRegatta.java
@@ -27,7 +27,7 @@ public class AddDefaultRegatta extends AbstractAddRegattaOperation {
 
     @Override
     public Regatta internalApplyTo(RacingEventService toState) {
-        return toState.getOrCreateRegatta(getBaseEventName(), getBoatClassName(), getId());
+        return toState.getOrCreateRegatta(getBaseRegattaName(), getBoatClassName(), getId());
     }
 
 }
diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddSpecificRegatta.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddSpecificRegatta.java
index dff3cb5a52e..64fce2c8dad 100755
--- a/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddSpecificRegatta.java
+++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddSpecificRegatta.java
@@ -38,7 +38,7 @@ public class AddSpecificRegatta extends AbstractAddRegattaOperation {
 
     @Override
     public Regatta internalApplyTo(RacingEventService toState) throws Exception {
-        return toState.createRegatta(getBaseEventName(), getBoatClassName(), getId(), createSeries(toState),
+        return toState.createRegatta(getBaseRegattaName(), getBoatClassName(), getId(), createSeries(toState),
                 persistent, scoringScheme, defaultCourseAreaId);
     }