diff --git a/tools/make_mw_doc.py b/tools/make_mw_doc.py
index b17f21d6..a49505a6 100755
--- a/tools/make_mw_doc.py
+++ b/tools/make_mw_doc.py
@@ -119,14 +119,14 @@ class MediaWikiGenerator(object):
         self.output.write('\n')
 
     def magic_word(self, mw):
-        self.output.write('{{MagicWord')
+        self.output.write('{{Magic word')
 
-        self.output.write('|name=%s' % mw.name)
+        self.output.write('|word=%s' % mw.name)
 
-        self.output.write('|usage=%s' % mw.getUsage())
+        self.output.write('|args=%s' % mw.getUsage())
 
         if mw.doc:
-            self.output.write('|description=%s' % mw.doc)
+            self.output.write('|desc=%s' % mw.doc)
 
         self.output.write('|access=%s' % mw.access)