diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/FreestyleMarkTemplateMapping.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/FreestyleMarkConfiguration.java
similarity index 74%
rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/FreestyleMarkTemplateMapping.java
rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/FreestyleMarkConfiguration.java
index 6e8a40c638f..a1041528e49 100755
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/FreestyleMarkTemplateMapping.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/FreestyleMarkConfiguration.java
@@ -1,15 +1,15 @@
 package com.sap.sailing.domain.coursetemplate;
 
 /**
- * Describes a mapping with an optional {@link #getMarkTemplate() mark template} that delivers
+ * Describes a configuration with an optional {@link #getMarkTemplate() mark template} that delivers
  * explicit {@link CommonMarkPropertiesWithOptionalPositioning}. The object can be marked for
  * adding to the inventory when applied. The {@link #getFreestyleProperties() freestyle properties}
- * take precedence 
+ * take precedence.
  * 
  * @author Axel Uhl (D043530)
  *
  */
-public interface FreestyleMarkTemplateMapping extends MarkConfiguration {
+public interface FreestyleMarkConfiguration extends MarkConfiguration {
     @Override
     MarkTemplate getMarkTemplate();
 
diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesMarkTemplateMapping.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesConfiguration.java
similarity index 90%
rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesMarkTemplateMapping.java
rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesConfiguration.java
index 896b17dbfae..5c6fefdfffa 100755
--- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesMarkTemplateMapping.java
+++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/coursetemplate/MarkPropertiesConfiguration.java
@@ -9,7 +9,7 @@ package com.sap.sailing.domain.coursetemplate;
  * @author Axel Uhl (D043530)
  *
  */
-public interface MarkPropertiesMarkTemplateMapping extends MarkConfiguration {
+public interface MarkPropertiesConfiguration extends MarkConfiguration {
     @Override
     MarkTemplate getMarkTemplate();