--- a/artifacts/src/main/java/org/dive4elements/river/utils/RiverMapfileGenerator.java	Sun Apr 28 15:04:44 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/utils/RiverMapfileGenerator.java	Sun Apr 28 15:09:31 2013 +0200
@@ -119,7 +119,7 @@
         layerInfo.setExtent(extend);
         layerInfo.setType("line");
         // FIXME: Use templates for that
-        if (FLYSUtils.isUsingOracle()) {
+        if (RiverUtils.isUsingOracle()) {
             layerInfo.setData("geom FROM river_axes USING SRID " + srid);
         } else {
             layerInfo.setData("geom FROM river_axes");
@@ -144,26 +144,26 @@
 
     @Override
     protected String getVelocityLogfile() {
-        return FLYSUtils.getXPathString(XPATH_RIVERMAP_VELOCITY_LOGFILE);
+        return RiverUtils.getXPathString(XPATH_RIVERMAP_VELOCITY_LOGFILE);
     }
 
     @Override
     protected String getMapserverTemplatePath() {
-        return FLYSUtils.getXPathString(XPATH_RIVERMAP_MAPSERVER_TEMPLATE_PATH);
+        return RiverUtils.getXPathString(XPATH_RIVERMAP_MAPSERVER_TEMPLATE_PATH);
     }
 
     @Override
     public String getMapserverUrl() {
-        return FLYSUtils.getXPathString(XPATH_RIVERMAP_MAPSERVER_URL);
+        return RiverUtils.getXPathString(XPATH_RIVERMAP_MAPSERVER_URL);
     }
 
     @Override
     protected String getMapfilePath() {
-        return FLYSUtils.getXPathString(XPATH_RIVERMAP_MAPFILE_PATH);
+        return RiverUtils.getXPathString(XPATH_RIVERMAP_MAPFILE_PATH);
     }
 
     @Override
     protected String getMapfileTemplate() {
-        return FLYSUtils.getXPathString(XPATH_RIVERMAP_MAPFILE_TEMPLATE);
+        return RiverUtils.getXPathString(XPATH_RIVERMAP_MAPFILE_TEMPLATE);
     }
 }