diff --git a/topics/languedoc/languedoc.csproj b/topics/languedoc/languedoc.csproj
index ce21caeb..5c6d87b0 100644
--- a/topics/languedoc/languedoc.csproj
+++ b/topics/languedoc/languedoc.csproj
@@ -42,6 +42,9 @@
     <None Include="..\..\shared\xsd\bgf.xsd">
       <Link>bgf.xsd</Link>
     </None>
+    <None Include="..\..\shared\xsd\fakemathml.xsd">
+      <Link>fakemathml.xsd</Link>
+    </None>
     <None Include="..\..\shared\xsd\lcf.xsd">
       <Link>lcf.xsd</Link>
     </None>
@@ -100,9 +103,24 @@
     <None Include="xldf\xldf\renameStr.xldf" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="..\..\shared\xsl\bgf2bnf.xslt">
+      <Link>bgf2bnf.xslt</Link>
+    </Content>
+    <Content Include="..\..\shared\xsl\bgf2xhtml.xslt">
+      <Link>bgf2xhtml.xslt</Link>
+    </Content>
     <Content Include="..\..\shared\xsl\ldf2tex.xslt">
       <Link>ldf2tex.xslt</Link>
     </Content>
+    <Content Include="..\..\shared\xsl\ldf2xhtml.xslt">
+      <Link>ldf2xhtml.xslt</Link>
+    </Content>
+    <Content Include="..\..\shared\xsl\mathml2tex.xslt">
+      <Link>mathml2tex.xslt</Link>
+    </Content>
+    <Content Include="..\..\shared\xsl\mathml2xhtml.xslt">
+      <Link>mathml2xhtml.xslt</Link>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="lcf\xldf\" />
diff --git a/topics/languedoc/lcf/lcf.xldf b/topics/languedoc/lcf/lcf.xldf
index c453a0b7..01c4e986 100644
--- a/topics/languedoc/lcf/lcf.xldf
+++ b/topics/languedoc/lcf/lcf.xldf
@@ -7,7 +7,7 @@
 
   <xldf:transform-grammar>
     <!-- TODO: can be automated! -->
-    <target>group-definition</target>
+    <target>definition</target>
     <xbgf:vertical>
       <nonterminal>definition</nonterminal>
     </xbgf:vertical>
@@ -32,8 +32,8 @@
     <xbgf:horizontal>definition</xbgf:horizontal>
   </xldf:transform-grammar>
   <xldf:combine>
-    <section>group-definition</section>
-    <with>element-configuration</with>
+    <section>definition</section>
+    <with>configuration</with>
   </xldf:combine>
   <xldf:retitle>
     <from>
@@ -58,7 +58,7 @@
 
 
   <xldf:transform-grammar>
-    <target>complexType-source</target>
+    <target>source</target>
     <xbgf:extract>
       <bgf:production>
         <nonterminal>grammar</nonterminal>
@@ -411,7 +411,7 @@
   </xldf:retitle>
 
   <xldf:transform-grammar>
-    <target>complexType-target</target>
+    <target>target</target>
     <xbgf:extract>
       <bgf:production>
         <nonterminal>resolution</nonterminal>
@@ -637,7 +637,7 @@
     </xbgf:anonymize>
   </xldf:transform-grammar>
   <xldf:append>
-    <where>complexType-target</where>
+    <where>target</where>
     <content>
       <text>
         During convergence process, LCI regularly compares the result of each
@@ -666,7 +666,7 @@
   </xldf:retitle>
 
   <xldf:transform-grammar>
-    <target>complexType-phase</target>
+    <target>phase</target>
     <xbgf:extract>
       <bgf:production>
         <nonterminal>automated</nonterminal>
@@ -727,7 +727,7 @@
     </xbgf:anonymize>
   </xldf:transform-grammar>
   <xldf:append>
-    <where>complexType-phase</where>
+    <where>phase</where>
     <content>
       <text>
         The interface to generators is universal. We used it only with
@@ -754,14 +754,14 @@
   </xldf:retitle>
 
   <xldf:transform-grammar>
-    <target>simpleType-toolType</target>
+    <target>toolType</target>
     <xbgf:vertical>
       <nonterminal>toolType</nonterminal>
     </xbgf:vertical>
   </xldf:transform-grammar>
   <xldf:combine>
-    <section>simpleType-toolType</section>
-    <with>complexType-tool</with>
+    <section>toolType</section>
+    <with>tool</with>
   </xldf:combine>
   <xldf:retitle>
     <from>
diff --git a/topics/languedoc/ldf/xldf/beautify.xldf b/topics/languedoc/ldf/xldf/beautify.xldf
index 650b4c10..f01b7d8f 100644
--- a/topics/languedoc/ldf/xldf/beautify.xldf
+++ b/topics/languedoc/ldf/xldf/beautify.xldf
@@ -6,7 +6,7 @@
   xmlns:xbgf="http://planet-sl.org/xbgf">
 
   <xldf:transform-grammar>
-    <target>element-document</target>
+    <target>document</target>
     <xbgf:anonymize>
       <bgf:production>
         <nonterminal>document</nonterminal>
@@ -157,7 +157,7 @@
   </xldf:transform-grammar>
 
   <xldf:transform-grammar>
-    <target>complexType-titlePage</target>
+    <target>titlePage</target>
     <xbgf:anonymize>
       <bgf:production>
         <nonterminal>titlePage</nonterminal>
@@ -258,7 +258,7 @@
   </xldf:transform-grammar>
 
   <xldf:transform-grammar>
-    <target>complexType-listOfTerms</target>
+    <target>listOfTerms</target>
     <xbgf:extract>
       <bgf:production>
         <nonterminal>term</nonterminal>
diff --git a/topics/languedoc/ldf/xldf/completeWithText.xldf b/topics/languedoc/ldf/xldf/completeWithText.xldf
index 7fe551be..b069274a 100644
--- a/topics/languedoc/ldf/xldf/completeWithText.xldf
+++ b/topics/languedoc/ldf/xldf/completeWithText.xldf
@@ -4,7 +4,7 @@
   xmlns:xldf="http://planet-sl.org/xldf">
 
   <xldf:append>
-    <where>simpleType-body</where>
+    <where>body</where>
     <content>
       <text>
         <ldf:keyword>ANSI (American National Standards Institute)</ldf:keyword>
diff --git a/topics/languedoc/ldf/xldf/dropBgf.xldf b/topics/languedoc/ldf/xldf/dropBgf.xldf
index a0dc2e99..9b127a98 100644
--- a/topics/languedoc/ldf/xldf/dropBgf.xldf
+++ b/topics/languedoc/ldf/xldf/dropBgf.xldf
@@ -3,28 +3,28 @@
   xmlns:xldf="http://planet-sl.org/xldf">
 
   <xldf:drop>
-    <section>element-grammar</section>
+    <section>grammar</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-production</section>
+    <section>production</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-expression</section>
+    <section>expression</section>
   </xldf:drop>
   <xldf:drop>
-    <section>simpleType-value</section>
+    <section>value</section>
   </xldf:drop>
   <xldf:drop>
-    <section>simpleType-label</section>
+    <section>label</section>
   </xldf:drop>
   <xldf:drop>
-    <section>simpleType-nonterminal</section>
+    <section>nonterminal</section>
   </xldf:drop>
   <xldf:drop>
-    <section>simpleType-selector</section>
+    <section>selector</section>
   </xldf:drop>
   <xldf:drop>
-    <section>simpleType-terminal</section>
+    <section>terminal</section>
   </xldf:drop>
   
 </xldf:evolution-sequence>
\ No newline at end of file
diff --git a/topics/languedoc/ldf/xldf/reorganise.xldf b/topics/languedoc/ldf/xldf/reorganise.xldf
index bfe45958..a9b64e86 100644
--- a/topics/languedoc/ldf/xldf/reorganise.xldf
+++ b/topics/languedoc/ldf/xldf/reorganise.xldf
@@ -19,8 +19,8 @@
     <to>Title page</to>
   </xldf:retitle>
   <xldf:combine>
-    <section>simpleType-status</section>
-    <with>complexType-titlePage</with>
+    <section>status</section>
+    <with>titlePage</with>
   </xldf:combine>
 
   <xldf:retitle>
@@ -51,8 +51,8 @@
     <to>Simple text</to>
   </xldf:retitle>
   <xldf:combine>
-    <section>group-simpleTextElement</section>
-    <with>complexType-simpleText</with>
+    <section>simpleTextElement</section>
+    <with>simpleText</with>
   </xldf:combine>
 
   <xldf:retitle>
@@ -62,8 +62,8 @@
     <to>Simple tables</to>
   </xldf:retitle>
   <xldf:combine>
-    <section>complexType-tableRow</section>
-    <with>complexType-simpleTable</with>
+    <section>tableRow</section>
+    <with>simpleTable</with>
   </xldf:combine>
 
   <xldf:retitle>
@@ -87,8 +87,8 @@
     <to>Front matter lists</to>
   </xldf:retitle>
   <xldf:combine>
-    <section>complexType-listOfTerms</section>
-    <with>group-frontList</with>
+    <section>listOfTerms</section>
+    <with>frontList</with>
   </xldf:combine>
 
   <xldf:retitle>
@@ -121,11 +121,11 @@
     <xbgf:inline>listOfInternalLinks</xbgf:inline>
   </xldf:transform-grammar>-->
   <xldf:combine>
-    <section>group-structuredSectionElement</section>
-    <with>complexType-structuredSection</with>
+    <section>structuredSectionElement</section>
+    <with>structuredSection</with>
   </xldf:combine>
   <xldf:drop>
-    <section>complexType-listOfInternalLinks</section>
+    <section>math</section>
   </xldf:drop>
 
   <xldf:retitle>
@@ -143,7 +143,7 @@
   </xldf:retitle>
 
   <xldf:drop>
-    <section>complexType-runnableType</section>
+    <section>runnableType</section>
   </xldf:drop>
 
   <xldf:retitle>
@@ -153,16 +153,16 @@
     <to>Keywords, links and plain text</to>
   </xldf:retitle>
   <xldf:combine>
-    <section>element-code</section>
-    <with>element-keyword</with>
+    <section>code</section>
+    <with>keyword</with>
   </xldf:combine>
   <xldf:combine>
-    <section>element-link</section>
-    <with>element-keyword</with>
+    <section>link</section>
+    <with>keyword</with>
   </xldf:combine>
   <xldf:combine>
-    <section>complexType-mixedType</section>
-    <with>element-keyword</with>
+    <section>mixedType</section>
+    <with>keyword</with>
   </xldf:combine>
 
 </xldf:evolution-sequence>
