diff --git a/topics/transformation/xbgf/tests/factor3.baseline b/topics/transformation/xbgf/tests/factor3.baseline
index 487aad4f..26108388 100644
--- a/topics/transformation/xbgf/tests/factor3.baseline
+++ b/topics/transformation/xbgf/tests/factor3.baseline
@@ -1,38 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xns1:grammar xmlns:xns1="http://planet-sl.org/bgf">
-  <xns1:production>
+<bgf:grammar xmlns:bgf="http://planet-sl.org/bgf">
+  <bgf:production>
     <nonterminal>a</nonterminal>
-    <xns1:expression>
-      <sequence>
-	<xns1:expression>
-	  <nonterminal>b</nonterminal>
-	</xns1:expression>
-	<xns1:expression>
-	  <choice>
-	    <xns1:expression>
-	      <sequence>
-		<xns1:expression>
-		  <nonterminal>c</nonterminal>
-		</xns1:expression>
-		<xns1:expression>
-		  <nonterminal>d</nonterminal>
-		</xns1:expression>
-	      </sequence>
-	    </xns1:expression>
-	    <xns1:expression>
-	      <sequence>
-		<xns1:expression>
-		  <nonterminal>e</nonterminal>
-		</xns1:expression>
-		<xns1:expression>
-		  <nonterminal>f</nonterminal>
-		</xns1:expression>
-	      </sequence>
-	    </xns1:expression>
-	  </choice>
-	</xns1:expression>
-      </sequence>
-    </xns1:expression>
-  </xns1:production>
-</xns1:grammar>
\ No newline at end of file
+    <bgf:expression>
+      <choice>
+        <bgf:expression>
+          <nonterminal>a</nonterminal>
+        </bgf:expression>
+        <bgf:expression>
+          <nonterminal>b</nonterminal>
+        </bgf:expression>
+        <bgf:expression>
+          <sequence>
+            <bgf:expression>
+              <nonterminal>c</nonterminal>
+            </bgf:expression>
+            <bgf:expression>
+              <choice>
+                <bgf:expression>
+                  <sequence>
+                    <bgf:expression>
+                      <nonterminal>d</nonterminal>
+                    </bgf:expression>
+                    <bgf:expression>
+                      <nonterminal>e</nonterminal>
+                    </bgf:expression>
+                  </sequence>
+                </bgf:expression>
+                <bgf:expression>
+                  <sequence>
+                    <bgf:expression>
+                      <nonterminal>f</nonterminal>
+                    </bgf:expression>
+                    <bgf:expression>
+                      <nonterminal>g</nonterminal>
+                    </bgf:expression>
+                  </sequence>
+                </bgf:expression>
+              </choice>
+            </bgf:expression>
+          </sequence>
+        </bgf:expression>
+        <bgf:expression>
+          <nonterminal>h</nonterminal>
+        </bgf:expression>
+        <bgf:expression>
+          <nonterminal>i</nonterminal>
+        </bgf:expression>
+      </choice>
+    </bgf:expression>
+  </bgf:production>
+</bgf:grammar>
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/factor3.bgf b/topics/transformation/xbgf/tests/factor3.bgf
index 509332a3..bf020ad0 100644
--- a/topics/transformation/xbgf/tests/factor3.bgf
+++ b/topics/transformation/xbgf/tests/factor3.bgf
@@ -3,32 +3,44 @@
     <nonterminal>a</nonterminal>
     <bgf:expression>
       <choice>
+        <bgf:expression>
+          <nonterminal>a</nonterminal>
+        </bgf:expression>
+        <bgf:expression>
+          <nonterminal>b</nonterminal>
+        </bgf:expression>
         <bgf:expression>
           <sequence>
-            <bgf:expression>
-              <nonterminal>b</nonterminal>
-            </bgf:expression>
             <bgf:expression>
               <nonterminal>c</nonterminal>
             </bgf:expression>
             <bgf:expression>
               <nonterminal>d</nonterminal>
             </bgf:expression>
