--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightCalculation.java	Mon Feb 16 10:12:12 2015 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightCalculation.java	Mon Feb 16 11:08:33 2015 +0100
@@ -14,8 +14,8 @@
 import org.apache.log4j.Logger;
 
 import org.dive4elements.artifacts.Artifact;
-import org.dive4elements.river.model.BedHeightSingle;
-import org.dive4elements.river.model.BedHeightSingleValue;
+import org.dive4elements.river.model.BedHeight;
+import org.dive4elements.river.model.BedHeightValue;
 import org.dive4elements.river.artifacts.access.BedHeightAccess;
 import org.dive4elements.river.artifacts.model.Calculation;
 import org.dive4elements.river.artifacts.model.CalculationResult;
@@ -30,7 +30,7 @@
     public CalculationResult calculate(BedHeightAccess access) {
         log.info("MiddleBedHeightCalculation.calculate");
 
-        int[] singleIds = access.getBedHeightSingleIDs();
+        int[] singleIds = access.getBedHeightIDs();
 
 
         if (log.isDebugEnabled()) {
@@ -42,20 +42,20 @@
             }
         }
 
-        List<BedHeightSingle> singles = getSingles(access, singleIds);
+        List<BedHeight> singles = getSingles(access, singleIds);
 
         return buildCalculationResult(access, singles);
     }
 
 
-    protected List<BedHeightSingle> getSingles(
+    protected List<BedHeight> getSingles(
         BedHeightAccess access,
         int[] ids
     ) {
-        List<BedHeightSingle> singles = new ArrayList<BedHeightSingle>();
+        List<BedHeight> singles = new ArrayList<BedHeight>();
 
         for (int id: ids) {
-            BedHeightSingle s = BedHeightSingle.getBedHeightSingleById(id);
+            BedHeight s = BedHeight.getBedHeightById(id);
 
             if (s != null) {
                 singles.add(s);
@@ -72,7 +72,7 @@
 
     protected CalculationResult buildCalculationResult(
         BedHeightAccess       access,
-        List<BedHeightSingle> singles
+        List<BedHeight> singles
     ) {
         log.info("MiddleBedHeightCalculation.buildCalculationResult");
 
@@ -81,7 +81,7 @@
 
         List<MiddleBedHeightData> data = new ArrayList<MiddleBedHeightData>();
 
-        for (BedHeightSingle single: singles) {
+        for (BedHeight single: singles) {
             MiddleBedHeightData d = prepareSingleData(single, kmLo, kmHi);
 
             if (d != null) {
@@ -97,14 +97,14 @@
 
 
     protected MiddleBedHeightData prepareSingleData(
-        BedHeightSingle single,
+        BedHeight single,
         double kmLo,
         double kmHi
     ) {
         log.debug("Prepare data for single: " + single.getDescription());
 
-        List<BedHeightSingleValue> values =
-            BedHeightSingleValue.getBedHeightSingleValues(single, kmLo, kmHi);
+        List<BedHeightValue> values =
+            BedHeightValue.getBedHeightValues(single, kmLo, kmHi);
 
         int year = single.getYear() != null ? single.getYear() : 0;
 
@@ -130,7 +130,7 @@
             locationSystem,
             single.getSoundingWidth());
 
-        for (BedHeightSingleValue value: values) {
+        for (BedHeightValue value: values) {
             if (value.getHeight() != null) {
                 double uncert = value.getUncertainty() != null ?
                     value.getUncertainty().doubleValue() : Double.NaN;