diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasManeuverContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasManeuverContext.java
index ee6d4b05031..0fc3f4459ca 100644
--- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasManeuverContext.java
+++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasManeuverContext.java
@@ -1,8 +1,6 @@
 package com.sap.sailing.datamining.data;
 
 import com.sap.sailing.domain.common.Distance;
-import com.sap.sailing.domain.common.ManeuverType;
-import com.sap.sailing.domain.common.NauticalSide;
 import com.sap.sailing.domain.common.Tack;
 import com.sap.sse.common.TimePoint;
 import com.sap.sse.datamining.annotations.Connector;
@@ -13,12 +11,6 @@ public interface HasManeuverContext extends HasWindOnTrackedLeg, HasManeuver, Ha
     @Connector(scanForStatistics = false)
     HasTrackedLegOfCompetitorContext getTrackedLegOfCompetitorContext();
 
-    @Dimension(messageKey = "ManeuverType", ordinal = 12)
-    ManeuverType getManeuverType();
-
-    @Dimension(messageKey = "ToSide", ordinal = 16)
-    NauticalSide getToSide();
-
     @Dimension(messageKey = "TackBeforeManeuver")
     Tack getTackBeforeManeuver();
 
diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/ManeuverWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/ManeuverWithContext.java
index 8183cb8c7f3..c037496623b 100644
--- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/ManeuverWithContext.java
+++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/ManeuverWithContext.java
@@ -4,8 +4,6 @@ import com.sap.sailing.datamining.data.HasManeuverContext;
 import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext;
 import com.sap.sailing.domain.base.Competitor;
 import com.sap.sailing.domain.common.Distance;
-import com.sap.sailing.domain.common.ManeuverType;
-import com.sap.sailing.domain.common.NauticalSide;
 import com.sap.sailing.domain.common.SpeedWithBearing;
 import com.sap.sailing.domain.common.Tack;
 import com.sap.sailing.domain.common.Wind;
@@ -88,16 +86,6 @@ public class ManeuverWithContext implements HasManeuverContext {
         return maneuver;
     }
 
-    @Override
-    public ManeuverType getManeuverType() {
-        return getManeuver().getType();
-    }
-
-    @Override
-    public NauticalSide getToSide() {
-        return getDirectionChangeInDegreesForAnalysis() >= 0 ? NauticalSide.STARBOARD : NauticalSide.PORT;
-    }
-
     @Override
     public Double getAbsoluteDirectionChangeInDegrees() {
         return Math.abs(getDirectionChangeInDegreesForAnalysis());
diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/MarkPassingWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/MarkPassingWithContext.java
index 130d37a57d3..ad8aecd22f4 100644
--- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/MarkPassingWithContext.java
+++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/MarkPassingWithContext.java
@@ -42,7 +42,7 @@ public class MarkPassingWithContext implements HasMarkPassingContext {
     
     @Override
     public NauticalSide getPassingSide() {
-        return getManeuver().getSide();
+        return getManeuver().getToSide();
     }
 
     @Override
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractLeaderboardWithCache.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractLeaderboardWithCache.java
index c9ec2114367..36d5fc3012e 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractLeaderboardWithCache.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractLeaderboardWithCache.java
@@ -958,7 +958,7 @@ public abstract class AbstractLeaderboardWithCache implements Leaderboard {
                             // analyze all mark passings, not only those after this leg's start, to catch the mark passing
                             // maneuver starting this leg, even if its time point is slightly before the mark passing starting this leg
                             if (maneuver.getMarkPassing().getWaypoint() == trackedLeg.getLeg().getFrom()) {
-                                result.sideToWhichMarkAtLegStartWasRounded = maneuver.getSide();
+                                result.sideToWhichMarkAtLegStartWasRounded = maneuver.getToSide();
                             }
                         }
                     }
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Maneuver.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Maneuver.java
index b30061f143e..481d95885f4 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Maneuver.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Maneuver.java
@@ -43,6 +43,7 @@ public interface Maneuver extends GPSFix {
      * 
      * @return The type of maneuver
      */
+    @Dimension(messageKey = "ManeuverType", ordinal = 12)
     ManeuverType getType();
 
     /**
@@ -51,7 +52,7 @@ public interface Maneuver extends GPSFix {
      * 
      * @return The new tack after the performed maneuver
      */
-    @Dimension(messageKey = "Tack", ordinal = 13)
+    @Dimension(messageKey = "Tack", ordinal = 14)
     Tack getNewTack();
 
     /**
@@ -151,11 +152,13 @@ public interface Maneuver extends GPSFix {
     /**
      * Determines whether the maneuver is mark passing maneuver.
      */
+    @Dimension(messageKey = "MarkPassing", ordinal = 13)
     boolean isMarkPassing();
 
     /**
      * Gets the direction of the maneuver. It corresponds to the direction of mark passing side.
      */
-    NauticalSide getSide();
+    @Dimension(messageKey = "ToSide", ordinal = 16)
+    NauticalSide getToSide();
 
 }
diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverImpl.java
index 653285bc44a..534ca3ed32b 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/ManeuverImpl.java
@@ -121,7 +121,7 @@ public abstract class ManeuverImpl extends AbstractGPSFixImpl implements Maneuve
         return markPassing != null;
     }
 
-    public NauticalSide getSide() {
+    public NauticalSide getToSide() {
         return getMainCurveBoundaries().getDirectionChangeInDegrees() < 0 ? NauticalSide.PORT : NauticalSide.STARBOARD;
     }