+            <bgf:expression>
+              <nonterminal>e</nonterminal>
+            </bgf:expression>
           </sequence>
         </bgf:expression>
         <bgf:expression>
           <sequence>
             <bgf:expression>
-              <nonterminal>b</nonterminal>
+              <nonterminal>c</nonterminal>
             </bgf:expression>
             <bgf:expression>
-              <nonterminal>e</nonterminal>
+              <nonterminal>f</nonterminal>
             </bgf:expression>
             <bgf:expression>
-              <nonterminal>f</nonterminal>
+              <nonterminal>g</nonterminal>
             </bgf:expression>
           </sequence>
         </bgf:expression>
+        <bgf:expression>
+          <nonterminal>h</nonterminal>
+        </bgf:expression>
+        <bgf:expression>
+          <nonterminal>i</nonterminal>
+        </bgf:expression>
       </choice>
     </bgf:expression>
   </bgf:production>
diff --git a/topics/transformation/xbgf/tests/factor3.xbgf b/topics/transformation/xbgf/tests/factor3.xbgf
index f61dadd7..0f870895 100644
--- a/topics/transformation/xbgf/tests/factor3.xbgf
+++ b/topics/transformation/xbgf/tests/factor3.xbgf
@@ -7,27 +7,27 @@
       <choice>
         <bgf:expression>
           <sequence>
-            <bgf:expression>
-              <nonterminal>b</nonterminal>
-            </bgf:expression>
             <bgf:expression>
               <nonterminal>c</nonterminal>
             </bgf:expression>
             <bgf:expression>
               <nonterminal>d</nonterminal>
             </bgf:expression>
+            <bgf:expression>
+              <nonterminal>e</nonterminal>
+            </bgf:expression>
           </sequence>
         </bgf:expression>
         <bgf:expression>
           <sequence>
             <bgf:expression>
-              <nonterminal>b</nonterminal>
+              <nonterminal>c</nonterminal>
             </bgf:expression>
             <bgf:expression>
-              <nonterminal>e</nonterminal>
+              <nonterminal>f</nonterminal>
             </bgf:expression>
             <bgf:expression>
-              <nonterminal>f</nonterminal>
+              <nonterminal>g</nonterminal>
             </bgf:expression>
           </sequence>
         </bgf:expression>
@@ -36,27 +36,27 @@
     <bgf:expression>
       <sequence>
         <bgf:expression>
-          <nonterminal>b</nonterminal>
+          <nonterminal>c</nonterminal>
         </bgf:expression>
         <bgf:expression>
           <choice>
             <bgf:expression>
               <sequence>
                 <bgf:expression>
-                  <nonterminal>e</nonterminal>
+                  <nonterminal>d</nonterminal>
                 </bgf:expression>
                 <bgf:expression>
-                  <nonterminal>f</nonterminal>
+                  <nonterminal>e</nonterminal>
                 </bgf:expression>
               </sequence>
             </bgf:expression>
             <bgf:expression>
               <sequence>
                 <bgf:expression>
-                  <nonterminal>c</nonterminal>
+                  <nonterminal>f</nonterminal>
                 </bgf:expression>
                 <bgf:expression>
-                  <nonterminal>d</nonterminal>
+                  <nonterminal>g</nonterminal>
                 </bgf:expression>
               </sequence>
             </bgf:expression>
diff --git a/topics/transformation/xbgf/tests/massage_ch_xx1.xbgf b/topics/transformation/xbgf/tests/massage_ch_xx1.xbgf
index 8f6e1042..964adcc1 100644
--- a/topics/transformation/xbgf/tests/massage_ch_xx1.xbgf
+++ b/topics/transformation/xbgf/tests/massage_ch_xx1.xbgf
@@ -39,9 +39,6 @@
       </choice>
     </bgf:expression>
   </xbgf:massage>
-  <xbgf:distribute>
-    <nonterminal>foo</nonterminal>
-  </xbgf:distribute>
   <xbgf:anonymize>
     <bgf:production>
       <nonterminal>foo</nonterminal>
