--- a/artifacts/doc/conf/artifacts/sinfo.xml	Fri May 04 13:17:57 2018 +0200
+++ b/artifacts/doc/conf/artifacts/sinfo.xml	Fri May 04 13:36:01 2018 +0200
@@ -221,16 +221,16 @@
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.sinfo.calculation_mode"/>
       <to state="state.sinfo.distance_only"/>
-      <condition data="calculation_mode" value="sinfo_calc_grounding" operator="equal"/>
+      <condition data="calculation_mode" value="sinfo_calc_collision" operator="equal"/>
     </transition>
     
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.sinfo.distance_only"/>
       <to state="state.sinfo.year"/>
-      <condition data="calculation_mode" value="sinfo_calc_grounding" operator="equal"/>
+      <condition data="calculation_mode" value="sinfo_calc_collision" operator="equal"/>
     </transition>
     
-    <state id="state.sinfo.year" description="state.sinfo.year" state="org.dive4elements.river.artifacts.sinfo.grounding.YearChoice" helpText="help.state.sinfo.year">
+    <state id="state.sinfo.year" description="state.sinfo.year" state="org.dive4elements.river.artifacts.sinfo.collision.YearChoice" helpText="help.state.sinfo.year">
       <data name="year" type="Boolean"/>
     </state>
     
@@ -238,13 +238,13 @@
     
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.sinfo.year"/>
-      <to state="state.sinfo.grounding"/>
-      <condition data="calculation_mode" value="sinfo_calc_grounding" operator="equal"/>
+      <to state="state.sinfo.collision"/>
+      <condition data="calculation_mode" value="sinfo_calc_collision" operator="equal"/>
     </transition>
     
-    <state id="state.sinfo.grounding" description="state.sinfo.grounding" state="org.dive4elements.river.artifacts.sinfo.grounding.GroundingState" helpText="help.state.sinfo.grounding">
+    <state id="state.sinfo.collision" description="state.sinfo.collision" state="org.dive4elements.river.artifacts.sinfo.collision.CollisionState" helpText="help.state.sinfo.collision">
       <outputmodes>
-        <outputmode name="grounding" description="output.grounding" mime-type="image/png" type="chart">
+        <outputmode name="collision" description="output.collision" mime-type="image/png" type="chart">
           <facets>
             <!-- REMARK: id's that ends with 'filtered' are handled differently ' -->
             <facet name="sinfo_facet_flow_depth.filtered" description="flow depth, filtered by current zoom state"/>
@@ -282,27 +282,27 @@
      <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.sinfo.calculation_mode"/>
       <to state="state.sinfo.distance"/>
-      <condition data="calculation_mode" value="sinfo_calc_infrastructures_inundation_duration" operator="equal"/>
+      <condition data="calculation_mode" value="sinfo_calc_flood_duration" operator="equal"/>
     </transition>
     
      <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.sinfo.distance"/> 
       <to state="state.sinfo.riverside"/>
-      <condition data="calculation_mode" value="sinfo_calc_infrastructures_inundation_duration" operator="equal"/>
+      <condition data="calculation_mode" value="sinfo_calc_flood_duration" operator="equal"/>
     </transition>
     
-    <state id="state.sinfo.riverside" description="state.sinfo.riverside" state="org.dive4elements.river.artifacts.sinfo.inundation.RiversideRadioChoice" helpText="help.state.sinfo.riverside">
+    <state id="state.sinfo.riverside" description="state.sinfo.riverside" state="org.dive4elements.river.artifacts.sinfo.flood_duration.RiversideRadioChoice" helpText="help.state.sinfo.riverside">
       <data name="riverside" type="String"/>
     </state>
     
-    <state id="state.sinfo.wspl" description="state.sinfo.wspl" state="org.dive4elements.river.artifacts.sinfo.inundation.WsplChoice" helpText="help.state.sinfo.wspl">
+    <state id="state.sinfo.wspl" description="state.sinfo.wspl" state="org.dive4elements.river.artifacts.sinfo.flood_duration.WsplChoice" helpText="help.state.sinfo.wspl">
       <data name="wspl" type="Boolean"/>
     </state>
     
 	<transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.sinfo.riverside"/>
       <to state="state.sinfo.wspl"/>
-      <condition data="calculation_mode" value="sinfo_calc_infrastructures_inundation_duration" operator="equal"/>
+      <condition data="calculation_mode" value="sinfo_calc_flood_duration" operator="equal"/>
     </transition>
      
      
@@ -314,21 +314,21 @@
     
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.sinfo.wspl"/>
-      <to state="state.sinfo.infrastructures_inundation"/>
+      <to state="state.sinfo.flood_duration"/>
       <condition data="wspl" value="false" operator="equal"/>   
     </transition>
     
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.sinfo.wq"/>
-      <to state="state.sinfo.infrastructures_inundation"/>
-      <condition data="calculation_mode" value="sinfo_calc_infrastructures_inundation_duration" operator="equal"/>
+      <to state="state.sinfo.flood_duration"/>
+      <condition data="calculation_mode" value="sinfo_calc_flood_duration" operator="equal"/>
     </transition>
      
     
     
-    <state id="state.sinfo.infrastructures_inundation" description="state.sinfo.infrastructures_inundation" state="org.dive4elements.river.artifacts.sinfo.inundation.InundationState" helpText="help.state.sinfo.infrastructures_inundation">
+    <state id="state.sinfo.flood_duration" description="state.sinfo.flood_duration" state="org.dive4elements.river.artifacts.sinfo.flood_duration.FloodDurationState" helpText="help.state.sinfo.flood_duration">
       <outputmodes>
-        <outputmode name="infrastructures_inundation" description="output.infrastructures_inundation" mime-type="image/png" type="chart">
+        <outputmode name="flood" description="output.flood" mime-type="image/png" type="chart">
           <facets>
             <!-- REMARK: id's that ends with 'filtered' are handled differently ' -->
             <facet name="sinfo_facet_flow_depth.filtered" description="flow depth, filtered by current zoom state"/>