\ No newline at end of file
diff --git a/topics/languedoc/xbgf/xldf/completeDecSection.xldf b/topics/languedoc/xbgf/xldf/completeDecSection.xldf
index f198106f..d93ef9b9 100644
--- a/topics/languedoc/xbgf/xldf/completeDecSection.xldf
+++ b/topics/languedoc/xbgf/xldf/completeDecSection.xldf
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xldf:evolution-sequence
+  xmlns:mml="http://www.w3.org/1998/Math/MathML"
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:ldf="http://planet-sl.org/ldf"
   xmlns:xbgf="http://planet-sl.org/xbgf"
@@ -14,17 +15,17 @@
   </xldf:retitle>
   
   <xldf:place>
-    <section>element-remove</section>
-    <inside>group-decreasing-transformation</inside>
+    <section>remove</section>
+    <inside>decreasing-transformation</inside>
   </xldf:place>
   <xldf:transform-grammar>
-    <target>element-remove</target>
+    <target>remove</target>
     <xbgf:vertical>
       <nonterminal>remove</nonterminal>
     </xbgf:vertical>
   </xldf:transform-grammar>
   <xldf:extract-subsection>
-    <from>element-remove</from>
+    <from>remove</from>
     <content>
       <bgf:production>
         <label>vertical</label>
@@ -35,11 +36,11 @@
       </bgf:production>
     </content>
     <title>removeV</title>
-    <id>element-remove-v</id>
+    <id>remove-v</id>
     <role>syntax</role>
   </xldf:extract-subsection>
   <xldf:append>
-    <where>element-remove-v</where>
+    <where>remove-v</where>
     <content>
       <text>
         Vertical removal operates on the level of productions: it takes away one production
@@ -53,7 +54,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-remove-v</to>
+    <to>remove-v</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>remove-v-example</target>
@@ -82,7 +83,7 @@
   </xldf:import-grammar>
 
   <xldf:extract-subsection>
-    <from>element-remove</from>
+    <from>remove</from>
     <content>
       <bgf:production xmlns:bgf="http://planet-sl.org/bgf">
         <label>horizontal</label>
@@ -93,11 +94,11 @@
       </bgf:production>
     </content>
     <title>removeH</title>
-    <id>element-remove-h</id>
+    <id>remove-h</id>
     <role>syntax</role>
   </xldf:extract-subsection>
   <xldf:transform-grammar>
-    <target>element-remove-h</target>
+    <target>remove-h</target>
     <xbgf:fold>
       <nonterminal>marked-production</nonterminal>
       <in>
@@ -108,7 +109,7 @@
   </xldf:transform-grammar>
 
   <xldf:append>
-    <where>element-remove-h</where>
+    <where>remove-h</where>
     <content>
       <text>
         Horizontal removal looks inside productions: it removes any marked part of an internal choice,
@@ -133,7 +134,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-remove-h</to>
+    <to>remove-h</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>remove-h1-example</target>
@@ -166,7 +167,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-remove-h</to>
+    <to>remove-h</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>remove-h2-example</target>
@@ -195,11 +196,11 @@
   </xldf:import-grammar>
 
   <xldf:place>
-    <section>element-disappear</section>
-    <inside>group-decreasing-transformation</inside>
+    <section>disappear</section>
+    <inside>decreasing-transformation</inside>
   </xldf:place>
   <xldf:transform-grammar>
-    <target>element-disappear</target>
+    <target>disappear</target>
     <xbgf:fold>
       <nonterminal>marked-production</nonterminal>
       <in>
@@ -214,7 +215,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-disappear</to>
+    <to>disappear</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>disappear-example</target>
@@ -243,18 +244,79 @@
   </xldf:import-grammar>
   
   <xldf:place>
-    <section>element-narrow</section>
-    <inside>group-decreasing-transformation</inside>
+    <section>narrow</section>
+    <inside>decreasing-transformation</inside>
   </xldf:place>
   <xldf:append>
-    <where>element-narrow</where>
+    <where>narrow</where>
     <content>
       <text>
         The narrowing relation is defined as follows:
       </text>
-      <formula>x? \textrm{ can be narrowed to } x</formula>
-      <formula>x^+ \textrm{ can be narrowed to } x</formula>
-      <formula>x^\star \textrm{ can be narrowed to } x \textrm{ or } x? \textrm{ or } x^+</formula>
+      <formula><!--x? \textrm{ can be narrowed to } x-->
+        <mml:math>
+          <mml:mrow>
+            <mml:mrow>
+              <mml:msup>
+                <mml:mi>x</mml:mi>
+                <mml:mo>?</mml:mo>
+              </mml:msup>
+            </mml:mrow>
+            <mml:mtext>can be narrowed to</mml:mtext>
+            <mml:mrow>
+              <mml:mi>x</mml:mi>
+            </mml:mrow>
+          </mml:mrow>
+        </mml:math>
+      </formula>
+      <formula><!--x^+ \textrm{ can be narrowed to } x-->
+        <mml:math>
+          <mml:mrow>
+            <mml:mrow>
+              <mml:msup>
+                <mml:mi>x</mml:mi>
+                <mml:mo>+</mml:mo>
+              </mml:msup>
+            </mml:mrow>
+            <mml:mtext>can be narrowed to</mml:mtext>
+            <mml:mrow>
+              <mml:mi>x</mml:mi>
+            </mml:mrow>
+          </mml:mrow>
+        </mml:math>
+      </formula>
+      <formula><!-- x^\star \textrm{ can be narrowed to } x \textrm{ or } x? \textrm{ or } x^+ -->
+        <mml:math>
+          <mml:mrow>
+            <mml:mrow>
+              <mml:msup>
+                <mml:mi>x</mml:mi>
+                <mml:mo>*</mml:mo>
+              </mml:msup>
+            </mml:mrow>
+            <mml:mtext>can be narrowed to</mml:mtext>
+            <mml:mrow>
+              <mml:mrow>
+                <mml:mi>x</mml:mi>
+              </mml:mrow>
+              <mml:mtext>or</mml:mtext>
+              <mml:mrow>
+                <mml:msup>
+                  <mml:mi>x</mml:mi>
+                  <mml:mo>?</mml:mo>
+                </mml:msup>
+              </mml:mrow>
+              <mml:mtext>or</mml:mtext>
+              <mml:mrow>
+                <mml:msup>
+                  <mml:mi>x</mml:mi>
+                  <mml:mo>+</mml:mo>
+                </mml:msup>
+              </mml:mrow>
+            </mml:mrow>
+          </mml:mrow>
+        </mml:math>
+      </formula>
       <text>
         It is trivial to prove that for each case the expression on the right is included
         in the expression on the right, but not otherwise. For going the other way
@@ -269,7 +331,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-narrow</to>
+    <to>narrow</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>narrow-example</target>
@@ -298,11 +360,11 @@
   </xldf:import-grammar>
   
   <xldf:place>
-    <section>element-downgrade</section>
-    <inside>group-decreasing-transformation</inside>
+    <section>downgrade</section>
+    <inside>decreasing-transformation</inside>
   </xldf:place>
   <xldf:transform-grammar>
-    <target>element-downgrade</target>
+    <target>downgrade</target>
     <xbgf:replace>
       <bgf:expression>
         <sequence>
@@ -332,7 +394,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-downgrade</to>
+    <to>downgrade</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>downgrade-example</target>
@@ -361,7 +423,7 @@
   </xldf:import-grammar>
 
   <xldf:change-role>
-    <scope>group-decreasing-transformation</scope>
+    <scope>decreasing-transformation</scope>
     <from>syntax</from>
     <to>synopsis</to>
   </xldf:change-role>
diff --git a/topics/languedoc/xbgf/xldf/completeDecorSection.xldf b/topics/languedoc/xbgf/xldf/completeDecorSection.xldf
index 5cb2221c..eadbd952 100644
--- a/topics/languedoc/xbgf/xldf/completeDecorSection.xldf
+++ b/topics/languedoc/xbgf/xldf/completeDecorSection.xldf
@@ -7,7 +7,7 @@
   
   <!-- beautify xbgf -->
   <xldf:transform-grammar>
-    <target>element-unlabel</target>
+    <target>unlabel</target>
     <xbgf:anonymize>
       <bgf:production>
         <nonterminal>unlabel</nonterminal>
@@ -36,8 +36,8 @@
   </xldf:retitle>
   
   <xldf:place>
-    <section>element-designate</section>
-    <inside>group-decorative-transformation</inside>
+    <section>designate</section>
+    <inside>decorative-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <example id="designate-example">
@@ -45,7 +45,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-designate</to>
+    <to>designate</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>designate-example</target>
@@ -74,8 +74,8 @@
   </xldf:import-grammar>
   
   <xldf:place>
-    <section>element-unlabel</section>
-    <inside>group-decorative-transformation</inside>
+    <section>unlabel</section>
+    <inside>decorative-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <example id="unlabel-example">
@@ -87,7 +87,7 @@
         </text>
       </content>
     </example>
-    <to>element-unlabel</to>
+    <to>unlabel</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>unlabel-example</target>
@@ -116,11 +116,11 @@
   </xldf:import-grammar>
   
   <xldf:place>
-    <section>element-deanonymize</section>
-    <inside>group-decorative-transformation</inside>
+    <section>deanonymize</section>
+    <inside>decorative-transformation</inside>
   </xldf:place>
   <xldf:transform-grammar>
-    <target>element-deanonymize</target>
+    <target>deanonymize</target>
     <xbgf:fold>
       <nonterminal>marked-production</nonterminal>
       <in>
@@ -138,7 +138,7 @@
       </text>
       </content>
     </example>
-    <to>element-deanonymize</to>
+    <to>deanonymize</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>deanonymize-example</target>
@@ -167,7 +167,7 @@
   </xldf:import-grammar>
   
   <xldf:append>
-    <where>element-anonymize</where>
+    <where>anonymize</where>
     <content>
       <text>
         Given the input BGF and a clear goal to strip all selectors,
@@ -182,11 +182,11 @@
   </xldf:append>
   
   <xldf:place>
-    <section>element-anonymize</section>
-    <inside>group-decorative-transformation</inside>
+    <section>anonymize</section>
+    <inside>decorative-transformation</inside>
   </xldf:place>
   <xldf:transform-grammar>
-    <target>element-anonymize</target>
+    <target>anonymize</target>
     <xbgf:fold>
       <nonterminal>marked-production</nonterminal>
       <in>