diff --git a/topics/transformation/xbgf/tests/massage_ch_xx2.xbgf b/topics/transformation/xbgf/tests/massage_ch_xx2.xbgf
index 4ac0420c..307414d9 100644
--- a/topics/transformation/xbgf/tests/massage_ch_xx2.xbgf
+++ b/topics/transformation/xbgf/tests/massage_ch_xx2.xbgf
@@ -120,7 +120,4 @@
     <label>two</label>
   </xbgf:unlabel>
   <xbgf:horizontal>foo</xbgf:horizontal>
-  <xbgf:distribute>
-    <nonterminal>foo</nonterminal>
-  </xbgf:distribute>
 </xbgf:sequence>
\ No newline at end of file
diff --git a/topics/transformation/xbgf/tests/massage_distr_ch.xbgf b/topics/transformation/xbgf/tests/massage_distr_ch.xbgf
index c1e984e0..f4a87195 100644
--- a/topics/transformation/xbgf/tests/massage_distr_ch.xbgf
+++ b/topics/transformation/xbgf/tests/massage_distr_ch.xbgf
@@ -173,20 +173,36 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:anonymize>
+  <xbgf:massage>
+    <bgf:expression>
+      <choice>
+        <bgf:expression>
+          <nonterminal>bar</nonterminal>
+        </bgf:expression>
+        <bgf:expression>
+          <epsilon/>
+        </bgf:expression>
+      </choice>
+    </bgf:expression>
+    <bgf:expression>
+      <optional>
+        <bgf:expression>
+          <nonterminal>bar</nonterminal>
+        </bgf:expression>
+      </optional>
+    </bgf:expression>
+  </xbgf:massage>
   <xbgf:anonymize>
     <bgf:production>
       <nonterminal>foo</nonterminal>
       <bgf:expression>
         <choice>
           <bgf:expression>
-            <choice>
+            <optional>
               <bgf:expression>
                 <nonterminal>bar</nonterminal>
               </bgf:expression>
-              <bgf:expression>
-                <epsilon/>
-              </bgf:expression>
-            </choice>
+            </optional>
           </bgf:expression>
           <bgf:expression>
             <choice>
@@ -211,25 +227,6 @@
       </bgf:expression>
     </bgf:production>
   </xbgf:anonymize>
-  <xbgf:massage>
-    <bgf:expression>
-      <choice>
-        <bgf:expression>
-          <nonterminal>bar</nonterminal>
-        </bgf:expression>
-        <bgf:expression>
-          <epsilon/>
-        </bgf:expression>
-      </choice>
-    </bgf:expression>
-    <bgf:expression>
-      <optional>
-        <bgf:expression>
-          <nonterminal>bar</nonterminal>
-        </bgf:expression>
-      </optional>
-    </bgf:expression>
-  </xbgf:massage>
   <xbgf:massage>
     <bgf:expression>
       <choice>
