--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadCalculation.java	Thu Jun 20 10:09:41 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadCalculation.java	Thu Jun 20 11:42:47 2013 +0200
@@ -158,9 +158,9 @@
                     resLoad.setCoarse(km, c + f.getCoarse(), f.getCoarseRange());
                     cSum++;
                 }
-                if (f.getFine_middle() > 0d) {
-                    double fm = resLoad.getFraction(km).getFine_middle();
-                    resLoad.setFineMiddle(km, fm + f.getFine_middle(), f.getFineMiddleRange());
+                if (f.getFineMiddle() > 0d) {
+                    double fm = resLoad.getFraction(km).getFineMiddle();
+                    resLoad.setFineMiddle(km, fm + f.getFineMiddle(), f.getFineMiddleRange());
                     fmSum++;
                 }
                 if (f.getSand() > 0d) {
@@ -168,29 +168,29 @@
                     resLoad.setSand(km, s + f.getSand(), f.getSandRange());
                     sSum++;
                 }
-                if (f.getSusp_sand() > 0d) {
-                    double s = resLoad.getFraction(km).getSusp_sand();
-                    resLoad.setSuspSand(km, s + f.getSusp_sand(), f.getSuspSandRange());
+                if (f.getSuspSand() > 0d) {
+                    double s = resLoad.getFraction(km).getSuspSand();
+                    resLoad.setSuspSand(km, s + f.getSuspSand(), f.getSuspSandRange());
                     ssSum++;
                 }
-                if (f.getSusp_sand_bed() > 0d) {
-                    double s = resLoad.getFraction(km).getSusp_sand_bed();
-                    resLoad.setSuspSandBed(km, s + f.getSusp_sand_bed(), f.getSuspSandBedRange());
+                if (f.getSuspSandBed() > 0d) {
+                    double s = resLoad.getFraction(km).getSuspSandBed();
+                    resLoad.setSuspSandBed(km, s + f.getSuspSandBed(), f.getSuspSandBedRange());
                     ssbSum++;
                 }
-                if (f.getSusp_sediment() > 0d) {
-                    double s = resLoad.getFraction(km).getSusp_sediment();
-                    resLoad.setSuspSediment(km, s + f.getSusp_sediment(), f.getSuspSedimentRange());
+                if (f.getSuspSediment() > 0d) {
+                    double s = resLoad.getFraction(km).getSuspSediment();
+                    resLoad.setSuspSediment(km, s + f.getSuspSediment(), f.getSuspSedimentRange());
                     sseSum++;
                 }
             }
             SedimentLoadFraction fr = resLoad.getFraction(km);
             resLoad.setCoarse(km, fr.getCoarse()/cSum, fr.getCoarseRange());
-            resLoad.setFineMiddle(km, fr.getFine_middle()/fmSum, fr.getFineMiddleRange());
+            resLoad.setFineMiddle(km, fr.getFineMiddle()/fmSum, fr.getFineMiddleRange());
             resLoad.setSand(km, fr.getSand()/sSum, fr.getSandRange());
-            resLoad.setSuspSand(km, fr.getSusp_sand()/ssSum, fr.getSuspSandRange());
-            resLoad.setSuspSandBed(km, fr.getSusp_sand_bed()/ssbSum, fr.getSuspSandBedRange());
-            resLoad.setSuspSediment(km, fr.getSusp_sediment()/sseSum, fr.getSuspSedimentRange());
+            resLoad.setSuspSand(km, fr.getSuspSand()/ssSum, fr.getSuspSandRange());
+            resLoad.setSuspSandBed(km, fr.getSuspSandBed()/ssbSum, fr.getSuspSandBedRange());
+            resLoad.setSuspSediment(km, fr.getSuspSediment()/sseSum, fr.getSuspSedimentRange());
         }
         resLoad.setDescription("");
         resLoad.setEpoch(true);
@@ -308,19 +308,19 @@
                 addProblem(km, "missing data.sand");
                 continue;
             }
-            if (fraction.getSusp_sand() <= 0d && load.hasSuspSand()) {
+            if (fraction.getSuspSand() <= 0d && load.hasSuspSand()) {
                 addProblem(km, "missing.data.susp_sand");
                 continue;
             }
-            if (fraction.getSusp_sediment() <= 0d && load.hasSuspSediment()) {
+            if (fraction.getSuspSediment() <= 0d && load.hasSuspSediment()) {
                 addProblem(km, "missing.data.susp_sediment");
                 continue;
             }
             total += fraction.getCoarse() +
-                fraction.getFine_middle() +
+                fraction.getFineMiddle() +
                 fraction.getSand() +
-                fraction.getSusp_sand() +
-                fraction.getSusp_sediment();
+                fraction.getSuspSand() +
+                fraction.getSuspSediment();
             load.setTotal(km, total, fraction.getTotalRange());
         }
         return load;
@@ -333,11 +333,11 @@
             double dens = density.getDensity(km, year);
             SedimentLoadFraction fraction = load.getFraction(km);
             double coarse = fraction.getCoarse();
-            double fineMiddle = fraction.getFine_middle();
+            double fineMiddle = fraction.getFineMiddle();
             double sand = fraction.getSand();
-            double suspSand = fraction.getSusp_sand();
-            double bedSand = fraction.getSusp_sand_bed();
-            double sediment = fraction.getSusp_sediment();
+            double suspSand = fraction.getSuspSand();
+            double bedSand = fraction.getSuspSandBed();
+            double sediment = fraction.getSuspSediment();
             double total = fraction.getTotal();
             load.setCoarse(km, (coarse * dens), fraction.getCoarseRange());
             load.setFineMiddle(km, (fineMiddle * dens), fraction.getFineMiddleRange());