@@ -202,7 +202,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-anonymize</to>
+    <to>anonymize</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>anonymize-example</target>
@@ -231,7 +231,7 @@
   </xldf:import-grammar>
 
   <xldf:change-role>
-    <scope>group-decorative-transformation</scope>
+    <scope>decorative-transformation</scope>
     <from>syntax</from>
     <to>synopsis</to>
   </xldf:change-role>
diff --git a/topics/languedoc/xbgf/xldf/completeFoldSection.xldf b/topics/languedoc/xbgf/xldf/completeFoldSection.xldf
index edae7892..791e7991 100644
--- a/topics/languedoc/xbgf/xldf/completeFoldSection.xldf
+++ b/topics/languedoc/xbgf/xldf/completeFoldSection.xldf
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xldf:evolution-sequence
+  xmlns:mml="http://www.w3.org/1998/Math/MathML"
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf"
   xmlns:ldf="http://planet-sl.org/ldf"
@@ -7,7 +8,7 @@
   
   <!-- beautify xbgf -->
   <xldf:transform-grammar>
-    <target>element-unfold</target>
+    <target>unfold</target>
     <xbgf:anonymize>
       <bgf:production>
         <nonterminal>unfold</nonterminal>
@@ -51,8 +52,8 @@
     <to>Folding and unfolding transformations</to>
   </xldf:retitle>
   <xldf:place>
-    <section>element-unfold</section>
-    <inside>group-folding-transformation</inside>
+    <section>unfold</section>
+    <inside>folding-transformation</inside>
   </xldf:place>
   <xldf:insert>
     <before>
@@ -83,7 +84,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-unfold</to>
+    <to>unfold</to>
   </xldf:add-subsection>
   
   <xldf:import-grammar>
@@ -114,7 +115,7 @@
 
   <!-- beautify xbgf -->
   <xldf:transform-grammar>
-    <target>element-fold</target>
+    <target>fold</target>
     <xbgf:anonymize>
       <bgf:production>
         <nonterminal>fold</nonterminal>
@@ -151,8 +152,8 @@
   </xldf:transform-grammar>
   
   <xldf:place>
-    <section>element-fold</section>
-    <inside>group-folding-transformation</inside>
+    <section>fold</section>
+    <inside>folding-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <example id="fold-example">
@@ -160,7 +161,7 @@
       <text>Very much like unfolding, folding can take place locally. For instance,</text>
     </content>
     </example>
-    <to>element-fold</to>
+    <to>fold</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>fold-example</target>
@@ -189,8 +190,8 @@
   </xldf:import-grammar>
   
   <xldf:place>
-    <section>element-inline</section>
-    <inside>group-folding-transformation</inside>
+    <section>inline</section>
+    <inside>folding-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <semantics>
@@ -199,10 +200,37 @@
           The <ldf:keyword>inline</ldf:keyword> transformation is by far the
           most used in Java Language Specification case study. One of the reasons
           is what we call layering: in particular expressions and statements
-          are introduced in the $G_j^R$ with a set of related nonterminals:
+          are introduced in the
+          <ldf:formula>
+            <mml:math>
+              <mml:mrow>
+                <mml:msup>
+                  <mml:msub>
+                    <mml:mi>G</mml:mi>
+                    <mml:mi>j</mml:mi>
+                  </mml:msub>
+                  <mml:mi>R</mml:mi>
+                </mml:msup>
+              </mml:mrow>
+            </mml:math>
+          </ldf:formula>
+          with a set of related nonterminals:
           LabeledStatement, IfThenElseStatement, WhileStatement, ForStatement, etc, and
           CastExpression, PreIncrementExpression, PreDecrementExpression, PostfixExpression, etc.
-          $G_j^I$ takes another approach, just listing all the alternatives in the productions
+          <ldf:formula>
+            <mml:math>
+              <mml:mrow>
+                <mml:msup>
+                  <mml:msub>
+                    <mml:mi>G</mml:mi>
+                    <mml:mi>j</mml:mi>
+                  </mml:msub>
+                  <mml:mi>I</mml:mi>
+                </mml:msup>
+              </mml:mrow>
+            </mml:math>
+          </ldf:formula>
+          takes another approach, just listing all the alternatives in the productions
           for Statement and Expression. In order to converge these two variants, a lot of inlining
           transformations are needed. This can also be apparent from the statistics table,
           that demonstrates that targets that converge only ``readable'' grammars require up to
@@ -212,7 +240,7 @@
         </text>
       </content>
     </semantics>
-    <to>element-inline</to>
+    <to>inline</to>
   </xldf:add-subsection>
   <xldf:add-subsection>
     <example id="inline-example">
@@ -220,7 +248,7 @@
         <text>An example follows. When we have:</text>
       </content>
     </example>
-    <to>element-inline</to>
+    <to>inline</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>inline-example</target>
@@ -249,8 +277,8 @@
   </xldf:import-grammar>
   
   <xldf:place>
-    <section>element-extract</section>
-    <inside>group-folding-transformation</inside>
+    <section>extract</section>
+    <inside>folding-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <semantics>
@@ -264,7 +292,7 @@
         </text>
       </content>
     </semantics>
-    <to>element-extract</to>
+    <to>extract</to>
   </xldf:add-subsection>
   <xldf:add-subsection>
     <example id="extract-example">
@@ -274,7 +302,7 @@
         </text>
       </content>
     </example>
-    <to>element-extract</to>
+    <to>extract</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>extract-example</target>
@@ -303,8 +331,8 @@
   </xldf:import-grammar>
 
   <xldf:place>
-    <section>element-abridge</section>
-    <inside>group-folding-transformation</inside>
+    <section>abridge</section>
+    <inside>folding-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <semantics>
@@ -321,7 +349,7 @@
         </text>
       </content>
     </semantics>
-    <to>element-abridge</to>
+    <to>abridge</to>
   </xldf:add-subsection>
   <xldf:add-subsection>
     <example id="abridge-example">
@@ -331,7 +359,7 @@
         </text>
       </content>
     </example>
-    <to>element-abridge</to>
+    <to>abridge</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>abridge-example</target>
@@ -363,8 +391,8 @@
   </xldf:import-grammar>
   
   <xldf:place>
-    <section>element-detour</section>
-    <inside>group-folding-transformation</inside>
+    <section>detour</section>
+    <inside>folding-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <example id="detour-example">
@@ -377,7 +405,7 @@
         </text>
       </content>
     </example>
-    <to>element-detour</to>
+    <to>detour</to>
   </xldf:add-subsection>
   <xldf:import-sample>
     <target>detour-example</target>
@@ -386,8 +414,8 @@
   </xldf:import-sample>
   
   <xldf:place>
-    <section>element-unchain</section>
-    <inside>group-folding-transformation</inside>
+    <section>unchain</section>
+    <inside>folding-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <semantics>
@@ -401,7 +429,7 @@
         </text>
       </content>
     </semantics>
-    <to>element-unchain</to>
+    <to>unchain</to>
   </xldf:add-subsection>
   <xldf:add-subsection>
     <example id="unchain-example">
@@ -411,7 +439,7 @@
         </text>
       </content>
     </example>
-    <to>element-unchain</to>
+    <to>unchain</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>unchain-example</target>
@@ -442,8 +470,8 @@
   </xldf:import-grammar>
   
   <xldf:place>
-    <section>element-chain</section>
-    <inside>group-folding-transformation</inside>
+    <section>chain</section>
+    <inside>folding-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <example id="chain-example">
@@ -456,7 +484,7 @@
         </text>
       </content>
     </example>
-    <to>element-chain</to>
+    <to>chain</to>
   </xldf:add-subsection>
   <xldf:import-sample>
     <target>chain-example</target>
@@ -465,7 +493,7 @@
   </xldf:import-sample>
 
   <xldf:change-role>
-    <scope>group-folding-transformation</scope>
+    <scope>folding-transformation</scope>
     <from>syntax</from>
     <to>synopsis</to>
   </xldf:change-role>
diff --git a/topics/languedoc/xbgf/xldf/completeIncSection.xldf b/topics/languedoc/xbgf/xldf/completeIncSection.xldf
index 3902c900..d941cec0 100644
--- a/topics/languedoc/xbgf/xldf/completeIncSection.xldf
+++ b/topics/languedoc/xbgf/xldf/completeIncSection.xldf
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xldf:evolution-sequence
+  xmlns:mml="http://www.w3.org/1998/Math/MathML"
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf"
   xmlns:ldf="http://planet-sl.org/ldf"
@@ -14,17 +15,17 @@
   </xldf:retitle>
   
   <xldf:place>
-    <section>element-add</section>
-    <inside>group-increasing-transformation</inside>
+    <section>add</section>
+    <inside>increasing-transformation</inside>
   </xldf:place>
   <xldf:transform-grammar>
-    <target>element-add</target>
+    <target>add</target>
     <xbgf:vertical>
       <nonterminal>add</nonterminal>
     </xbgf:vertical>
   </xldf:transform-grammar>
   <xldf:extract-subsection>
-    <from>element-add</from>
+    <from>add</from>
     <content>
       <bgf:production xmlns:bgf="http://planet-sl.org/bgf">
         <label>vertical</label>
@@ -35,11 +36,11 @@
       </bgf:production>
     </content>
     <title>addV</title>
-    <id>element-add-v</id>
+    <id>add-v</id>
     <role>syntax</role>
   </xldf:extract-subsection>
   <xldf:append>
-    <where>element-add-v</where>
+    <where>add-v</where>
     <content>
       <text>
         Vertical addition operates on the level of productions: it adds one more production
@@ -53,7 +54,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-add-v</to>
+    <to>add-v</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>add-v-example</target>
@@ -82,7 +83,7 @@
   </xldf:import-grammar>
 
   <xldf:extract-subsection>
-    <from>element-add</from>
+    <from>add</from>
     <content>
       <bgf:production xmlns:bgf="http://planet-sl.org/bgf">
         <label>horizontal</label>
@@ -93,11 +94,11 @@
       </bgf:production>
     </content>
     <title>addH</title>
-    <id>element-add-h</id>
+    <id>add-h</id>
     <role>syntax</role>
   </xldf:extract-subsection>
   <xldf:transform-grammar>
-    <target>element-add-h</target>
+    <target>add-h</target>
     <xbgf:fold>
       <nonterminal>marked-production</nonterminal>
       <in>
@@ -108,7 +109,7 @@
   </xldf:transform-grammar>
 
   <xldf:append>
-    <where>element-add-h</where>
+    <where>add-h</where>
     <content>
       <text>
         Horizontal addition looks inside productions: it adds any marked part of an internal choice
