--- a/flys-artifacts/doc/conf/meta-data.xml	Thu Feb 09 14:51:50 2012 +0000
+++ b/flys-artifacts/doc/conf/meta-data.xml	Thu Feb 09 15:48:13 2012 +0000
@@ -316,7 +316,7 @@
         </dc:macro>
 
         <dc:macro name="cross_sections">
-          <cross-sections>
+          <cross_sections>
             <dc:attribute name="id" value="flood-protections-${river_id}"/>
             <dc:context>
               <dc:statement>
@@ -325,14 +325,14 @@
                 FROM cross_sections WHERE river_id = ${river_id}
               </dc:statement>
               <dc:elements>
-                <cross-section>
+                <cross_section>
                   <dc:attribute name="name" value="${prot_description}"/>
                   <dc:attribute name="ids" value="${prot_id}"/>
                   <dc:attribute name="factory" value="crosssections"/>
-                </cross-section>
+                </cross_section>
               </dc:elements>
             </dc:context>
-          </cross-sections>
+          </cross_sections>
         </dc:macro>
 
         <dc:macro name="hyks">
@@ -431,8 +431,8 @@
           </dc:if>
 
           <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve') and not (dc:contains($parameters, 'recommended'))">
-              <discharge-table-nn>
-                <discharge-table-gauge>
+              <discharge_table_nn>
+                <discharge_table_gauge>
                   <dc:context>
                     <dc:statement>
                       SELECT id   AS gauge_id,
@@ -464,9 +464,9 @@
                       </gauge>
                     </dc:elements>
                   </dc:context>
-                </discharge-table-gauge>
+                </discharge_table_gauge>
 
-              </discharge-table-nn>
+              </discharge_table_nn>
 
             <dc:call-macro name="basedata_2_fixations_wst"/>
 
@@ -482,9 +482,9 @@
           </dc:if>
           <dc:if test="dc:contains($artifact-outs, 'computed_discharge_curve')"><!-- or (dc:contains($artifact-outs, 'discharge_curve'))"-->
               <!-- && parameter contains recommended/ation -->
-              <computed-discharge-curve>
+              <computed_discharge_curve>
                 <dc:call-macro name="mainvalues"/>
-              </computed-discharge-curve>
+              </computed_discharge_curve>
               <dc:call-macro name="basedata_2_fixations_wst"/>
           </dc:if>