diff --git a/topics/transformation/xbgf/tests/narrow1.baseline b/topics/transformation/xbgf/tests/narrow_global.baseline
similarity index 100%
rename from topics/transformation/xbgf/tests/narrow1.baseline
rename to topics/transformation/xbgf/tests/narrow_global.baseline
diff --git a/topics/transformation/xbgf/tests/narrow1.bgf b/topics/transformation/xbgf/tests/narrow_global.bgf
similarity index 100%
rename from topics/transformation/xbgf/tests/narrow1.bgf
rename to topics/transformation/xbgf/tests/narrow_global.bgf
diff --git a/topics/transformation/xbgf/tests/narrow1.xbgf b/topics/transformation/xbgf/tests/narrow_global.xbgf
similarity index 100%
rename from topics/transformation/xbgf/tests/narrow1.xbgf
rename to topics/transformation/xbgf/tests/narrow_global.xbgf
diff --git a/topics/transformation/xbgf/tests/narrow3.baseline b/topics/transformation/xbgf/tests/narrow_l.baseline
similarity index 100%
rename from topics/transformation/xbgf/tests/narrow3.baseline
rename to topics/transformation/xbgf/tests/narrow_l.baseline
diff --git a/topics/transformation/xbgf/tests/narrow3.bgf b/topics/transformation/xbgf/tests/narrow_l.bgf
similarity index 100%
rename from topics/transformation/xbgf/tests/narrow3.bgf
rename to topics/transformation/xbgf/tests/narrow_l.bgf
diff --git a/topics/transformation/xbgf/tests/narrow3.xbgf b/topics/transformation/xbgf/tests/narrow_l.xbgf
similarity index 100%
rename from topics/transformation/xbgf/tests/narrow3.xbgf
rename to topics/transformation/xbgf/tests/narrow_l.xbgf
diff --git a/topics/transformation/xbgf/tests/narrow2.baseline b/topics/transformation/xbgf/tests/narrow_nt.baseline
similarity index 100%
rename from topics/transformation/xbgf/tests/narrow2.baseline
rename to topics/transformation/xbgf/tests/narrow_nt.baseline
diff --git a/topics/transformation/xbgf/tests/narrow2.bgf b/topics/transformation/xbgf/tests/narrow_nt.bgf
similarity index 100%
rename from topics/transformation/xbgf/tests/narrow2.bgf
rename to topics/transformation/xbgf/tests/narrow_nt.bgf
diff --git a/topics/transformation/xbgf/tests/narrow2.xbgf b/topics/transformation/xbgf/tests/narrow_nt.xbgf
similarity index 100%
rename from topics/transformation/xbgf/tests/narrow2.xbgf
rename to topics/transformation/xbgf/tests/narrow_nt.xbgf
diff --git a/topics/transformation/xbgf/tests/widen1.baseline b/topics/transformation/xbgf/tests/widen_global.baseline
similarity index 100%
rename from topics/transformation/xbgf/tests/widen1.baseline
rename to topics/transformation/xbgf/tests/widen_global.baseline
diff --git a/topics/transformation/xbgf/tests/widen1.bgf b/topics/transformation/xbgf/tests/widen_global.bgf
similarity index 100%
rename from topics/transformation/xbgf/tests/widen1.bgf
rename to topics/transformation/xbgf/tests/widen_global.bgf
diff --git a/topics/transformation/xbgf/tests/widen1.xbgf b/topics/transformation/xbgf/tests/widen_global.xbgf
similarity index 100%
rename from topics/transformation/xbgf/tests/widen1.xbgf
rename to topics/transformation/xbgf/tests/widen_global.xbgf
diff --git a/topics/transformation/xbgf/tests/widen3.baseline b/topics/transformation/xbgf/tests/widen_l.baseline
similarity index 100%
rename from topics/transformation/xbgf/tests/widen3.baseline
rename to topics/transformation/xbgf/tests/widen_l.baseline
diff --git a/topics/transformation/xbgf/tests/widen3.bgf b/topics/transformation/xbgf/tests/widen_l.bgf
similarity index 100%
rename from topics/transformation/xbgf/tests/widen3.bgf
rename to topics/transformation/xbgf/tests/widen_l.bgf
diff --git a/topics/transformation/xbgf/tests/widen3.xbgf b/topics/transformation/xbgf/tests/widen_l.xbgf
similarity index 100%
rename from topics/transformation/xbgf/tests/widen3.xbgf
rename to topics/transformation/xbgf/tests/widen_l.xbgf
diff --git a/topics/transformation/xbgf/tests/widen2.baseline b/topics/transformation/xbgf/tests/widen_nt.baseline
similarity index 100%
rename from topics/transformation/xbgf/tests/widen2.baseline
rename to topics/transformation/xbgf/tests/widen_nt.baseline
diff --git a/topics/transformation/xbgf/tests/widen2.bgf b/topics/transformation/xbgf/tests/widen_nt.bgf
similarity index 100%
rename from topics/transformation/xbgf/tests/widen2.bgf
rename to topics/transformation/xbgf/tests/widen_nt.bgf
diff --git a/topics/transformation/xbgf/tests/widen2.xbgf b/topics/transformation/xbgf/tests/widen_nt.xbgf
similarity index 100%
rename from topics/transformation/xbgf/tests/widen2.xbgf
rename to topics/transformation/xbgf/tests/widen_nt.xbgf