@@ -133,7 +134,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-add-h</to>
+    <to>add-h</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>add-h1-example</target>
@@ -166,7 +167,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-add-h</to>
+    <to>add-h</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>add-h2-example</target>
@@ -195,11 +196,11 @@
   </xldf:import-grammar>
 
   <xldf:place>
-    <section>element-appear</section>
-    <inside>group-increasing-transformation</inside>
+    <section>appear</section>
+    <inside>increasing-transformation</inside>
   </xldf:place>
   <xldf:transform-grammar>
-    <target>element-appear</target>
+    <target>appear</target>
     <xbgf:fold>
       <nonterminal>marked-production</nonterminal>
       <in>
@@ -214,7 +215,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-appear</to>
+    <to>appear</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>appear-example</target>
@@ -243,18 +244,88 @@
   </xldf:import-grammar>
 
   <xldf:place>
-    <section>element-widen</section>
-    <inside>group-increasing-transformation</inside>
+    <section>widen</section>
+    <inside>increasing-transformation</inside>
   </xldf:place>
   <xldf:append>
-    <where>element-widen</where>
+    <where>widen</where>
     <content>
       <text>
         The widening relation is defined as follows:
       </text>
-      <formula>x \textrm{ can be widened to } x? \textrm{ or } x^+ \textrm{ or } x^\star</formula>
-      <formula>x? \textrm{ can be widened to } x^\star</formula>
-      <formula>x^+ \textrm{ can be widened to } x^\star</formula>
+      <formula>
+        <!--x \textrm{ can be widened to } x? \textrm{ or } x^+ \textrm{ or } x^\star-->
+        <mml:math>
+          <mml:mrow>
+            <mml:mrow>
+                <mml:mi>x</mml:mi>
+            </mml:mrow>
+            <mml:mtext>can be widened to</mml:mtext>
+            <mml:mrow>
+              <mml:mrow>
+                <mml:msup>
+                  <mml:mi>x</mml:mi>
+                  <mml:mo>?</mml:mo>
+                </mml:msup>
+              </mml:mrow>
+              <mml:mtext>or</mml:mtext>
+              <mml:mrow>
+                <mml:msup>
+                  <mml:mi>x</mml:mi>
+                  <mml:mo>+</mml:mo>
+                </mml:msup>
+              </mml:mrow>
+              <mml:mtext>or</mml:mtext>
+              <mml:mrow>
+                <mml:msup>
+                  <mml:mi>x</mml:mi>
+                  <mml:mo>*</mml:mo>
+                </mml:msup>
+              </mml:mrow>
+            </mml:mrow>
+          </mml:mrow>
+        </mml:math>
+      </formula>
+      <formula>
+        <!--x? \textrm{ can be widened to } x^\star-->
+        <mml:math>
+          <mml:mrow>
+            <mml:mrow>
+              <mml:msup>
+                <mml:mi>x</mml:mi>
+                <mml:mo>?</mml:mo>
+              </mml:msup>
+            </mml:mrow>
+            <mml:mtext>can be widened to</mml:mtext>
+            <mml:mrow>
+              <mml:msup>
+                <mml:mi>x</mml:mi>
+                <mml:mo>*</mml:mo>
+              </mml:msup>
+            </mml:mrow>
+          </mml:mrow>
+        </mml:math>
+      </formula>
+      <formula>
+        <!--x^+ \textrm{ can be widened to } x^\star-->
+        <mml:math>
+          <mml:mrow>
+            <mml:mrow>
+              <mml:msup>
+                <mml:mi>x</mml:mi>
+                <mml:mo>+</mml:mo>
+              </mml:msup>
+            </mml:mrow>
+            <mml:mtext>can be widened to</mml:mtext>
+            <mml:mrow>
+              <mml:msup>
+                <mml:mi>x</mml:mi>
+                <mml:mo>*</mml:mo>
+              </mml:msup>
+            </mml:mrow>
+          </mml:mrow>
+        </mml:math>
+      </formula>
       <text>
         It is trivial to prove that for each case the expression on the left is included
         in the expression on the right, but not otherwise. For going the other way
@@ -269,7 +340,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-widen</to>
+    <to>widen</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>widen-example</target>
@@ -298,11 +369,11 @@
   </xldf:import-grammar>
 
   <xldf:place>
-    <section>element-upgrade</section>
-    <inside>group-increasing-transformation</inside>
+    <section>upgrade</section>
+    <inside>increasing-transformation</inside>
   </xldf:place>
   <xldf:transform-grammar>
-    <target>element-upgrade</target>
+    <target>upgrade</target>
     <xbgf:replace>
       <bgf:expression>
         <sequence>
@@ -332,7 +403,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-upgrade</to>
+    <to>upgrade</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>upgrade-example</target>
@@ -361,8 +432,8 @@
   </xldf:import-grammar>
 
   <xldf:place>
-    <section>element-unite</section>
-    <inside>group-increasing-transformation</inside>
+    <section>unite</section>
+    <inside>increasing-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <example id="unite-example">
@@ -370,7 +441,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-unite</to>
+    <to>unite</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>unite-example</target>
@@ -399,7 +470,7 @@
   </xldf:import-grammar>
 
   <xldf:change-role>
-    <scope>group-increasing-transformation</scope>
+    <scope>increasing-transformation</scope>
     <from>syntax</from>
     <to>synopsis</to>
   </xldf:change-role>
diff --git a/topics/languedoc/xbgf/xldf/completeIntro.xldf b/topics/languedoc/xbgf/xldf/completeIntro.xldf
index e0ba3515..35988b7e 100644
--- a/topics/languedoc/xbgf/xldf/completeIntro.xldf
+++ b/topics/languedoc/xbgf/xldf/completeIntro.xldf
@@ -7,7 +7,7 @@
 
   <!-- beautify bgf -->
   <xldf:transform-grammar>
-    <target>group-scope</target>
+    <target>scope</target>
     <xbgf:vertical>
       <nonterminal>scope</nonterminal>
     </xbgf:vertical>
@@ -96,11 +96,11 @@
   </xldf:add-subsection>
 
   <xldf:combine>
-    <section>element-grammar</section>
+    <section>grammar</section>
     <with>notation-section</with>
   </xldf:combine>
   <xldf:transform-grammar>
-    <target>element-production</target>
+    <target>production</target>
     <xbgf:anonymize>
       <bgf:production>
         <nonterminal>production</nonterminal>
@@ -170,11 +170,11 @@
     </xbgf:anonymize>
   </xldf:transform-grammar>
    <xldf:combine>
-    <section>element-production</section>
+    <section>production</section>
     <with>notation-section</with>
   </xldf:combine>
   <xldf:transform-grammar>
-    <target>element-expression</target>
+    <target>expression</target>
     <xbgf:vertical>
       <nonterminal>expression</nonterminal>
     </xbgf:vertical>
@@ -205,30 +205,30 @@
     </xbgf:anonymize>
   </xldf:transform-grammar>
   <xldf:combine>
-    <section>element-expression</section>
+    <section>expression</section>
     <with>notation-section</with>
   </xldf:combine>
   <xldf:transform-grammar>
-    <target>simpleType-value</target>
+    <target>value</target>
     <xbgf:vertical>
       <nonterminal>value</nonterminal>
     </xbgf:vertical>
   </xldf:transform-grammar>
   <xldf:combine>
-    <section>simpleType-value</section>
+    <section>value</section>
     <with>notation-section</with>
   </xldf:combine>
   <xldf:drop>
-    <section>simpleType-label</section>
+    <section>label</section>
   </xldf:drop>
   <xldf:drop>
-    <section>simpleType-nonterminal</section>
+    <section>nonterminal</section>
   </xldf:drop>
   <xldf:drop>
-    <section>simpleType-selector</section>
+    <section>selector</section>
   </xldf:drop>
   <xldf:drop>
-    <section>simpleType-terminal</section>
+    <section>terminal</section>
   </xldf:drop>
   
    <xldf:add-section>
@@ -555,17 +555,17 @@
   </xldf:add-section>
 
   <xldf:place>
-    <section>element-sequence</section>
+    <section>sequence</section>
     <inside>definitions-section</inside>
   </xldf:place>
 
   <xldf:place>
-    <section>element-atomic</section>
+    <section>atomic</section>
     <inside>definitions-section</inside>
   </xldf:place>
 
   <xldf:transform-grammar>
-    <target>group-transformation</target>
+    <target>transformation</target>
     <xbgf:vertical>
       <nonterminal>transformation</nonterminal>
     </xbgf:vertical>
@@ -582,12 +582,12 @@
     <xbgf:horizontal>transformation</xbgf:horizontal>
  </xldf:transform-grammar>
   <xldf:place>
-    <section>group-transformation</section>
+    <section>transformation</section>
     <inside>definitions-section</inside>
   </xldf:place>
  
   <xldf:place>
-    <section>group-scope</section>
+    <section>scope</section>
     <inside>definitions-section</inside>
   </xldf:place>
 
diff --git a/topics/languedoc/xbgf/xldf/completeMiscSection.xldf b/topics/languedoc/xbgf/xldf/completeMiscSection.xldf
index 6373a26b..cc84fe3b 100644
--- a/topics/languedoc/xbgf/xldf/completeMiscSection.xldf
+++ b/topics/languedoc/xbgf/xldf/completeMiscSection.xldf
@@ -7,18 +7,18 @@
 
   <!--
   <xldf:place>
-    <section>element-rename</section>
-    <inside>group-refactoring-transformation</inside>
+    <section>rename</section>
+    <inside>refactoring-transformation</inside>
   </xldf:place>-->
   <xldf:transform-grammar>
-    <target>element-rename</target>
+    <target>rename</target>
     <xbgf:vertical>
       <nonterminal>rename</nonterminal>
     </xbgf:vertical>
   </xldf:transform-grammar>
   
   <xldf:extract-subsection>
-    <from>element-rename</from>
+    <from>rename</from>
     <content>
       <bgf:production xmlns:bgf="http://planet-sl.org/bgf">
         <label>label</label>
@@ -46,11 +46,11 @@
       </bgf:production>
     </content>
     <title>renameL</title>
-    <id>element-rename-label</id>
+    <id>rename-label</id>
     <role>syntax</role>
   </xldf:extract-subsection>
   <xldf:append>
-    <where>element-rename-label</where>
+    <where>rename-label</where>
     <content>
       <text>
         Renaming labels is a semantic preserving grammar transformation pretty-printed as <ldf:keyword>renameL</ldf:keyword>.
@@ -70,7 +70,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-rename-label</to>
+    <to>rename-label</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>renameL-example</target>
@@ -99,7 +99,7 @@
   </xldf:import-grammar>
 
   <xldf:extract-subsection>
