diff --git a/moo/mooedit/context.xml b/moo/mooedit/context.xml
index 5ba8ec1c..2b019935 100644
--- a/moo/mooedit/context.xml
+++ b/moo/mooedit/context.xml
@@ -1,7 +1,7 @@
 <tools>
-  <tool name="Switch Header And Implementation">
+  <tool id="SwitchHeaderAndImplementation" name="Switch Header And Implementation">
     <langs>C, GAP</langs>
-    <command type="MooScript" options="need-file">
+    <command type="moo-script" options="need-file">
       <code>extensions = [[['.h', '.hh', '.hpp', '.hxx', '.H'], ['.c', '.cc', '.cpp', '.cxx', '.C']],
               [['.gd'], ['.gi']]];
 new = none;
diff --git a/moo/mooedit/menu.xml b/moo/mooedit/menu.xml
index 0b24144a..9d38c94a 100644
--- a/moo/mooedit/menu.xml
+++ b/moo/mooedit/menu.xml
@@ -1,6 +1,6 @@
 <tools>
-  <tool name="_Shell Command" os="unix">
-    <command type="MooScript" options="need-doc">
+  <tool id="ShellCommand" name="_Shell Command" os="unix">
+    <command type="moo-script" options="need-doc">
       <code>cmd = HistoryEntry("", "ShellCommand");
 if cmd then
   Insert(Exec(cmd), "\n");
diff --git a/moo/mooedit/moocommand-script.c b/moo/mooedit/moocommand-script.c
index de128fb3..20f157e2 100644
--- a/moo/mooedit/moocommand-script.c
+++ b/moo/mooedit/moocommand-script.c
@@ -225,7 +225,7 @@ moo_command_script_class_init (MooCommandScriptClass *klass)
     g_type_class_add_private (klass, sizeof (MooCommandScriptPrivate));
 
     type = g_object_new (_moo_command_type_script_get_type (), NULL);
-    moo_command_type_register ("MooScript", _("MooScript"), type);
+    moo_command_type_register ("moo-script", _("MooScript"), type);
     g_object_unref (type);
 }