diff --git a/shared/rascal/src/diff/GDT.rsc b/shared/rascal/src/diff/GDT.rsc
index 68287825..6a2fe71c 100644
--- a/shared/rascal/src/diff/GDT.rsc
+++ b/shared/rascal/src/diff/GDT.rsc
@@ -1,6 +1,6 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
 @doc{Grammar Diff Tool}
-@wiki{GDT}
+@wiki{Grammar Diff Tool}
 module diff::GDT
 
 import syntax::BGF;
diff --git a/shared/rascal/src/io/ReadBGF.rsc b/shared/rascal/src/io/ReadBGF.rsc
index d859812e..9edd6a0f 100644
--- a/shared/rascal/src/io/ReadBGF.rsc
+++ b/shared/rascal/src/io/ReadBGF.rsc
@@ -1,4 +1,5 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
+@wiki{ReadBGF}
 module io::ReadBGF
 
 import IO;
diff --git a/shared/rascal/src/io/ReadXBGF.rsc b/shared/rascal/src/io/ReadXBGF.rsc
index 69a705b5..38602705 100644
--- a/shared/rascal/src/io/ReadXBGF.rsc
+++ b/shared/rascal/src/io/ReadXBGF.rsc
@@ -1,4 +1,5 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
+@wiki{ReadXBGF}
 module io::ReadXBGF
 
 import IO;
diff --git a/shared/rascal/src/io/WriteBGF.rsc b/shared/rascal/src/io/WriteBGF.rsc
index 77587ebc..8cbfc3ad 100644
--- a/shared/rascal/src/io/WriteBGF.rsc
+++ b/shared/rascal/src/io/WriteBGF.rsc
@@ -1,4 +1,5 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
+@wiki{WriteBGF}
 module io::WriteBGF
 
 import IO;
diff --git a/shared/rascal/src/io/WriteCBGF.rsc b/shared/rascal/src/io/WriteCBGF.rsc
index 92959fc8..7dc8256c 100644
--- a/shared/rascal/src/io/WriteCBGF.rsc
+++ b/shared/rascal/src/io/WriteCBGF.rsc
@@ -1,4 +1,5 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
+@wiki{WriteΞBGF}
 module io::WriteCBGF
 
 import IO;
diff --git a/shared/rascal/src/io/WriteXBGF.rsc b/shared/rascal/src/io/WriteXBGF.rsc
index cb5df575..e5f59da3 100644
--- a/shared/rascal/src/io/WriteXBGF.rsc
+++ b/shared/rascal/src/io/WriteXBGF.rsc
@@ -1,4 +1,5 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
+@wiki{WriteXBGF}
 module io::WriteXBGF
 
 import IO;
diff --git a/shared/rascal/src/normal/ANF.rsc b/shared/rascal/src/normal/ANF.rsc
index 2be4f422..1c63764a 100644
--- a/shared/rascal/src/normal/ANF.rsc
+++ b/shared/rascal/src/normal/ANF.rsc
@@ -1,5 +1,6 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
 @doc{Abstract Normal Form}
+@wiki{Abstract Normal Form}
 module normal::ANF
 
 import syntax::BGF;
diff --git a/shared/rascal/src/normal/BGF.rsc b/shared/rascal/src/normal/BGF.rsc
index 732192f3..baed39a0 100644
--- a/shared/rascal/src/normal/BGF.rsc
+++ b/shared/rascal/src/normal/BGF.rsc
@@ -1,4 +1,5 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
+@wiki{BGF}
 module normal::BGF
 
 import syntax::BGF;
diff --git a/shared/rascal/src/syntax/BGF.rsc b/shared/rascal/src/syntax/BGF.rsc
index cc85466f..8e01a7b5 100644
--- a/shared/rascal/src/syntax/BGF.rsc
+++ b/shared/rascal/src/syntax/BGF.rsc
@@ -1,4 +1,5 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
+@wiki{BGF}
 module \syntax::BGF
 
 alias BGFProdList = list[BGFProduction];
diff --git a/shared/rascal/src/syntax/CBGF.rsc b/shared/rascal/src/syntax/CBGF.rsc
index 9f0f7208..3b74114d 100644
--- a/shared/rascal/src/syntax/CBGF.rsc
+++ b/shared/rascal/src/syntax/CBGF.rsc
@@ -1,4 +1,5 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
+@wiki{ΞBGF}
 module syntax::CBGF
 
 import \syntax::BGF;
diff --git a/shared/rascal/src/syntax/XBGF.rsc b/shared/rascal/src/syntax/XBGF.rsc
index 306c2ee5..edfe8f02 100644
--- a/shared/rascal/src/syntax/XBGF.rsc
+++ b/shared/rascal/src/syntax/XBGF.rsc
@@ -1,4 +1,5 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
+@wiki{XBGF}
 module \syntax::XBGF
 
 import \syntax::BGF;
diff --git a/shared/rascal/src/transform/CBGF.rsc b/shared/rascal/src/transform/CBGF.rsc
index c4a395ff..f9fab3d7 100644
--- a/shared/rascal/src/transform/CBGF.rsc
+++ b/shared/rascal/src/transform/CBGF.rsc
@@ -1,4 +1,5 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
+@wiki{ΞBGF}
 module transform::CBGF // should be ΞBGF
 
 import syntax::BGF;
diff --git a/shared/rascal/src/transform/NegotiatedXBGF.rsc b/shared/rascal/src/transform/NegotiatedXBGF.rsc
index 9aa35bc2..6bca4f11 100644
--- a/shared/rascal/src/transform/NegotiatedXBGF.rsc
+++ b/shared/rascal/src/transform/NegotiatedXBGF.rsc
@@ -1,4 +1,5 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
+@wiki{negotiated transformation}
 module transform::NegotiatedXBGF
 
 import lib::Rascalware;
diff --git a/shared/rascal/src/transform/Results.rsc b/shared/rascal/src/transform/Results.rsc
index e4c31a05..f4f52588 100644
--- a/shared/rascal/src/transform/Results.rsc
+++ b/shared/rascal/src/transform/Results.rsc
@@ -1,4 +1,5 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
+@wiki{negotiated transformation}
 module transform::Results
 
 import lib::Rascalware;
diff --git a/shared/rascal/src/transform/XBGF.rsc b/shared/rascal/src/transform/XBGF.rsc
index c81398c5..7e9a3a90 100644
--- a/shared/rascal/src/transform/XBGF.rsc
+++ b/shared/rascal/src/transform/XBGF.rsc
@@ -1,4 +1,5 @@
 @contributor{Vadim Zaytsev - vadim@grammarware.net - SWAT, CWI}
+@wiki{XBGF}
 module transform::XBGF
 
 import syntax::BGF;
diff --git a/topics/documents/wiki/texts b/topics/documents/wiki/texts
index b97fb59c..06623866 160000
--- a/topics/documents/wiki/texts
+++ b/topics/documents/wiki/texts
@@ -1 +1 @@
-Subproject commit b97fb59c1ad60f6cd4cd2dcac3ec34359fc01c0b
+Subproject commit 06623866c8981a2095e4e8890375ba3e7a9b07ce