--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java	Mon Feb 16 09:21:49 2015 +0100
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java	Mon Feb 16 09:35:06 2015 +0100
@@ -31,7 +31,7 @@
 
 import org.apache.log4j.Logger;
 
-import org.dive4elements.river.importer.ImportBedHeight;
+import org.dive4elements.river.importer.ImportBedHeightSingle;
 import org.dive4elements.river.importer.ImportBedHeightType;
 import org.dive4elements.river.importer.ImportElevationModel;
 import org.dive4elements.river.importer.ImportLocationSystem;
@@ -89,26 +89,26 @@
     protected static NumberFormat nf = NumberFormat.getInstance(DEFAULT_LOCALE);
 
 
-    protected List<ImportBedHeight> bedHeights;
+    protected List<ImportBedHeightSingle> bedHeights;
 
 
-    protected abstract ImportBedHeight newImportBedHeight(String description);
+    protected abstract ImportBedHeightSingle newImportBedHeight(String description);
 
     /** Handle a line of file that contains data (in contrast to comments, meta). */
     protected abstract void handleDataLine(
-        ImportBedHeight importBedHeight,
+        ImportBedHeightSingle importBedHeight,
         String          line
     );
 
     protected TreeSet<Double> kmExists;
 
     public BedHeightParser() {
-        bedHeights = new ArrayList<ImportBedHeight>();
+        bedHeights = new ArrayList<ImportBedHeightSingle>();
         kmExists = new TreeSet<Double>(EpsilonComparator.CMP);
     }
 
 
-    public List<ImportBedHeight> getBedHeights() {
+    public List<ImportBedHeightSingle> getBedHeights() {
         return bedHeights;
     }
 
@@ -116,7 +116,7 @@
     public void parse(File file) throws IOException {
         log.info("Parsing bed height single file '" + file + "'");
 
-        ImportBedHeight obj = newImportBedHeight(file.getName().replaceAll("\\.csv", ""));
+        ImportBedHeightSingle obj = newImportBedHeight(file.getName().replaceAll("\\.csv", ""));
 
         kmExists.clear();
 
@@ -164,7 +164,7 @@
     }
 
 
-    protected void handleMetaLine(ImportBedHeight obj, String line) {
+    protected void handleMetaLine(ImportBedHeightSingle obj, String line) {
         String meta = stripMetaLine(line);
 
         if (handleMetaYear(obj, meta)) {
@@ -203,7 +203,7 @@
     }
 
 
-    protected boolean handleMetaYear(ImportBedHeight obj, String line) {
+    protected boolean handleMetaYear(ImportBedHeightSingle obj, String line) {
         Matcher m = META_YEAR.matcher(line);
 
         if (m.matches()) {
@@ -221,7 +221,7 @@
     }
 
 
-    protected boolean handleMetaTimeInterval(ImportBedHeight obj, String line) {
+    protected boolean handleMetaTimeInterval(ImportBedHeightSingle obj, String line) {
         Matcher m = META_TIMEINTERVAL.matcher(line);
 
         if (m.matches()) {
@@ -250,7 +250,7 @@
     }
 
 
-    protected boolean handleMetaSoundingWidth(ImportBedHeight obj, String line) {
+    protected boolean handleMetaSoundingWidth(ImportBedHeightSingle obj, String line) {
         Matcher m = META_SOUNDING_WIDTH.matcher(line);
 
         if (m.matches()) {
@@ -272,7 +272,7 @@
     }
 
 
-    protected boolean handleMetaComment(ImportBedHeight obj, String line) {
+    protected boolean handleMetaComment(ImportBedHeightSingle obj, String line) {
         Matcher m = META_COMMENTS.matcher(line);
 
         if (m.matches()) {
@@ -288,7 +288,7 @@
 
 
     protected boolean handleMetaEvaluationBy(
-        ImportBedHeight obj,
+        ImportBedHeightSingle obj,
         String                line
     ) {
         Matcher m = META_EVALUATION_BY.matcher(line);
@@ -306,7 +306,7 @@
     }
 
 
-    protected boolean handleMetaRange(ImportBedHeight obj, String line) {
+    protected boolean handleMetaRange(ImportBedHeightSingle obj, String line) {
         Matcher m = META_RANGE.matcher(line);
 
         if (m.matches() && m.groupCount() >= 2) {
@@ -330,7 +330,7 @@
     }
 
 
-    protected boolean handleMetaType(ImportBedHeight obj, String line) {
+    protected boolean handleMetaType(ImportBedHeightSingle obj, String line) {
         Matcher m = META_TYPE.matcher(line);
 
         if (m.matches()) {
@@ -353,7 +353,7 @@
 
 
     protected boolean handleMetaLocationSystem(
-        ImportBedHeight obj,
+        ImportBedHeightSingle obj,
         String          line
     ) {
         Matcher m = META_LOCATION_SYSTEM.matcher(line);
@@ -371,7 +371,7 @@
 
 
     protected boolean handleMetaCurElevationModel(
-        ImportBedHeight obj,
+        ImportBedHeightSingle obj,
         String          line
     ) {
         Matcher m = META_CUR_ELEVATION_SYSTEM.matcher(line);
@@ -394,7 +394,7 @@
 
 
     protected boolean handleMetaOldElevationModel(
-        ImportBedHeight obj,
+        ImportBedHeightSingle obj,
         String          line
     ) {
         Matcher m = META_OLD_ELEVATION_SYSTEM.matcher(line);