--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java	Mon Feb 16 10:12:12 2015 +0100
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java	Mon Feb 16 11:08:33 2015 +0100
@@ -31,8 +31,8 @@
 
 import org.apache.log4j.Logger;
 
-import org.dive4elements.river.importer.ImportBedHeightSingle;
-import org.dive4elements.river.importer.ImportBedHeightSingleValue;
+import org.dive4elements.river.importer.ImportBedHeight;
+import org.dive4elements.river.importer.ImportBedHeightValue;
 import org.dive4elements.river.importer.ImportBedHeightType;
 import org.dive4elements.river.importer.ImportElevationModel;
 import org.dive4elements.river.importer.ImportLocationSystem;
@@ -90,23 +90,23 @@
     protected static NumberFormat nf = NumberFormat.getInstance(DEFAULT_LOCALE);
 
 
-    protected List<ImportBedHeightSingle> bedHeights;
+    protected List<ImportBedHeight> bedHeights;
 
 
-    protected ImportBedHeightSingle newImportBedHeight(String description) {
-        return new ImportBedHeightSingle(description);
+    protected ImportBedHeight newImportBedHeight(String description) {
+        return new ImportBedHeight(description);
     }
 
 
     protected TreeSet<Double> kmExists;
 
     public BedHeightParser() {
-        bedHeights = new ArrayList<ImportBedHeightSingle>();
+        bedHeights = new ArrayList<ImportBedHeight>();
         kmExists = new TreeSet<Double>(EpsilonComparator.CMP);
     }
 
 
-    public List<ImportBedHeightSingle> getBedHeights() {
+    public List<ImportBedHeight> getBedHeights() {
         return bedHeights;
     }
 
@@ -114,7 +114,7 @@
     public void parse(File file) throws IOException {
         log.info("Parsing bed height single file '" + file + "'");
 
-        ImportBedHeightSingle obj = newImportBedHeight(file.getName().replaceAll("\\.csv", ""));
+        ImportBedHeight obj = newImportBedHeight(file.getName().replaceAll("\\.csv", ""));
 
         kmExists.clear();
 
@@ -162,7 +162,7 @@
     }
 
 
-    protected void handleMetaLine(ImportBedHeightSingle obj, String line) {
+    protected void handleMetaLine(ImportBedHeight obj, String line) {
         String meta = stripMetaLine(line);
 
         if (handleMetaYear(obj, meta)) {
@@ -201,7 +201,7 @@
     }
 
 
-    protected boolean handleMetaYear(ImportBedHeightSingle obj, String line) {
+    protected boolean handleMetaYear(ImportBedHeight obj, String line) {
         Matcher m = META_YEAR.matcher(line);
 
         if (m.matches()) {
@@ -219,7 +219,7 @@
     }
 
 
-    protected boolean handleMetaTimeInterval(ImportBedHeightSingle obj, String line) {
+    protected boolean handleMetaTimeInterval(ImportBedHeight obj, String line) {
         Matcher m = META_TIMEINTERVAL.matcher(line);
 
         if (m.matches()) {
@@ -248,7 +248,7 @@
     }
 
 
-    protected boolean handleMetaSoundingWidth(ImportBedHeightSingle obj, String line) {
+    protected boolean handleMetaSoundingWidth(ImportBedHeight obj, String line) {
         Matcher m = META_SOUNDING_WIDTH.matcher(line);
 
         if (m.matches()) {
@@ -270,7 +270,7 @@
     }
 
 
-    protected boolean handleMetaComment(ImportBedHeightSingle obj, String line) {
+    protected boolean handleMetaComment(ImportBedHeight obj, String line) {
         Matcher m = META_COMMENTS.matcher(line);
 
         if (m.matches()) {
@@ -286,7 +286,7 @@
 
 
     protected boolean handleMetaEvaluationBy(
-        ImportBedHeightSingle obj,
+        ImportBedHeight obj,
         String                line
     ) {
         Matcher m = META_EVALUATION_BY.matcher(line);
@@ -304,7 +304,7 @@
     }
 
 
-    protected boolean handleMetaRange(ImportBedHeightSingle obj, String line) {
+    protected boolean handleMetaRange(ImportBedHeight obj, String line) {
         Matcher m = META_RANGE.matcher(line);
 
         if (m.matches() && m.groupCount() >= 2) {
@@ -328,7 +328,7 @@
     }
 
 
-    protected boolean handleMetaType(ImportBedHeightSingle obj, String line) {
+    protected boolean handleMetaType(ImportBedHeight obj, String line) {
         Matcher m = META_TYPE.matcher(line);
 
         if (m.matches()) {
@@ -351,7 +351,7 @@
 
 
     protected boolean handleMetaLocationSystem(
-        ImportBedHeightSingle obj,
+        ImportBedHeight obj,
         String          line
     ) {
         Matcher m = META_LOCATION_SYSTEM.matcher(line);
@@ -369,7 +369,7 @@
 
 
     protected boolean handleMetaCurElevationModel(
-        ImportBedHeightSingle obj,
+        ImportBedHeight obj,
         String          line
     ) {
         Matcher m = META_CUR_ELEVATION_SYSTEM.matcher(line);
@@ -392,7 +392,7 @@
 
 
     protected boolean handleMetaOldElevationModel(
-        ImportBedHeightSingle obj,
+        ImportBedHeight obj,
         String          line
     ) {
         Matcher m = META_OLD_ELEVATION_SYSTEM.matcher(line);
@@ -413,7 +413,7 @@
         return false;
     }
 
-    protected void handleDataLine(ImportBedHeightSingle obj, String line) {
+    protected void handleDataLine(ImportBedHeight obj, String line) {
         String[] values = line.split(SEPERATOR_CHAR, -1);
 
         if (values == null) {
@@ -491,8 +491,8 @@
             }
         }
 
-        ImportBedHeightSingleValue value = new ImportBedHeightSingleValue(
-            (ImportBedHeightSingle) obj,
+        ImportBedHeightValue value = new ImportBedHeightValue(
+            (ImportBedHeight) obj,
             km,
             height,
             uncertainty,