-    <from>element-rename</from>
+    <from>rename</from>
     <content>
       <bgf:production xmlns:bgf="http://planet-sl.org/bgf">
         <label>nonterminal</label>
@@ -127,11 +127,11 @@
       </bgf:production>
     </content>
     <title>renameN</title>
-    <id>element-rename-nonterminal</id>
+    <id>rename-nonterminal</id>
     <role>syntax</role>
   </xldf:extract-subsection>
   <xldf:append>
-    <where>element-rename-nonterminal</where>
+    <where>rename-nonterminal</where>
     <content>
       <text>
         Similarly, this transformation can be used to rename nonterminals.
@@ -149,7 +149,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-rename-nonterminal</to>
+    <to>rename-nonterminal</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>renameN-example</target>
@@ -178,7 +178,7 @@
   </xldf:import-grammar>
   
   <xldf:extract-subsection>
-    <from>element-rename</from>
+    <from>rename</from>
     <content>
       <bgf:production xmlns:bgf="http://planet-sl.org/bgf">
         <label>selector</label>
@@ -218,11 +218,11 @@
       </bgf:production>
     </content>
     <title>renameS</title>
-    <id>element-rename-selector</id>
+    <id>rename-selector</id>
     <role>syntax</role>
   </xldf:extract-subsection>
   <xldf:append>
-    <where>element-rename-selector</where>
+    <where>rename-selector</where>
     <content>
       <text>
         Selectors can also be renamed by a semantic preserving grammar transformation that is
@@ -239,7 +239,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-rename-selector</to>
+    <to>rename-selector</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>renameS-example</target>
@@ -268,7 +268,7 @@
   </xldf:import-grammar>
   
   <xldf:extract-subsection>
-    <from>element-rename</from>
+    <from>rename</from>
     <content>
       <bgf:production xmlns:bgf="http://planet-sl.org/bgf">
         <label>terminal</label>
@@ -296,11 +296,11 @@
       </bgf:production>
     </content>
     <title>renameT</title>
-    <id>element-rename-terminal</id>
+    <id>rename-terminal</id>
     <role>syntax</role>
   </xldf:extract-subsection>
   <xldf:append>
-    <where>element-rename-terminal</where>
+    <where>rename-terminal</where>
     <content>
       <text>
         Renaming terminals breaks string-oriented (concrete) semantics, but is still possible.
@@ -317,7 +317,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-rename-terminal</to>
+    <to>rename-terminal</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>renameT-example</target>
@@ -347,7 +347,7 @@
   
   <xldf:remove-section>
     <!-- eliminate(strip) is implicit -->
-    <id>element-strip</id>
+    <id>strip</id>
   </xldf:remove-section>
 
 </xldf:evolution-sequence>
\ No newline at end of file
diff --git a/topics/languedoc/xbgf/xldf/completeRefSection.xldf b/topics/languedoc/xbgf/xldf/completeRefSection.xldf
index 9f853f2a..a3790cda 100644
--- a/topics/languedoc/xbgf/xldf/completeRefSection.xldf
+++ b/topics/languedoc/xbgf/xldf/completeRefSection.xldf
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xldf:evolution-sequence
+  xmlns:mml="http://www.w3.org/1998/Math/MathML"
   xmlns:bgf="http://planet-sl.org/bgf"
   xmlns:xbgf="http://planet-sl.org/xbgf"
   xmlns:xldf="http://planet-sl.org/xldf"
@@ -13,12 +14,12 @@
     <to>Other refactoring transformations</to>
   </xldf:retitle>
   <xldf:place>
-    <section>element-massage</section>
-    <inside>group-refactoring-transformation</inside>
+    <section>massage</section>
+    <inside>refactoring-transformation</inside>
   </xldf:place>
 
   <xldf:append>
-    <where>element-massage</where>
+    <where>massage</where>
     <content>
       <text>
         The massage relation is defined as follows. First of all, a choice of any two
@@ -29,122 +30,407 @@
       <table>
         <header>
           <cell>
-            <formula>|</formula>
-          </cell>
-          <cell>
-            <formula>\varepsilon</formula>
-          </cell>
-          <cell>
-            <formula>x</formula>
-          </cell>
-          <cell>
-            <formula>x?</formula>
-          </cell>
-          <cell>
-            <formula>x^+</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:mo>|</mml:mo>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:varepsilon/>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:mi>x</mml:mi>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>?</mml:mo>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
         </header>
         <row>
           <cell>
-            <formula>\varepsilon</formula>
-          </cell>
-          <cell>
-            <formula>(\varepsilon)</formula>
-          </cell>
-          <cell>
-            <formula>x?</formula>
-          </cell>
-          <cell>
-            <formula>x?</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:varepsilon/>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mfenced>
+                  <mml:varepsilon/>
+                </mml:mfenced>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>?</mml:mo>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>?</mml:mo>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
         </row>
         <row>
           <cell>
-            <formula>x</formula>
-          </cell>
-          <cell>
-            <formula>x?</formula>
-          </cell>
-          <cell>
-            <formula>x</formula>
-          </cell>
-          <cell>
-            <formula>x?</formula>
-          </cell>
-          <cell>
-            <formula>x^+</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                    <mml:mi>x</mml:mi>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>?</mml:mo>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:mi>x</mml:mi>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>?</mml:mo>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
         </row>
         <row>
           <cell>
-            <formula>x?</formula>
-          </cell>
-          <cell>
-            <formula>x?</formula>
-          </cell>
-          <cell>
-            <formula>x?</formula>
-          </cell>
-          <cell>
-            <formula>(x?)</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>?</mml:mo>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>?</mml:mo>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>?</mml:mo>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mfenced>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>?</mml:mo>
+                </mml:mfenced>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
         </row>
         <row>
           <cell>
-            <formula>x^+</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>x^+</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>(x^+)</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mfenced>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mfenced>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
         </row>
         <row>
           <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>(x^\star)</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mfenced>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mfenced>
+              </mml:math>
+            </formula>
           </cell>
         </row>
       </table>
@@ -155,58 +441,193 @@
       <table>
         <header>
           <cell>
-            <formula>y</formula>
-          </cell>
-          <cell>
-            <formula>y?</formula>
-          </cell>
-          <cell>
-            <formula>y^+</formula>
-          </cell>
-          <cell>
-            <formula>y^\star</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:mi>y</mml:mi>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                    <mml:mi>y</mml:mi>
+                    <mml:mo>?</mml:mo>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>y</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>y</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
         </header>
         <row>
           <cell>
-            <formula>x?</formula>
-          </cell>
-          <cell>
-            <formula>x?</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:mi>x</mml:mi>
+                  <mml:mo>?</mml:mo>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:mi>x</mml:mi>
+                  <mml:mo>?</mml:mo>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
         </row>
         <row>
           <cell>
-            <formula>x^+</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>x^+</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
         </row>
         <row>
           <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
         </row>
       </table>
@@ -223,21 +644,58 @@
             <empty/>
           </cell>
           <cell>
-            <formula>x</formula>
-          </cell>
-          <cell>
-            <formula>x?</formula>
-          </cell>
-          <cell>
-            <formula>x^+</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:mi>x</mml:mi>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:mi>x</mml:mi>
+                  <mml:mo>?</mml:mo>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
         </header>
         <row>
           <cell>
-            <formula>x</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:mi>x</mml:mi>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
           <cell>
             <empty/>
@@ -249,12 +707,28 @@
             <empty/>
           </cell>
           <cell>
-            <formula>x^+</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
         </row>
         <row>
           <cell>
-            <formula>x?</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:mi>x</mml:mi>
+                  <mml:mo>?</mml:mo>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
           <cell>
             <empty/>
@@ -263,53 +737,220 @@
             <empty/>
           </cell>
           <cell>
-            <formula>x^+</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
         </row>
         <row>
           <cell>
-            <formula>x^+</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
           <cell>
             <empty/>
           </cell>
           <cell>
-            <formula>x^+</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
           <cell>
             <empty/>
           </cell>
           <cell>
-            <formula>x^+</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
         </row>
         <row>
           <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>x^+</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
-          </cell>
-          <cell>
-            <formula>x^+</formula>
-          </cell>
-          <cell>
-            <formula>x^\star</formula>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>+</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
+          </cell>
+          <cell>
+            <formula>
+              <mml:math>
+                <mml:mrow>
+                  <mml:msup>
+                    <mml:mi>x</mml:mi>
+                    <mml:mo>*</mml:mo>
+                  </mml:msup>
+                </mml:mrow>
+              </mml:math>
+            </formula>
           </cell>
         </row>
       </table>
       <text>
         Associativity rules for <ldf:keyword>massage</ldf:keyword>:
       </text>
-      <formula>x (yx)? = (xy)? x</formula>
-      <formula>x (yx)^+ = (xy)^+ x</formula>
-      <formula>x (yx)^\star = (xy)^\star x</formula>
+      <formula>
+        <!--x (yx)? = (xy)? x-->
+        <mml:math>
+          <mml:mrow>
+            <mml:mrow>
+              <mml:mi>x</mml:mi>
+              <mml:mfenced>
+                <mml:mi>y</mml:mi>
+                <mml:mi>x</mml:mi>
+              </mml:mfenced>
+              <mml:mo>?</mml:mo>
+            </mml:mrow>
+            <mml:mo>=</mml:mo>
+            <mml:mrow>
+              <mml:mfenced>
+                <mml:mi>x</mml:mi>
+                <mml:mi>y</mml:mi>
+              </mml:mfenced>
+              <mml:mo>?</mml:mo>
+              <mml:mi>x</mml:mi>
+            </mml:mrow>
+          </mml:mrow>
+        </mml:math>
+      </formula>
+      <formula>
+        <!--x (yx)^+ = (xy)^+ x-->
+        <mml:math>
+          <mml:mrow>
+            <mml:mrow>
+              <mml:mi>x</mml:mi>
+              <mml:msup>
+                <mml:mfenced>
+                  <mml:mi>y</mml:mi>
+                  <mml:mi>x</mml:mi>
+                </mml:mfenced>
+                <mml:mo>+</mml:mo>
+              </mml:msup>
+            </mml:mrow>
+            <mml:mo>=</mml:mo>
+            <mml:mrow>
+              <mml:msup>
+                <mml:mfenced>
+                  <mml:mi>x</mml:mi>
+                  <mml:mi>y</mml:mi>
+                </mml:mfenced>
+                <mml:mo>+</mml:mo>
+              </mml:msup>
+              <mml:mi>x</mml:mi>
+            </mml:mrow>
+          </mml:mrow>
+        </mml:math>
+      </formula>
+      <formula>
+        <!--x (yx)^\star = (xy)^\star x-->
+        <mml:math>
+        <mml:mrow>
+          <mml:mrow>
+            <mml:mi>x</mml:mi>
+            <mml:msup>
+              <mml:mfenced>
+                <mml:mi>y</mml:mi>
+                <mml:mi>x</mml:mi>
+              </mml:mfenced>
+              <mml:mo>*</mml:mo>
+            </mml:msup>
+          </mml:mrow>
+          <mml:mo>=</mml:mo>
+          <mml:mrow>
+            <mml:msup>
+              <mml:mfenced>
+                <mml:mi>x</mml:mi>
+                <mml:mi>y</mml:mi>
+              </mml:mfenced>
+              <mml:mo>*</mml:mo>
+            </mml:msup>
+            <mml:mi>x</mml:mi>
+          </mml:mrow>
+        </mml:mrow>
+      </mml:math>
+    </formula>
     </content>
   </xldf:append>
   <xldf:add-subsection>
