--- a/flys-artifacts/doc/conf/rivermap.xml	Sun Apr 21 10:46:06 2013 +0200
+++ b/flys-artifacts/doc/conf/rivermap.xml	Sun Apr 21 10:46:59 2013 +0200
@@ -32,24 +32,24 @@
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Donau"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Donaurna">
+    <river name="Donau (Regensburg Nordarm)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Donaurna"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Donau (Regensburg Nordarm)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="DonauSK">
+    <river name="Donau (Schleusenkanäle)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="DonauSK"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Donau (Schleusenkanäle)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Fulda">
+    <river name="Fulda (Winter)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Fulda"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Fulda (Winter)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Fulda-Sommer">
+    <river name="Fulda (Sommer)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Fulda-Sommer"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Fulda (Sommer)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Lahn">
@@ -62,14 +62,14 @@
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Main"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Main-Wehrarm-Limbach">
+    <river name="Main (Wehrarm Limbach)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Main-Wehrarm-Limbach"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Main (Wehrarm Limbach)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Main-Wehrarm-Volkach">
+    <river name="Main (Wehrarm Volkach)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Main-Wehrarm-Volkach"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Main (Wehrarm Volkach)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Neckar">
@@ -77,9 +77,9 @@
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Neckar"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Neckar-über-Wehrarme">
+    <river name="Neckar (über Wehrarme)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Neckar-über-Wehrarme"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Neckar (über Wehrarme)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Rhein">
@@ -97,19 +97,19 @@
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Saale-Thüringen"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Saar-Wilt-Bogen">
+    <river name="Saar (Wiltinger Bogen)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Saar-Wilt-Bogen"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Saar (Wiltinger Bogen)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Werra">
+    <river name="Werra (Winter)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Werra"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Werra (Winter)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
-    <river name="Werra-Sommer">
+    <river name="Werra (Sommer)">
         <srid value="31467"/>
-        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Werra-Sommer"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Werra (Sommer)"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
     <river name="Weser">