@@ -318,11 +959,131 @@
         <text>
           Distributivity rules for optionality modifier such as these:
         </text>
-        <formula>(x? y?)? = x? y?</formula>
-        <formula>(x^\star y?)? = x^\star y?</formula>
-        <formula>(x? y^\star)? = x? y^\star</formula>
-        <formula>(x^\star y^\star)? = x^\star y^\star</formula>
-        <formula>(x | y)? = x? | y?</formula>
+        <formula>
+          <!--(x? y?)? = x? y?-->
+          <mml:math>
+            <mml:mrow>
+              <mml:mfenced>
+                <mml:mi>x</mml:mi>
+                <mml:mo>?</mml:mo>
+                <mml:mi>y</mml:mi>
+                <mml:mo>?</mml:mo>
+              </mml:mfenced>
+              <mml:mo>?</mml:mo>
+            </mml:mrow>
+            <mml:mo>=</mml:mo>
+            <mml:mrow>
+              <mml:mi>x</mml:mi>
+              <mml:mo>?</mml:mo>
+              <mml:mi>y</mml:mi>
+              <mml:mo>?</mml:mo>
+            </mml:mrow>
+          </mml:math>
+        </formula>
+        <formula>
+          <!--(x^\star y?)? = x^\star y?-->
+          <mml:math>
+            <mml:mrow>
+              <mml:mfenced>
+                <mml:msup>
+                  <mml:mi>x</mml:mi>
+                  <mml:mo>*</mml:mo>
+                </mml:msup>
+                <mml:mi>y</mml:mi>
+                <mml:mo>?</mml:mo>
+              </mml:mfenced>
+              <mml:mo>?</mml:mo>
+            </mml:mrow>
+            <mml:mo>=</mml:mo>
+            <mml:mrow>
+              <mml:msup>
+                <mml:mi>x</mml:mi>
+                <mml:mo>*</mml:mo>
+              </mml:msup>
+              <mml:mi>y</mml:mi>
+              <mml:mo>?</mml:mo>
+            </mml:mrow>
+          </mml:math>
+        </formula>
+        <formula>
+          <!--(x? y^\star)? = x? y^\star-->
+          <mml:math>
+            <mml:mrow>
+              <mml:mfenced>
+                 <mml:mi>x</mml:mi>
+                <mml:mo>?</mml:mo>
+              <mml:msup>
+                  <mml:mi>y</mml:mi>
+                  <mml:mo>*</mml:mo>
+                </mml:msup>
+               </mml:mfenced>
+              <mml:mo>?</mml:mo>
+            </mml:mrow>
+            <mml:mo>=</mml:mo>
+            <mml:mrow>
+              <mml:mi>x</mml:mi>
+              <mml:mo>?</mml:mo>
+              <mml:msup>
+                <mml:mi>y</mml:mi>
+                <mml:mo>*</mml:mo>
+              </mml:msup>
+            </mml:mrow>
+          </mml:math>
+        </formula>
+        <formula>
+          <!--(x^\star y^\star)? = x^\star y^\star-->
+          <mml:math>
+            <mml:mrow>
+              <mml:mfenced>
+                <mml:msup>
+                  <mml:mi>x</mml:mi>
+                  <mml:mo>*</mml:mo>
+                </mml:msup>
+                <mml:msup>
+                  <mml:mi>y</mml:mi>
+                  <mml:mo>*</mml:mo>
+                </mml:msup>
+              </mml:mfenced>
+              <mml:mo>?</mml:mo>
+            </mml:mrow>
+            <mml:mo>=</mml:mo>
+            <mml:mrow>
+              <mml:msup>
+                <mml:mi>x</mml:mi>
+                <mml:mo>*</mml:mo>
+              </mml:msup>
+              <mml:msup>
+                <mml:mi>y</mml:mi>
+                <mml:mo>*</mml:mo>
+              </mml:msup>
+            </mml:mrow>
+          </mml:math>
+        </formula>
+        <formula>
+          <!--(x | y)? = x? | y?-->
+          <mml:math>
+            <mml:mrow>
+              <mml:mfenced>
+                  <mml:mi>x</mml:mi>
+                  <mml:mo>|</mml:mo>
+                  <mml:mi>y</mml:mi>
+              </mml:mfenced>
+              <mml:mo>?</mml:mo>
+            </mml:mrow>
+            <mml:mo>=</mml:mo>
+            <mml:mrow>
+              <mml:mrow>
+                <mml:mi>x</mml:mi>
+                <mml:mo>?</mml:mo>
+              </mml:mrow>
+              <mml:mo>|</mml:mo>
+              <mml:mrow>
+                <mml:mi>y</mml:mi>
+                <mml:mo>?</mml:mo>
+              </mml:mrow>
+            </mml:mrow>
+          </mml:math>
+        </formula>
         <text>
           are not explicitly covered by <ldf:keyword>massage</ldf:keyword> since it is
           possible to emulate them with a sequence of abovementioned patterns of
@@ -333,7 +1094,7 @@
         </text>
       </content>
     </example>
-    <to>element-massage</to>
+    <to>massage</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>massage-example</target>
@@ -373,8 +1134,8 @@
   </xldf:append>
 
   <xldf:place>
-    <section>element-distribute</section>
-    <inside>group-refactoring-transformation</inside>
+    <section>distribute</section>
+    <inside>refactoring-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <semantics>
@@ -392,7 +1153,7 @@
         </text>
       </content>
     </semantics>
-    <to>element-distribute</to>
+    <to>distribute</to>
   </xldf:add-subsection>
   <xldf:add-subsection>
     <example id="distribute-example">
@@ -400,7 +1161,7 @@
         <text>For instance,</text>
       </content>
     </example>
-    <to>element-distribute</to>
+    <to>distribute</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>distribute-example</target>
@@ -429,8 +1190,8 @@
   </xldf:import-grammar>
 
   <xldf:place>
-    <section>element-factor</section>
-    <inside>group-refactoring-transformation</inside>
+    <section>factor</section>
+    <inside>refactoring-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <semantics>
@@ -457,7 +1218,7 @@
         </text>
       </content>
     </semantics>
-    <to>element-factor</to>
+    <to>factor</to>
   </xldf:add-subsection>
   <xldf:add-subsection>
     <example id="factor-example">
@@ -465,7 +1226,7 @@
         <text>For instance,</text>
       </content>
     </example>
-    <to>element-factor</to>
+    <to>factor</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>factor-example</target>
@@ -494,11 +1255,11 @@
   </xldf:import-grammar>
 
   <xldf:place>
-    <section>element-deyaccify</section>
-    <inside>group-refactoring-transformation</inside>
+    <section>deyaccify</section>
+    <inside>refactoring-transformation</inside>
   </xldf:place>
   <xldf:append>
-    <where>element-deyaccify</where>
+    <where>deyaccify</where>
     <content>
       <text>
         Deyaccification uses several general patterns. Left recursion like this:
@@ -506,11 +1267,11 @@
     </content>
   </xldf:append>
   <xldf:import-grammar>
-    <target>element-deyaccify</target>
+    <target>deyaccify</target>
     <file>../../transformation/xbgf/tests/deyaccify_left.bgf</file>
   </xldf:import-grammar>
   <xldf:append>
-    <where>element-deyaccify</where>
+    <where>deyaccify</where>
     <content>
       <text>
         Becomes:
@@ -518,11 +1279,11 @@
     </content>
   </xldf:append>
   <xldf:import-grammar>
-    <target>element-deyaccify</target>
+    <target>deyaccify</target>
     <file>../../transformation/xbgf/tests/deyaccify_left.baseline</file>
   </xldf:import-grammar>
   <xldf:append>
-    <where>element-deyaccify</where>
+    <where>deyaccify</where>
     <content>
       <text>
         Right recursion like this:
@@ -530,11 +1291,11 @@
     </content>
   </xldf:append>
   <xldf:import-grammar>
-    <target>element-deyaccify</target>
+    <target>deyaccify</target>
     <file>../../transformation/xbgf/tests/deyaccify_right.bgf</file>
   </xldf:import-grammar>
   <xldf:append>
-    <where>element-deyaccify</where>
+    <where>deyaccify</where>
     <content>
       <text>
         Becomes:
@@ -542,11 +1303,11 @@
     </content>
   </xldf:append>
   <xldf:import-grammar>
-    <target>element-deyaccify</target>
+    <target>deyaccify</target>
     <file>../../transformation/xbgf/tests/deyaccify_right.baseline</file>
   </xldf:import-grammar>
   <xldf:append>
-    <where>element-deyaccify</where>
+    <where>deyaccify</where>
     <content>
       <text>
         In either case, it is checked if bar and wez are the same nonterminal.
@@ -555,13 +1316,13 @@
     </content>
   </xldf:append>
   <xldf:import-grammar>
-    <target>element-deyaccify</target>
+    <target>deyaccify</target>
     <file>../../transformation/xbgf/tests/deyaccify_right_plus.baseline</file>
   </xldf:import-grammar>
 
   <xldf:place>
-    <section>element-yaccify</section>
-    <inside>group-refactoring-transformation</inside>
+    <section>yaccify</section>
+    <inside>refactoring-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <semantics>
@@ -583,7 +1344,7 @@
         </text>
       </content>
     </semantics>
-    <to>element-yaccify</to>
+    <to>yaccify</to>
   </xldf:add-subsection>
   <xldf:add-subsection>
     <example id="yaccify-example">
@@ -591,7 +1352,7 @@
         <text>For instance, this piece of grammar:</text>
       </content>
     </example>
-    <to>element-yaccify</to>
+    <to>yaccify</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>yaccify-example</target>
@@ -641,8 +1402,8 @@
   </xldf:import-grammar>
 
   <xldf:place>
-    <section>element-eliminate</section>
-    <inside>group-refactoring-transformation</inside>
+    <section>eliminate</section>
+    <inside>refactoring-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <example id="eliminate-example">
@@ -650,7 +1411,7 @@
         <text>For instance,</text>
       </content>
     </example>
-    <to>element-eliminate</to>
+    <to>eliminate</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>eliminate-example</target>
@@ -679,8 +1440,8 @@
   </xldf:import-grammar>
 
   <xldf:place>
-    <section>element-introduce</section>
-    <inside>group-refactoring-transformation</inside>
+    <section>introduce</section>
+    <inside>refactoring-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <example id="introduce-example">
@@ -688,7 +1449,7 @@
         <text>For instance,</text>
       </content>
     </example>
-    <to>element-introduce</to>
+    <to>introduce</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>introduce-example</target>
@@ -717,8 +1478,8 @@
   </xldf:import-grammar>
 
   <xldf:place>
-    <section>element-import</section>
-    <inside>group-refactoring-transformation</inside>
+    <section>import</section>
+    <inside>refactoring-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <semantics>
@@ -739,7 +1500,7 @@
         </text>
       </content>
     </semantics>
-    <to>element-import</to>
+    <to>import</to>
   </xldf:add-subsection>
   <xldf:add-subsection>
     <example id="import-example">
@@ -747,7 +1508,7 @@
         <text>For instance,</text>
       </content>
     </example>
-    <to>element-import</to>
+    <to>import</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>import-example</target>
@@ -776,8 +1537,8 @@
   </xldf:import-grammar>
 
   <xldf:place>
-    <section>element-vertical</section>
-    <inside>group-refactoring-transformation</inside>
+    <section>vertical</section>
+    <inside>refactoring-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <example id="vertical-example">
@@ -785,7 +1546,7 @@
         <text>If the original production contained selectors:</text>
       </content>
     </example>
-    <to>element-vertical</to>
+    <to>vertical</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>vertical-example</target>
@@ -814,8 +1575,8 @@
   </xldf:import-grammar>
 
   <xldf:place>
-    <section>element-horizontal</section>
-    <inside>group-refactoring-transformation</inside>
+    <section>horizontal</section>
+    <inside>refactoring-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <example id="horizontal-example">
@@ -823,7 +1584,7 @@
         <text>If some or all of the original productions are labelled:</text>
       </content>
     </example>
-    <to>element-horizontal</to>
+    <to>horizontal</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>horizontal-example</target>
@@ -852,8 +1613,8 @@
   </xldf:import-grammar>
 
   <xldf:place>
-    <section>element-rassoc</section>
-    <inside>group-refactoring-transformation</inside>
+    <section>rassoc</section>
+    <inside>refactoring-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <example id="rassoc-example">
@@ -861,7 +1622,7 @@
         <text>For instance,</text>
       </content>
     </example>
-    <to>element-rassoc</to>
+    <to>rassoc</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>rassoc-example</target>
@@ -890,8 +1651,8 @@
   </xldf:import-grammar>
   
   <xldf:place>
-    <section>element-lassoc</section>
-    <inside>group-refactoring-transformation</inside>
+    <section>lassoc</section>
+    <inside>refactoring-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <example id="lassoc-example">
@@ -899,7 +1660,7 @@
         <text>For instance,</text>
       </content>
     </example>
-    <to>element-lassoc</to>
+    <to>lassoc</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>lassoc-example</target>
@@ -928,7 +1689,7 @@
   </xldf:import-grammar>
 
   <xldf:change-role>
-    <scope>group-refactoring-transformation</scope>
+    <scope>refactoring-transformation</scope>
     <from>syntax</from>
     <to>synopsis</to>
   </xldf:change-role>
diff --git a/topics/languedoc/xbgf/xldf/completeRevSections.xldf b/topics/languedoc/xbgf/xldf/completeRevSections.xldf
index 23212858..2e5d9d8d 100644
--- a/topics/languedoc/xbgf/xldf/completeRevSections.xldf
+++ b/topics/languedoc/xbgf/xldf/completeRevSections.xldf
@@ -7,7 +7,7 @@
 
   <!-- beautify xbgf -->
   <xldf:transform-grammar>
-    <target>element-define</target>
+    <target>define</target>
     <xbgf:project>
       <bgf:production>
         <nonterminal>define</nonterminal>
@@ -38,7 +38,7 @@
     </xbgf:project>
   </xldf:transform-grammar>
   <xldf:transform-grammar>
-    <target>element-inject</target>
+    <target>inject</target>
     <xbgf:project>
       <bgf:production>
         <nonterminal>inject</nonterminal>
@@ -65,7 +65,7 @@
     </xbgf:project>
   </xldf:transform-grammar>
   <xldf:transform-grammar>
-    <target>element-project</target>
+    <target>project</target>
     <xbgf:project>
       <bgf:production>
         <nonterminal>project</nonterminal>
@@ -92,7 +92,7 @@
     </xbgf:project>
   </xldf:transform-grammar>
   <xldf:transform-grammar>
-    <target>element-redefine</target>
+    <target>redefine</target>
     <xbgf:project>
       <bgf:production>
         <nonterminal>redefine</nonterminal>
@@ -123,7 +123,7 @@
     </xbgf:project>
   </xldf:transform-grammar>
   <xldf:transform-grammar>
-    <target>element-replace</target>
+    <target>replace</target>
     <xbgf:project>
       <bgf:production>
         <nonterminal>replace</nonterminal>
@@ -174,11 +174,11 @@
   </xldf:retitle>
   
   <xldf:place>
-    <section>element-abstractize</section>
-    <inside>group-concrete-revising-transformation</inside>
+    <section>abstractize</section>
+    <inside>concrete-revising-transformation</inside>
   </xldf:place>
   <xldf:transform-grammar>
-    <target>element-abstractize</target>
+    <target>abstractize</target>
     <xbgf:fold>
       <nonterminal>marked-production</nonterminal>
       <in>
@@ -194,7 +194,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-abstractize</to>
+    <to>abstractize</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>abstractize-example</target>
@@ -223,11 +223,11 @@
   </xldf:import-grammar>
   
   <xldf:place>
-    <section>element-concretize</section>
-    <inside>group-concrete-revising-transformation</inside>
+    <section>concretize</section>
+    <inside>concrete-revising-transformation</inside>
   </xldf:place>
   <xldf:transform-grammar>
-    <target>element-concretize</target>
+    <target>concretize</target>
     <xbgf:fold>
       <nonterminal>marked-production</nonterminal>
       <in>
@@ -243,7 +243,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-concretize</to>
+    <to>concretize</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>concretize-example</target>
@@ -272,8 +272,8 @@
   </xldf:import-grammar>
   
   <xldf:place>
-    <section>element-permute</section>
-    <inside>group-concrete-revising-transformation</inside>
+    <section>permute</section>
+    <inside>concrete-revising-transformation</inside>
   </xldf:place>
 
   <xldf:add-subsection>
@@ -282,7 +282,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-permute</to>
+    <to>permute</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>permute-example</target>
@@ -319,26 +319,26 @@
   </xldf:retitle>
   
   <xldf:place>
-    <section>element-define</section>
-    <inside>group-abstract-revising-transformation</inside>
+    <section>define</section>
+    <inside>abstract-revising-transformation</inside>
   </xldf:place>
   
   <xldf:place>
-    <section>element-undefine</section>
-    <inside>group-abstract-revising-transformation</inside>
+    <section>undefine</section>
+    <inside>abstract-revising-transformation</inside>
   </xldf:place>
   
   <xldf:place>
-    <section>element-redefine</section>
-    <inside>group-abstract-revising-transformation</inside>
+    <section>redefine</section>
+    <inside>abstract-revising-transformation</inside>
   </xldf:place>
   
   <xldf:place>
-    <section>element-inject</section>
-    <inside>group-abstract-revising-transformation</inside>
+    <section>inject</section>
+    <inside>abstract-revising-transformation</inside>
   </xldf:place>
   <xldf:transform-grammar>
-    <target>element-inject</target>
+    <target>inject</target>
     <xbgf:fold>
       <nonterminal>marked-production</nonterminal>
       <in>
@@ -354,7 +354,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-inject</to>
+    <to>inject</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>inject-example</target>
@@ -384,11 +384,11 @@
 
 
   <xldf:place>
-    <section>element-project</section>
-    <inside>group-abstract-revising-transformation</inside>
+    <section>project</section>
+    <inside>abstract-revising-transformation</inside>
   </xldf:place>
   <xldf:transform-grammar>
-    <target>element-project</target>
+    <target>project</target>
     <xbgf:fold>
       <nonterminal>marked-production</nonterminal>
       <in>
@@ -404,7 +404,7 @@
         <text>Given the input:</text>
       </content>
     </example>
-    <to>element-project</to>
+    <to>project</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>project-example</target>
@@ -433,8 +433,8 @@
   </xldf:import-grammar>
   
   <xldf:place>
-    <section>element-replace</section>
-    <inside>group-abstract-revising-transformation</inside>
+    <section>replace</section>
+    <inside>abstract-revising-transformation</inside>
   </xldf:place>
   <xldf:add-subsection>
     <example id="replace-example">
@@ -446,7 +446,7 @@
         </text>
       </content>
     </example>
-    <to>element-replace</to>
+    <to>replace</to>
   </xldf:add-subsection>
   <xldf:import-grammar>
     <target>replace-example</target>
@@ -475,12 +475,12 @@
   </xldf:import-grammar>
 
   <xldf:change-role>
-    <scope>group-concrete-revising-transformation</scope>
+    <scope>concrete-revising-transformation</scope>
     <from>syntax</from>
     <to>synopsis</to>
   </xldf:change-role>
   <xldf:change-role>
-    <scope>group-abstract-revising-transformation</scope>
+    <scope>abstract-revising-transformation</scope>
     <from>syntax</from>
     <to>synopsis</to>
   </xldf:change-role>
diff --git a/topics/languedoc/xldf/xldf.xldf b/topics/languedoc/xldf/xldf.xldf
index 8435357d..d4adc10b 100644
--- a/topics/languedoc/xldf/xldf.xldf
+++ b/topics/languedoc/xldf/xldf.xldf
@@ -12,8 +12,8 @@
     <file>xldf/renameStr.xldf</file>
   </xldf:transform-document>
   <xldf:combine>
-    <section>group-relative</section>
-    <with>element-insert</with>
+    <section>relative</section>
+    <with>insert</with>
   </xldf:combine>
 
 </xldf:evolution-sequence>
\ No newline at end of file
diff --git a/topics/languedoc/xldf/xldf/dropLdf.xldf b/topics/languedoc/xldf/xldf/dropLdf.xldf
index ce957544..a58f2ff9 100644
--- a/topics/languedoc/xldf/xldf/dropLdf.xldf
+++ b/topics/languedoc/xldf/xldf/dropLdf.xldf
@@ -3,82 +3,79 @@
   xmlns:xldf="http://planet-sl.org/xldf">
 
   <xldf:drop>
-    <section>complexType-listOfTerms</section>
+    <section>listOfTerms</section>
   </xldf:drop>
   <xldf:drop>
-    <section>complexType-listOfInternalLinks</section>
+    <section>simpleList</section>
   </xldf:drop>
   <xldf:drop>
-    <section>complexType-simpleList</section>
+    <section>simpleText</section>
   </xldf:drop>
   <xldf:drop>
-    <section>complexType-simpleText</section>
+    <section>tableRow</section>
   </xldf:drop>
   <xldf:drop>
-    <section>complexType-tableRow</section>
+    <section>simpleTable</section>
   </xldf:drop>
   <xldf:drop>
-    <section>complexType-simpleTable</section>
+    <section>simpleTextElement</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-simpleTextElement</section>
+    <section>simpleFigure</section>
   </xldf:drop>
   <xldf:drop>
-    <section>complexType-simpleFigure</section>
+    <section>simpleSection</section>
   </xldf:drop>
   <xldf:drop>
-    <section>complexType-simpleSection</section>
+    <section>structuredSection</section>
   </xldf:drop>
   <xldf:drop>
-    <section>complexType-structuredSection</section>
+    <section>structuredSectionElement</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-structuredSectionElement</section>
+    <section>normative</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-normative</section>
+    <section>informative</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-informative</section>
+    <section>lexicalSection</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-lexicalSection</section>
+    <section>status</section>
   </xldf:drop>
   <xldf:drop>
-    <section>simpleType-status</section>
+    <section>generated</section>
   </xldf:drop>
   <xldf:drop>
-    <section>simpleType-generated</section>
+    <section>body</section>
   </xldf:drop>
   <xldf:drop>
-    <section>simpleType-body</section>
+    <section>document</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-document</section>
+    <section>titlePage</section>
   </xldf:drop>
   <xldf:drop>
-    <section>complexType-titlePage</section>
+    <section>frontSection</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-frontSection</section>
+    <section>frontList</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-frontList</section>
+    <section>runnableType</section>
   </xldf:drop>
   <xldf:drop>
-    <section>complexType-runnableType</section>
+    <section>mixedType</section>
   </xldf:drop>
   <xldf:drop>
-    <section>complexType-mixedType</section>
+    <section>keyword</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-keyword</section>
-  </xldf:drop>
-  <xldf:drop>
-    <section>element-link</section>
+    <section>link</section>
   </xldf:drop>
    <xldf:drop>
-    <section>element-code</section>
+    <section>code</section>
   </xldf:drop>
  
 </xldf:evolution-sequence>
\ No newline at end of file
diff --git a/topics/languedoc/xldf/xldf/dropXbgf.xldf b/topics/languedoc/xldf/xldf/dropXbgf.xldf
index 1feb723c..e5b525ee 100644
--- a/topics/languedoc/xldf/xldf/dropXbgf.xldf
+++ b/topics/languedoc/xldf/xldf/dropXbgf.xldf
@@ -3,175 +3,175 @@
   xmlns:xldf="http://planet-sl.org/xldf">
 
   <xldf:drop>
-    <section>element-sequence</section>
+    <section>sequence</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-atomic</section>
+    <section>atomic</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-transformation</section>
+    <section>transformation</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-folding-transformation</section>
+    <section>folding-transformation</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-refactoring-transformation</section>
+    <section>refactoring-transformation</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-increasing-transformation</section>
+    <section>increasing-transformation</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-decreasing-transformation</section>
+    <section>decreasing-transformation</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-concrete-revising-transformation</section>
+    <section>concrete-revising-transformation</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-abstract-revising-transformation</section>
+    <section>abstract-revising-transformation</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-decorative-transformation</section>
+    <section>decorative-transformation</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-add</section>
+    <section>add</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-appear</section>
+    <section>appear</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-chain</section>
+    <section>chain</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-deanonymize</section>
+    <section>deanonymize</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-define</section>
+    <section>define</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-disappear</section>
+    <section>disappear</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-downgrade</section>
+    <section>downgrade</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-designate</section>
+    <section>designate</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-unlabel</section>
+    <section>unlabel</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-deyaccify</section>
+    <section>deyaccify</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-distribute</section>
+    <section>distribute</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-dump</section>
+    <section>dump</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-extract</section>
+    <section>extract</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-factor</section>
+    <section>factor</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-fold</section>
+    <section>fold</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-horizontal</section>
+    <section>horizontal</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-inject</section>
+    <section>inject</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-inline</section>
+    <section>inline</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-introduce</section>
+    <section>introduce</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-import</section>
+    <section>import</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-lassoc</section>
+    <section>lassoc</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-massage</section>
+    <section>massage</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-narrow</section>
+    <section>narrow</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-permute</section>
+    <section>permute</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-project</section>
+    <section>project</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-rassoc</section>
+    <section>rassoc</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-redefine</section>
+    <section>redefine</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-remove</section>
+    <section>remove</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-rename</section>
+    <section>rename</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-replace</section>
+    <section>replace</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-reroot</section>
+    <section>reroot</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-abridge</section>
+    <section>abridge</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-detour</section>
+    <section>detour</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-strip</section>
+    <section>strip</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-concretize</section>
+    <section>concretize</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-unchain</section>
+    <section>unchain</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-undefine</section>
+    <section>undefine</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-unfold</section>
+    <section>unfold</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-unite</section>
+    <section>unite</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-abstractize</section>
+    <section>abstractize</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-anonymize</section>
+    <section>anonymize</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-vertical</section>
+    <section>vertical</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-widen</section>
+    <section>widen</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-yaccify</section>
+    <section>yaccify</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-upgrade</section>
+    <section>upgrade</section>
   </xldf:drop>
   <xldf:drop>
-    <section>group-scope</section>
+    <section>scope</section>
   </xldf:drop>
   <xldf:drop>
-    <section>element-eliminate</section>
+    <section>eliminate</section>
   </xldf:drop>
   
 </xldf:evolution-sequence>
\ No newline at end of file
diff --git a/topics/languedoc/xldf/xldf/renameStr.xldf b/topics/languedoc/xldf/xldf/renameStr.xldf
index 047e435b..028aba89 100644
--- a/topics/languedoc/xldf/xldf/renameStr.xldf
+++ b/topics/languedoc/xldf/xldf/renameStr.xldf
@@ -5,7 +5,7 @@
   xmlns:xldf="http://planet-sl.org/xldf">
 
   <xldf:transform-grammar>
-    <target>element-add-figure</target>
+    <target>add-figure</target>
     <xbgf:replace>
       <bgf:expression>
         <value>string</value>
@@ -16,7 +16,7 @@
     </xbgf:replace>
   </xldf:transform-grammar>
   <xldf:transform-grammar>
-    <target>element-add-subsection</target>
+    <target>add-subsection</target>
     <xbgf:replace>
       <bgf:expression>
         <value>string</value>
@@ -27,7 +27,7 @@
     </xbgf:replace>
   </xldf:transform-grammar>
   <xldf:transform-grammar>
-    <target>element-combine</target>
+    <target>combine</target>
     <xbgf:replace>
       <bgf:expression>
         <value>string</value>
@@ -38,7 +38,7 @@
     </xbgf:replace>
   </xldf:transform-grammar>
   <xldf:transform-grammar>
-    <target>element-drop</target>
+    <target>drop</target>
     <xbgf:replace>
       <bgf:expression>
         <value>string</value>
@@ -49,7 +49,7 @@
     </xbgf:replace>
   </xldf:transform-grammar>
   <xldf:transform-grammar>
-    <target>element-extract-subsection</target>
+    <target>extract-subsection</target>
     <xbgf:replace>
       <bgf:expression>
         <value>string</value>
@@ -78,7 +78,7 @@
     </xbgf:replace>
   </xldf:transform-grammar>
   <xldf:transform-grammar>
-    <target>element-import-grammar</target>
+    <target>import-grammar</target>
     <xbgf:replace>
       <bgf:expression>
         <selectable>
@@ -99,7 +99,7 @@
     </xbgf:replace>
   </xldf:transform-grammar>
   <xldf:transform-grammar>
-    <target>element-import-sample</target>
+    <target>import-sample</target>
     <xbgf:replace>
       <bgf:expression>
         <selectable>
@@ -120,7 +120,7 @@
     </xbgf:replace>
   </xldf:transform-grammar>
   <xldf:transform-grammar>
-    <target>element-place</target>
+    <target>place</target>
     <xbgf:replace>
       <bgf:expression>
         <value>string</value>
@@ -131,7 +131,7 @@
     </xbgf:replace>
   </xldf:transform-grammar>
   <xldf:transform-grammar>
-    <target>element-retitle</target>
+    <target>retitle</target>
     <xbgf:replace>
       <bgf:expression>
         <selectable>
@@ -152,7 +152,7 @@
     </xbgf:replace>
   </xldf:transform-grammar>
   <xldf:transform-grammar>
-    <target>element-remove-section</target>
+    <target>remove-section</target>
     <xbgf:replace>
       <bgf:expression>
         <value>string</value>
@@ -163,7 +163,7 @@
     </xbgf:replace>
   </xldf:transform-grammar>
   <xldf:transform-grammar>
-    <target>element-transform-grammar</target>
+    <target>transform-grammar</target>
     <xbgf:replace>
       <bgf:expression>
         <value>string</value>
@@ -174,7 +174,7 @@
     </xbgf:replace>
   </xldf:transform-grammar>
   <xldf:transform-grammar>
-    <target>group-relative</target>
+    <target>relative</target>
     <xbgf:replace>
       <bgf:expression>
         <value>string</value>
@@ -187,8 +187,8 @@
   
 
   <xldf:combine>
-    <section>simpleType-sectionRole</section>
-    <with>element-change-role</with>
+    <section>sectionRole</section>
+    <with>change-role</with>
   </xldf:combine>
 
 </xldf:evolution-sequence>
\ No newline at end of file