./mitch --sanitize-identifier-namespace

2002-03-20 Michael Natterer <mitch@gimp.org> ./mitch --sanitize-identifier-namespace * app/core/gimpcontext.c * app/display/gimpdisplayshell-callbacks.c * app/display/gimpdisplayshell-dnd.c * app/gui/dialogs-commands.c * app/gui/dialogs-constructors.c * app/gui/dialogs.c * app/gui/edit-commands.c * app/gui/gui.c * app/gui/menus.c * app/gui/vectors-commands.c * app/gui/view-commands.c * app/tools/gimpairbrushtool.c * app/tools/gimpbezierselecttool.c * app/tools/gimpblendtool.c * app/tools/gimpbrightnesscontrasttool.c * app/tools/gimpbucketfilltool.c * app/tools/gimpbycolorselecttool.c * app/tools/gimpclonetool.c * app/tools/gimpcolorbalancetool.c * app/tools/gimpcolorpickertool.c * app/tools/gimpconvolvetool.c * app/tools/gimpcroptool.c * app/tools/gimpcurvestool.c * app/tools/gimpdodgeburntool.c * app/tools/gimpellipseselecttool.c * app/tools/gimperasertool.c * app/tools/gimpfliptool.c * app/tools/gimpfreeselecttool.c * app/tools/gimpfuzzyselecttool.c * app/tools/gimphistogramtool.c * app/tools/gimphuesaturationtool.c * app/tools/gimpinktool.c * app/tools/gimpiscissorstool.c * app/tools/gimplevelstool.c * app/tools/gimpmagnifytool.c * app/tools/gimpmeasuretool.c * app/tools/gimpmovetool.c * app/tools/gimppaintbrushtool.c * app/tools/gimppathtool.c * app/tools/gimppenciltool.c * app/tools/gimpperspectivetool.c * app/tools/gimpposterizetool.c * app/tools/gimprectselecttool.c * app/tools/gimprotatetool.c * app/tools/gimpscaletool.c * app/tools/gimpsheartool.c * app/tools/gimpsmudgetool.c * app/tools/gimptexttool.c * app/tools/gimpthresholdtool.c * app/tools/gimpvectortool.c * app/widgets/gimpdnd.c * app/widgets/gimptoolbox-indicator-area.c * app/widgets/gimptoolbox.c: s/gimp:/gimp-/g and s/_/-/g for all identifier strings (e.g. gimp:eraser_tool -> gimp-eraser-tool, gimp:layer-list -> gimp-layer-list, ...) * plug-ins/tools/common/gimpbrushselecttool.c: s/gimp:brush_select_tool/gimp-brush-select-tool-module/ Don't quite remember why I introduced the "gimp:" prefix in the first place, but we can always add it back if we need it (for whatever reason) You may want to edit your ~/.gimp-1.3/sessionrc and devicerc or all session settings will be lost due to parse errors.
2024-10-19 22:34:37 +00:00 · 2002-03-21 12:17:17 +00:00 · 2002-03-21 12:17:17 +00:00 · ffcb0bfa3f
parent 6ce08f3ce7
commit ffcb0bfa3f
69 changed files with 324 additions and 254 deletions
--- a/70
+++ b/70
@ -1,3 +1,73 @@
+2002-03-20  Michael Natterer  <mitch@gimp.org>
+
+	./mitch --sanitize-identifier-namespace
+
+	* app/core/gimpcontext.c
+	* app/display/gimpdisplayshell-callbacks.c
+	* app/display/gimpdisplayshell-dnd.c
+	* app/gui/dialogs-commands.c
+	* app/gui/dialogs-constructors.c
+	* app/gui/dialogs.c
+	* app/gui/edit-commands.c
+	* app/gui/gui.c
+	* app/gui/menus.c
+	* app/gui/vectors-commands.c
+	* app/gui/view-commands.c
+	* app/tools/gimpairbrushtool.c
+	* app/tools/gimpbezierselecttool.c
+	* app/tools/gimpblendtool.c
+	* app/tools/gimpbrightnesscontrasttool.c
+	* app/tools/gimpbucketfilltool.c
+	* app/tools/gimpbycolorselecttool.c
+	* app/tools/gimpclonetool.c
+	* app/tools/gimpcolorbalancetool.c
+	* app/tools/gimpcolorpickertool.c
+	* app/tools/gimpconvolvetool.c
+	* app/tools/gimpcroptool.c
+	* app/tools/gimpcurvestool.c
+	* app/tools/gimpdodgeburntool.c
+	* app/tools/gimpellipseselecttool.c
+	* app/tools/gimperasertool.c
+	* app/tools/gimpfliptool.c
+	* app/tools/gimpfreeselecttool.c
+	* app/tools/gimpfuzzyselecttool.c
+	* app/tools/gimphistogramtool.c
+	* app/tools/gimphuesaturationtool.c
+	* app/tools/gimpinktool.c
+	* app/tools/gimpiscissorstool.c
+	* app/tools/gimplevelstool.c
+	* app/tools/gimpmagnifytool.c
+	* app/tools/gimpmeasuretool.c
+	* app/tools/gimpmovetool.c
+	* app/tools/gimppaintbrushtool.c
+	* app/tools/gimppathtool.c
+	* app/tools/gimppenciltool.c
+	* app/tools/gimpperspectivetool.c
+	* app/tools/gimpposterizetool.c
+	* app/tools/gimprectselecttool.c
+	* app/tools/gimprotatetool.c
+	* app/tools/gimpscaletool.c
+	* app/tools/gimpsheartool.c
+	* app/tools/gimpsmudgetool.c
+	* app/tools/gimptexttool.c
+	* app/tools/gimpthresholdtool.c
+	* app/tools/gimpvectortool.c
+	* app/widgets/gimpdnd.c
+	* app/widgets/gimptoolbox-indicator-area.c
+	* app/widgets/gimptoolbox.c: s/gimp:/gimp-/g and s/_/-/g for all
+	identifier strings (e.g. gimp:eraser_tool -> gimp-eraser-tool,
+	gimp:layer-list -> gimp-layer-list, ...)
+
+	* plug-ins/tools/common/gimpbrushselecttool.c:
+	s/gimp:brush_select_tool/gimp-brush-select-tool-module/
+
+	Don't quite remember why I introduced the "gimp:" prefix in the
+	first place, but we can always add it back if we need it (for
+	whatever reason)
+
+	You may want to edit your ~/.gimp-1.3/sessionrc and devicerc or
+	all session settings will be lost due to parse errors.
+
 2002-03-20  Michael Natterer  <mitch@gimp.org>

 	* app/gui/Makefile.am
--- a/app/actions/dialogs-commands.c
+++ b/app/actions/dialogs-commands.c
@ -305,10 +305,10 @@ dialogs_create_lc_cmd_callback (GtkWidget *widget,

  const gchar *tabs[] =
  {
-    "gimp:layer-list",
-    "gimp:channel-list",
-    "gimp:vectors-list",
-    "gimp:indexed-palette"
+    "gimp-layer-list",
+    "gimp-channel-list",
+    "gimp-vectors-list",
+    "gimp-indexed-palette"
  };
  gint i;

@ -343,13 +343,13 @@ dialogs_create_stuff_cmd_callback (GtkWidget *widget,

  const gchar *tabs[] =
  {
-    "gimp:brush-grid",
-    "gimp:pattern-grid",
-    "gimp:gradient-list",
-    "gimp:palette-list",
-    "gimp:buffer-list",
-    "gimp:image-list",
-    "gimp:document-history"
+    "gimp-brush-grid",
+    "gimp-pattern-grid",
+    "gimp-gradient-list",
+    "gimp-palette-list",
+    "gimp-buffer-list",
+    "gimp-image-list",
+    "gimp-document-history"
  };
  gint i;

--- a/app/actions/edit-commands.c
+++ b/app/actions/edit-commands.c
@ -229,7 +229,7 @@ void
 edit_named_paste_cmd_callback (GtkWidget *widget,
 			       gpointer   data)
 {
-  gimp_dialog_factory_dialog_raise (global_dock_factory, "gimp:buffer-list", -1);
+  gimp_dialog_factory_dialog_raise (global_dock_factory, "gimp-buffer-list", -1);
 }

 void
--- a/app/actions/vectors-commands.c
+++ b/app/actions/vectors-commands.c
@ -302,7 +302,7 @@ vectors_stroke_vectors (GimpVectors *vectors)
        {
          tool_info = (GimpToolInfo *)
            gimp_container_get_child_by_name (gimage->gimp->tool_info_list,
-                                              "gimp:paintbrush_tool");
+                                              "gimp-paintbrush-tool");
        }

      paint_options = (GimpPaintOptions *) tool_info->tool_options;
--- a/app/actions/view-commands.c
+++ b/app/actions/view-commands.c
@ -160,7 +160,7 @@ view_display_filters_cmd_callback (GtkWidget *widget,
  shell = GIMP_DISPLAY_SHELL (gdisp->shell);

  gimp_dialog_factory_dialog_new (global_dialog_factory,
-                                  "gimp:display-filters-dialog", -1);
+                                  "gimp-display-filters-dialog", -1);
 }

 void
--- a/app/base/color-balance.c
+++ b/app/base/color-balance.c
@ -104,7 +104,7 @@ gimp_color_balance_tool_register (Gimp                     *gimp,
                GIMP_TYPE_COLOR_BALANCE_TOOL,
                NULL,
                FALSE,
-                "gimp:color_balance_tool",
+                "gimp-color-balance-tool",
                _("Color Balance"),
                _("Adjust color balance"),
                N_("/Layer/Colors/Color Balance..."), NULL,
--- a/app/base/curves.c
+++ b/app/base/curves.c
@ -212,7 +212,7 @@ gimp_curves_tool_register (Gimp                     *gimp,
                GIMP_TYPE_CURVES_TOOL,
                NULL,
                FALSE,
-                "gimp:curves_tool",
+                "gimp-curves-tool",
                _("Curves"),
                _("Adjust color curves"),
                N_("/Layer/Colors/Curves..."), NULL,
--- a/app/base/hue-saturation.c
+++ b/app/base/hue-saturation.c
@ -130,7 +130,7 @@ gimp_hue_saturation_tool_register (Gimp                     *gimp,
                GIMP_TYPE_HUE_SATURATION_TOOL,
                NULL,
                FALSE,
-                "gimp:hue_saturation_tool",
+                "gimp-hue-saturation-tool",
                _("Hue-Saturation"),
                _("Adjust hue and saturation"),
                N_("/Layer/Colors/Hue-Saturation..."), NULL,
--- a/app/base/threshold.c
+++ b/app/base/threshold.c
@ -110,7 +110,7 @@ gimp_threshold_tool_register (Gimp                     *gimp,
                GIMP_TYPE_THRESHOLD_TOOL,
                NULL,
                FALSE,
-                "gimp:threshold_tool",
+                "gimp-threshold-tool",
                _("Threshold"),
                _("Reduce image to two colors using a threshold"),
                N_("/Layer/Colors/Threshold..."), NULL,
--- a/app/core/gimpcontext.c
+++ b/app/core/gimpcontext.c
@ -1484,7 +1484,7 @@ gimp_context_tool_list_thaw (GimpContainer *container,
  GimpToolInfo *tool_info;

  if (! context->tool_name)
-    context->tool_name = g_strdup ("gimp:rect-select-tool");
+    context->tool_name = g_strdup ("gimp-rect-select-tool");

  if ((tool_info = (GimpToolInfo *)
       gimp_container_get_child_by_name (container,
--- a/app/dialogs/dialogs-constructors.c
+++ b/app/dialogs/dialogs-constructors.c
@ -839,7 +839,7 @@ void
 dialogs_edit_brush_func (GimpData *data)
 {
  gimp_dialog_factory_dialog_raise (global_dock_factory,
-                                    "gimp:brush-editor",
+                                    "gimp-brush-editor",
                                    -1);

  gimp_data_editor_set_data (brush_editor, data);
@ -866,7 +866,7 @@ void
 dialogs_edit_gradient_func (GimpData *data)
 {
  gimp_dialog_factory_dialog_raise (global_dock_factory,
-				    "gimp:gradient-editor",
+				    "gimp-gradient-editor",
                                    -1);

  gimp_data_editor_set_data (gradient_editor, data);
@ -893,7 +893,7 @@ void
 dialogs_edit_palette_func (GimpData *data)
 {
  gimp_dialog_factory_dialog_raise (global_dock_factory,
-				    "gimp:palette-editor",
+				    "gimp-palette-editor",
                                    -1);

  gimp_data_editor_set_data (palette_editor, data);
--- a/app/dialogs/dialogs.c
+++ b/app/dialogs/dialogs.c
@ -39,47 +39,47 @@ GimpDialogFactory *global_toolbox_factory = NULL;

 static const GimpDialogFactoryEntry toplevel_entries[] =
 {
-  { "gimp:device-status-dialog",   dialogs_device_status_get,   32, TRUE,  TRUE,  FALSE, TRUE  },
-  { "gimp:preferences-dialog",     dialogs_preferences_get,     32, TRUE,  FALSE, FALSE, TRUE  },
-  { "gimp:module-browser-dialog",  dialogs_module_browser_get,  32, TRUE,  FALSE, FALSE, TRUE  },
-  { "gimp:undo-history-dialog",    dialogs_undo_history_get,    32, FALSE, FALSE, FALSE, TRUE  },
-  { "gimp:display-filters-dialog", dialogs_display_filters_get, 32, FALSE, FALSE, FALSE, TRUE  },
-  { "gimp:tips-dialog",            dialogs_tips_get,            32, TRUE,  FALSE, FALSE, TRUE  },
-  { "gimp:about-dialog",           dialogs_about_get,           32, TRUE,  FALSE, FALSE, TRUE  }
+  { "gimp-device-status-dialog",   dialogs_device_status_get,   32, TRUE,  TRUE,  FALSE, TRUE  },
+  { "gimp-preferences-dialog",     dialogs_preferences_get,     32, TRUE,  FALSE, FALSE, TRUE  },
+  { "gimp-module-browser-dialog",  dialogs_module_browser_get,  32, TRUE,  FALSE, FALSE, TRUE  },
+  { "gimp-undo-history-dialog",    dialogs_undo_history_get,    32, FALSE, FALSE, FALSE, TRUE  },
+  { "gimp-display-filters-dialog", dialogs_display_filters_get, 32, FALSE, FALSE, FALSE, TRUE  },
+  { "gimp-tips-dialog",            dialogs_tips_get,            32, TRUE,  FALSE, FALSE, TRUE  },
+  { "gimp-about-dialog",           dialogs_about_get,           32, TRUE,  FALSE, FALSE, TRUE  }
 };

 static const GimpDialogFactoryEntry dock_entries[] =
 {
-  { "gimp:tool-options",     dialogs_tool_options_get,        0, TRUE,  FALSE, FALSE, TRUE },
-  { "gimp:error-console",    dialogs_error_console_get,       0, TRUE,  FALSE, FALSE, TRUE },
+  { "gimp-tool-options",     dialogs_tool_options_get,        0, TRUE,  FALSE, FALSE, TRUE },
+  { "gimp-error-console",    dialogs_error_console_get,       0, TRUE,  FALSE, FALSE, TRUE },

-  { "gimp:image-list",       dialogs_image_list_view_new,    32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:brush-list",       dialogs_brush_list_view_new,    32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:pattern-list",     dialogs_pattern_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:gradient-list",    dialogs_gradient_list_view_new, 16, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:palette-list",     dialogs_palette_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:tool-list",        dialogs_tool_list_view_new,     24, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:buffer-list",      dialogs_buffer_list_view_new,   32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-image-list",       dialogs_image_list_view_new,    32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-brush-list",       dialogs_brush_list_view_new,    32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-pattern-list",     dialogs_pattern_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-gradient-list",    dialogs_gradient_list_view_new, 16, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-palette-list",     dialogs_palette_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-tool-list",        dialogs_tool_list_view_new,     24, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-buffer-list",      dialogs_buffer_list_view_new,   32, FALSE, FALSE, FALSE, TRUE },

-  { "gimp:image-grid",       dialogs_image_grid_view_new,    32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:brush-grid",       dialogs_brush_grid_view_new,    32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:pattern-grid",     dialogs_pattern_grid_view_new,  32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:gradient-grid",    dialogs_gradient_grid_view_new, 16, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:palette-grid",     dialogs_palette_grid_view_new,  32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:tool-grid",        dialogs_tool_grid_view_new,     24, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:buffer-grid",      dialogs_buffer_grid_view_new,   32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-image-grid",       dialogs_image_grid_view_new,    32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-brush-grid",       dialogs_brush_grid_view_new,    32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-pattern-grid",     dialogs_pattern_grid_view_new,  32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-gradient-grid",    dialogs_gradient_grid_view_new, 16, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-palette-grid",     dialogs_palette_grid_view_new,  32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-tool-grid",        dialogs_tool_grid_view_new,     24, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-buffer-grid",      dialogs_buffer_grid_view_new,   32, FALSE, FALSE, FALSE, TRUE },

-  { "gimp:layer-list",       dialogs_layer_list_view_new,    32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:channel-list",     dialogs_channel_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:vectors-list",     dialogs_vectors_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:path-list",        dialogs_path_list_view_new,     32, TRUE,  FALSE, FALSE, TRUE },
-  { "gimp:indexed-palette",  dialogs_indexed_palette_new,    32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-layer-list",       dialogs_layer_list_view_new,    32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-channel-list",     dialogs_channel_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-vectors-list",     dialogs_vectors_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-path-list",        dialogs_path_list_view_new,     32, TRUE,  FALSE, FALSE, TRUE },
+  { "gimp-indexed-palette",  dialogs_indexed_palette_new,    32, FALSE, FALSE, FALSE, TRUE },

-  { "gimp:document-history", dialogs_document_history_new,   48, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-document-history", dialogs_document_history_new,   48, FALSE, FALSE, FALSE, TRUE },

-  { "gimp:brush-editor",     dialogs_brush_editor_get,        0, TRUE,  FALSE, FALSE, TRUE },
-  { "gimp:gradient-editor",  dialogs_gradient_editor_get,     0, TRUE,  FALSE, FALSE, TRUE },
-  { "gimp:palette-editor",   dialogs_palette_editor_get,      0, TRUE,  FALSE, FALSE, TRUE }
+  { "gimp-brush-editor",     dialogs_brush_editor_get,        0, TRUE,  FALSE, FALSE, TRUE },
+  { "gimp-gradient-editor",  dialogs_gradient_editor_get,     0, TRUE,  FALSE, FALSE, TRUE },
+  { "gimp-palette-editor",   dialogs_palette_editor_get,      0, TRUE,  FALSE, FALSE, TRUE }
 };


--- a/app/display/gimpdisplayshell-callbacks.c
+++ b/app/display/gimpdisplayshell-callbacks.c
@ -1033,7 +1033,7 @@ gimp_display_shell_hruler_button_press (GtkWidget        *widget,

      tool_info = (GimpToolInfo *)
        gimp_container_get_child_by_name (gdisp->gimage->gimp->tool_info_list,
-                                          "gimp:move_tool");
+                                          "gimp-move-tool");

      if (tool_info)
 	{
@ -1077,7 +1077,7 @@ gimp_display_shell_vruler_button_press (GtkWidget        *widget,

      tool_info = (GimpToolInfo *)
        gimp_container_get_child_by_name (gdisp->gimage->gimp->tool_info_list,
-                                          "gimp:move_tool");
+                                          "gimp-move-tool");

      if (tool_info)
 	{
--- a/app/display/gimpdisplayshell-dnd.c
+++ b/app/display/gimpdisplayshell-dnd.c
@ -100,7 +100,7 @@ gimp_display_shell_bucket_fill (GimpImage          *gimage,
  /*  Get the bucket fill context  */
  tool_info = (GimpToolInfo *)
    gimp_container_get_child_by_name (gimage->gimp->tool_info_list,
-                                      "gimp:bucket_fill_tool");
+                                      "gimp-bucket-fill-tool");

  if (tool_info && tool_info->context)
    {
--- a/app/gui/dialogs-commands.c
+++ b/app/gui/dialogs-commands.c
@ -305,10 +305,10 @@ dialogs_create_lc_cmd_callback (GtkWidget *widget,

  const gchar *tabs[] =
  {
-    "gimp:layer-list",
-    "gimp:channel-list",
-    "gimp:vectors-list",
-    "gimp:indexed-palette"
+    "gimp-layer-list",
+    "gimp-channel-list",
+    "gimp-vectors-list",
+    "gimp-indexed-palette"
  };
  gint i;

@ -343,13 +343,13 @@ dialogs_create_stuff_cmd_callback (GtkWidget *widget,

  const gchar *tabs[] =
  {
-    "gimp:brush-grid",
-    "gimp:pattern-grid",
-    "gimp:gradient-list",
-    "gimp:palette-list",
-    "gimp:buffer-list",
-    "gimp:image-list",
-    "gimp:document-history"
+    "gimp-brush-grid",
+    "gimp-pattern-grid",
+    "gimp-gradient-list",
+    "gimp-palette-list",
+    "gimp-buffer-list",
+    "gimp-image-list",
+    "gimp-document-history"
  };
  gint i;

--- a/app/gui/dialogs-constructors.c
+++ b/app/gui/dialogs-constructors.c
@ -839,7 +839,7 @@ void
 dialogs_edit_brush_func (GimpData *data)
 {
  gimp_dialog_factory_dialog_raise (global_dock_factory,
-                                    "gimp:brush-editor",
+                                    "gimp-brush-editor",
                                    -1);

  gimp_data_editor_set_data (brush_editor, data);
@ -866,7 +866,7 @@ void
 dialogs_edit_gradient_func (GimpData *data)
 {
  gimp_dialog_factory_dialog_raise (global_dock_factory,
-				    "gimp:gradient-editor",
+				    "gimp-gradient-editor",
                                    -1);

  gimp_data_editor_set_data (gradient_editor, data);
@ -893,7 +893,7 @@ void
 dialogs_edit_palette_func (GimpData *data)
 {
  gimp_dialog_factory_dialog_raise (global_dock_factory,
-				    "gimp:palette-editor",
+				    "gimp-palette-editor",
                                    -1);

  gimp_data_editor_set_data (palette_editor, data);
--- a/app/gui/dialogs.c
+++ b/app/gui/dialogs.c
@ -39,47 +39,47 @@ GimpDialogFactory *global_toolbox_factory = NULL;

 static const GimpDialogFactoryEntry toplevel_entries[] =
 {
-  { "gimp:device-status-dialog",   dialogs_device_status_get,   32, TRUE,  TRUE,  FALSE, TRUE  },
-  { "gimp:preferences-dialog",     dialogs_preferences_get,     32, TRUE,  FALSE, FALSE, TRUE  },
-  { "gimp:module-browser-dialog",  dialogs_module_browser_get,  32, TRUE,  FALSE, FALSE, TRUE  },
-  { "gimp:undo-history-dialog",    dialogs_undo_history_get,    32, FALSE, FALSE, FALSE, TRUE  },
-  { "gimp:display-filters-dialog", dialogs_display_filters_get, 32, FALSE, FALSE, FALSE, TRUE  },
-  { "gimp:tips-dialog",            dialogs_tips_get,            32, TRUE,  FALSE, FALSE, TRUE  },
-  { "gimp:about-dialog",           dialogs_about_get,           32, TRUE,  FALSE, FALSE, TRUE  }
+  { "gimp-device-status-dialog",   dialogs_device_status_get,   32, TRUE,  TRUE,  FALSE, TRUE  },
+  { "gimp-preferences-dialog",     dialogs_preferences_get,     32, TRUE,  FALSE, FALSE, TRUE  },
+  { "gimp-module-browser-dialog",  dialogs_module_browser_get,  32, TRUE,  FALSE, FALSE, TRUE  },
+  { "gimp-undo-history-dialog",    dialogs_undo_history_get,    32, FALSE, FALSE, FALSE, TRUE  },
+  { "gimp-display-filters-dialog", dialogs_display_filters_get, 32, FALSE, FALSE, FALSE, TRUE  },
+  { "gimp-tips-dialog",            dialogs_tips_get,            32, TRUE,  FALSE, FALSE, TRUE  },
+  { "gimp-about-dialog",           dialogs_about_get,           32, TRUE,  FALSE, FALSE, TRUE  }
 };

 static const GimpDialogFactoryEntry dock_entries[] =
 {
-  { "gimp:tool-options",     dialogs_tool_options_get,        0, TRUE,  FALSE, FALSE, TRUE },
-  { "gimp:error-console",    dialogs_error_console_get,       0, TRUE,  FALSE, FALSE, TRUE },
+  { "gimp-tool-options",     dialogs_tool_options_get,        0, TRUE,  FALSE, FALSE, TRUE },
+  { "gimp-error-console",    dialogs_error_console_get,       0, TRUE,  FALSE, FALSE, TRUE },

-  { "gimp:image-list",       dialogs_image_list_view_new,    32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:brush-list",       dialogs_brush_list_view_new,    32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:pattern-list",     dialogs_pattern_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:gradient-list",    dialogs_gradient_list_view_new, 16, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:palette-list",     dialogs_palette_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:tool-list",        dialogs_tool_list_view_new,     24, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:buffer-list",      dialogs_buffer_list_view_new,   32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-image-list",       dialogs_image_list_view_new,    32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-brush-list",       dialogs_brush_list_view_new,    32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-pattern-list",     dialogs_pattern_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-gradient-list",    dialogs_gradient_list_view_new, 16, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-palette-list",     dialogs_palette_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-tool-list",        dialogs_tool_list_view_new,     24, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-buffer-list",      dialogs_buffer_list_view_new,   32, FALSE, FALSE, FALSE, TRUE },

-  { "gimp:image-grid",       dialogs_image_grid_view_new,    32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:brush-grid",       dialogs_brush_grid_view_new,    32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:pattern-grid",     dialogs_pattern_grid_view_new,  32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:gradient-grid",    dialogs_gradient_grid_view_new, 16, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:palette-grid",     dialogs_palette_grid_view_new,  32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:tool-grid",        dialogs_tool_grid_view_new,     24, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:buffer-grid",      dialogs_buffer_grid_view_new,   32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-image-grid",       dialogs_image_grid_view_new,    32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-brush-grid",       dialogs_brush_grid_view_new,    32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-pattern-grid",     dialogs_pattern_grid_view_new,  32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-gradient-grid",    dialogs_gradient_grid_view_new, 16, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-palette-grid",     dialogs_palette_grid_view_new,  32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-tool-grid",        dialogs_tool_grid_view_new,     24, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-buffer-grid",      dialogs_buffer_grid_view_new,   32, FALSE, FALSE, FALSE, TRUE },

-  { "gimp:layer-list",       dialogs_layer_list_view_new,    32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:channel-list",     dialogs_channel_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:vectors-list",     dialogs_vectors_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
-  { "gimp:path-list",        dialogs_path_list_view_new,     32, TRUE,  FALSE, FALSE, TRUE },
-  { "gimp:indexed-palette",  dialogs_indexed_palette_new,    32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-layer-list",       dialogs_layer_list_view_new,    32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-channel-list",     dialogs_channel_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-vectors-list",     dialogs_vectors_list_view_new,  32, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-path-list",        dialogs_path_list_view_new,     32, TRUE,  FALSE, FALSE, TRUE },
+  { "gimp-indexed-palette",  dialogs_indexed_palette_new,    32, FALSE, FALSE, FALSE, TRUE },

-  { "gimp:document-history", dialogs_document_history_new,   48, FALSE, FALSE, FALSE, TRUE },
+  { "gimp-document-history", dialogs_document_history_new,   48, FALSE, FALSE, FALSE, TRUE },

-  { "gimp:brush-editor",     dialogs_brush_editor_get,        0, TRUE,  FALSE, FALSE, TRUE },
-  { "gimp:gradient-editor",  dialogs_gradient_editor_get,     0, TRUE,  FALSE, FALSE, TRUE },
-  { "gimp:palette-editor",   dialogs_palette_editor_get,      0, TRUE,  FALSE, FALSE, TRUE }
+  { "gimp-brush-editor",     dialogs_brush_editor_get,        0, TRUE,  FALSE, FALSE, TRUE },
+  { "gimp-gradient-editor",  dialogs_gradient_editor_get,     0, TRUE,  FALSE, FALSE, TRUE },
+  { "gimp-palette-editor",   dialogs_palette_editor_get,      0, TRUE,  FALSE, FALSE, TRUE }
 };


--- a/app/gui/edit-commands.c
+++ b/app/gui/edit-commands.c
@ -229,7 +229,7 @@ void
 edit_named_paste_cmd_callback (GtkWidget *widget,
 			       gpointer   data)
 {
-  gimp_dialog_factory_dialog_raise (global_dock_factory, "gimp:buffer-list", -1);
+  gimp_dialog_factory_dialog_raise (global_dock_factory, "gimp-buffer-list", -1);
 }

 void
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@ -267,7 +267,7 @@ gui_post_init (Gimp *gimp)
  if (gimprc.show_tips)
    {
      gimp_dialog_factory_dialog_new (global_dialog_factory,
-                                      "gimp:tips-dialog", -1);
+                                      "gimp-tips-dialog", -1);
    }
 }

@ -411,7 +411,7 @@ gui_message (Gimp        *gimp,

    case GIMP_ERROR_CONSOLE:
      gimp_dialog_factory_dialog_raise (global_dock_factory,
-                                        "gimp:error-console", -1);
+                                        "gimp-error-console", -1);
      error_console_add (gimp, message);
      break;

--- a/app/gui/menus.c
+++ b/app/gui/menus.c
@ -140,7 +140,7 @@ static GimpItemFactoryEntry toolbox_entries[] =
  { { N_("/File/Preferences..."), NULL,
      dialogs_create_toplevel_cmd_callback, 0,
      "<StockItem>", GTK_STOCK_PREFERENCES },
-    "gimp:preferences-dialog",
+    "gimp-preferences-dialog",
    "file/dialogs/preferences/preferences.html", NULL },

  /*  <Toolbox>/File/Dialogs  */
@ -155,55 +155,55 @@ static GimpItemFactoryEntry toolbox_entries[] =
    NULL, NULL },
  { { N_("/File/Dialogs/Tool Options..."), "<control><shift>T",
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:tool-options",
+    "gimp-tool-options",
    "file/dialogs/tool_options.html", NULL },
  { { N_("/File/Dialogs/Device Status..."), NULL,
      dialogs_create_toplevel_cmd_callback, 0 },
-    "gimp:device-status-dialog",
+    "gimp-device-status-dialog",
    "file/dialogs/device_status.html", NULL },

  SEPARATOR ("/File/Dialogs/---"),

  { { N_("/File/Dialogs/Brushes..."), "<control><shift>B",
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:brush-grid",
+    "gimp-brush-grid",
    "file/dialogs/brush_selection.html", NULL },
  { { N_("/File/Dialogs/Patterns..."), "<control><shift>P",
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:pattern-grid",
+    "gimp-pattern-grid",
    "file/dialogs/pattern_selection.html", NULL },
  { { N_("/File/Dialogs/Gradients..."), "<control>G",
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:gradient-list",
+    "gimp-gradient-list",
    "file/dialogs/gradient_selection.html", NULL },
  { { N_("/File/Dialogs/Palettes..."), "<control>P",
      dialogs_create_dockable_cmd_callback, 0,
      "<StockItem>", GTK_STOCK_SELECT_COLOR },
-    "gimp:palette-list",
+    "gimp-palette-list",
    "file/dialogs/palette_selection.html", NULL },
  { { N_("/File/Dialogs/Indexed Palette..."), NULL,
      dialogs_create_dockable_cmd_callback, 0,
      "<StockItem>", GTK_STOCK_SELECT_COLOR },
-    "gimp:indexed-palette",
+    "gimp-indexed-palette",
    "file/dialogs/indexed_palette.html", NULL },
  { { N_("/File/Dialogs/Buffers..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:buffer-list",
+    "gimp-buffer-list",
    NULL, NULL },
  { { N_("/File/Dialogs/Images..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:image-list",
+    "gimp-image-list",
    NULL, NULL },

  SEPARATOR ("/File/Dialogs/---"),

  { { N_("/File/Dialogs/Document History..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:document-history",
+    "gimp-document-history",
    "file/dialogs/document_index.html", NULL },
  { { N_("/File/Dialogs/Error Console..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:error-console",
+    "gimp-error-console",
    "file/dialogs/error_console.html", NULL },

 #ifdef ENABLE_DEBUG_ENTRIES
@ -236,7 +236,7 @@ static GimpItemFactoryEntry toolbox_entries[] =

  { { N_("/Xtns/Module Browser..."), NULL,
      dialogs_create_toplevel_cmd_callback, 0 },
-    "gimp:module-browser-dialog",
+    "gimp-module-browser-dialog",
    "dialogs/module_browser.html", NULL },

  SEPARATOR ("/Xtns/---"),
@ -257,11 +257,11 @@ static GimpItemFactoryEntry toolbox_entries[] =
    "help/context_help.html", NULL },
  { { N_("/Help/Tip of the Day..."), NULL,
      dialogs_create_toplevel_cmd_callback, 0 },
-    "gimp:tips-dialog",
+    "gimp-tips-dialog",
    "help/dialogs/tip_of_the_day.html", NULL },
  { { N_("/Help/About..."), NULL,
      dialogs_create_toplevel_cmd_callback, 0 },
-    "gimp:about-dialog",
+    "gimp-about-dialog",
    "help/dialogs/about.html", NULL }
 };

@ -657,7 +657,7 @@ static GimpItemFactoryEntry image_entries[] =

  { { N_("/Image/Undo History..."), NULL,
      dialogs_create_toplevel_cmd_callback, 0 },
-    "gimp:undo-history-dialog",
+    "gimp-undo-history-dialog",
    "dialogs/undo_history.html", NULL },

 /*  <Image>/Layer  */
@ -849,55 +849,55 @@ static GimpItemFactoryEntry image_entries[] =
    NULL, NULL },
  { { N_("/Dialogs/Tool Options..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:tool-options",
+    "gimp-tool-options",
    "dialogs/tool_options.html", NULL },
  { { N_("/Dialogs/Device Status..."), NULL,
      dialogs_create_toplevel_cmd_callback, 0 },
-    "gimp:device-status-dialog",
+    "gimp-device-status-dialog",
    "dialogs/device_status.html", NULL },

  SEPARATOR ("/Dialogs/---"),

  { { N_("/Dialogs/Brushes..."), "<control><shift>B",
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:brush-grid",
+    "gimp-brush-grid",
    "dialogs/brush_selection.html", NULL },
  { { N_("/Dialogs/Patterns..."), "<control><shift>P",
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:pattern-grid",
+    "gimp-pattern-grid",
    "dialogs/pattern_selection.html", NULL },
  { { N_("/Dialogs/Gradients..."), "<control>G",
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:gradient-list",
+    "gimp-gradient-list",
    "dialogs/gradient_selection.html", NULL },
  { { N_("/Dialogs/Palettes..."), "<control>P",
      dialogs_create_dockable_cmd_callback, 0,
      "<StockItem>", GTK_STOCK_SELECT_COLOR },
-    "gimp:palette-list",
+    "gimp-palette-list",
    "dialogs/palette_selection.html", NULL },
  { { N_("/Dialogs/Indexed Palette..."), NULL,
      dialogs_create_dockable_cmd_callback, 0,
      "<StockItem>", GTK_STOCK_SELECT_COLOR },
-    "gimp:indexed-palette",
+    "gimp-indexed-palette",
    "dialogs/indexed_palette.html", NULL },
  { { N_("/Dialogs/Buffers..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:buffer-list",
+    "gimp-buffer-list",
    NULL, NULL },
  { { N_("/Dialogs/Images..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:image-list",
+    "gimp-image-list",
    NULL, NULL },

  SEPARATOR ("/Dialogs/---"),

  { { N_("/Dialogs/Document History..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:document-history",
+    "gimp-document-history",
    "dialogs/document_index.html", NULL },
  { { N_("/Dialogs/Error Console..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:error-console",
+    "gimp-error-console",
    "dialogs/error_console.html", NULL },

  SEPARATOR ("/---"),
@ -1340,28 +1340,28 @@ static GimpItemFactoryEntry dialogs_entries[] =
    NULL, NULL },


-  ADD_TAB (N_("/Add Tab/Layers..."),           "gimp:layer-list", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Channels..."),         "gimp:channel-list", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Paths..."),            "gimp:vectors-list", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Old Paths..."),        "gimp:path-list", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Document History..."), "gimp:document-history", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Error Console..."),    "gimp:error-console", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Layers..."),           "gimp-layer-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Channels..."),         "gimp-channel-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Paths..."),            "gimp-vectors-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Old Paths..."),        "gimp-path-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Document History..."), "gimp-document-history", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Error Console..."),    "gimp-error-console", NULL, NULL),

  SEPARATOR ("/Add Tab/---"),

-  ADD_TAB (N_("/Add Tab/Brushes..."),         "gimp:brush-grid", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Patterns..."),        "gimp:pattern-grid", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Gradients..."),       "gimp:gradient-list", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Palettes..."),        "gimp:palette-list",
+  ADD_TAB (N_("/Add Tab/Brushes..."),         "gimp-brush-grid", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Patterns..."),        "gimp-pattern-grid", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Gradients..."),       "gimp-gradient-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Palettes..."),        "gimp-palette-list",
           "<StockItem>",                     GTK_STOCK_SELECT_COLOR),
-  ADD_TAB (N_("/Add Tab/Indexed Palette..."), "gimp:indexed-palette",
+  ADD_TAB (N_("/Add Tab/Indexed Palette..."), "gimp-indexed-palette",
           "<StockItem>",                     GTK_STOCK_SELECT_COLOR),
-  ADD_TAB (N_("/Add Tab/Buffers..."),         "gimp:buffer-list", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Images..."),          "gimp:image-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Buffers..."),         "gimp-buffer-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Images..."),          "gimp-image-list", NULL, NULL),

  SEPARATOR ("/Add Tab/---"),

-  ADD_TAB (N_("/Add Tab/Tools..."), "gimp:tool-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Tools..."), "gimp-tool-list", NULL, NULL),

  SEPARATOR ("/---"),

@ -2076,12 +2076,12 @@ menus_init (Gimp *gimp)

  /*  create tool menu items  */
  {
-    static const gchar *color_tools[] = { "gimp:color_balance_tool",
-                                          "gimp:hue_saturation_tool",
-                                          "gimp:brightness_contrast_tool",
-                                          "gimp:threshold_tool",
-                                          "gimp:levels_tool",
-                                          "gimp:curves_tool" };
+    static const gchar *color_tools[] = { "gimp-color-balance-tool",
+                                          "gimp-hue-saturation-tool",
+                                          "gimp-brightness-contrast-tool",
+                                          "gimp-threshold-tool",
+                                          "gimp-levels-tool",
+                                          "gimp-curves-tool" };
    GtkWidget    *menu_item;
    GimpToolInfo *tool_info;
    GList        *list;
@ -2118,7 +2118,7 @@ menus_init (Gimp *gimp)
    /*  reorder <Image>/Image/Colors  */
    tool_info = (GimpToolInfo *)
      gimp_container_get_child_by_name (gimp->tool_info_list,
-                                        "gimp:posterize_tool");
+                                        "gimp-posterize-tool");

    menu_item = gtk_item_factory_get_widget (GTK_ITEM_FACTORY (image_factory),
                                             tool_info->menu_path);
--- a/app/gui/vectors-commands.c
+++ b/app/gui/vectors-commands.c
@ -302,7 +302,7 @@ vectors_stroke_vectors (GimpVectors *vectors)
        {
          tool_info = (GimpToolInfo *)
            gimp_container_get_child_by_name (gimage->gimp->tool_info_list,
-                                              "gimp:paintbrush_tool");
+                                              "gimp-paintbrush-tool");
        }

      paint_options = (GimpPaintOptions *) tool_info->tool_options;
--- a/app/gui/view-commands.c
+++ b/app/gui/view-commands.c
@ -160,7 +160,7 @@ view_display_filters_cmd_callback (GtkWidget *widget,
  shell = GIMP_DISPLAY_SHELL (gdisp->shell);

  gimp_dialog_factory_dialog_new (global_dialog_factory,
-                                  "gimp:display-filters-dialog", -1);
+                                  "gimp-display-filters-dialog", -1);
 }

 void
--- a/app/menus/menus.c
+++ b/app/menus/menus.c
@ -140,7 +140,7 @@ static GimpItemFactoryEntry toolbox_entries[] =
  { { N_("/File/Preferences..."), NULL,
      dialogs_create_toplevel_cmd_callback, 0,
      "<StockItem>", GTK_STOCK_PREFERENCES },
-    "gimp:preferences-dialog",
+    "gimp-preferences-dialog",
    "file/dialogs/preferences/preferences.html", NULL },

  /*  <Toolbox>/File/Dialogs  */
@ -155,55 +155,55 @@ static GimpItemFactoryEntry toolbox_entries[] =
    NULL, NULL },
  { { N_("/File/Dialogs/Tool Options..."), "<control><shift>T",
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:tool-options",
+    "gimp-tool-options",
    "file/dialogs/tool_options.html", NULL },
  { { N_("/File/Dialogs/Device Status..."), NULL,
      dialogs_create_toplevel_cmd_callback, 0 },
-    "gimp:device-status-dialog",
+    "gimp-device-status-dialog",
    "file/dialogs/device_status.html", NULL },

  SEPARATOR ("/File/Dialogs/---"),

  { { N_("/File/Dialogs/Brushes..."), "<control><shift>B",
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:brush-grid",
+    "gimp-brush-grid",
    "file/dialogs/brush_selection.html", NULL },
  { { N_("/File/Dialogs/Patterns..."), "<control><shift>P",
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:pattern-grid",
+    "gimp-pattern-grid",
    "file/dialogs/pattern_selection.html", NULL },
  { { N_("/File/Dialogs/Gradients..."), "<control>G",
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:gradient-list",
+    "gimp-gradient-list",
    "file/dialogs/gradient_selection.html", NULL },
  { { N_("/File/Dialogs/Palettes..."), "<control>P",
      dialogs_create_dockable_cmd_callback, 0,
      "<StockItem>", GTK_STOCK_SELECT_COLOR },
-    "gimp:palette-list",
+    "gimp-palette-list",
    "file/dialogs/palette_selection.html", NULL },
  { { N_("/File/Dialogs/Indexed Palette..."), NULL,
      dialogs_create_dockable_cmd_callback, 0,
      "<StockItem>", GTK_STOCK_SELECT_COLOR },
-    "gimp:indexed-palette",
+    "gimp-indexed-palette",
    "file/dialogs/indexed_palette.html", NULL },
  { { N_("/File/Dialogs/Buffers..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:buffer-list",
+    "gimp-buffer-list",
    NULL, NULL },
  { { N_("/File/Dialogs/Images..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:image-list",
+    "gimp-image-list",
    NULL, NULL },

  SEPARATOR ("/File/Dialogs/---"),

  { { N_("/File/Dialogs/Document History..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:document-history",
+    "gimp-document-history",
    "file/dialogs/document_index.html", NULL },
  { { N_("/File/Dialogs/Error Console..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:error-console",
+    "gimp-error-console",
    "file/dialogs/error_console.html", NULL },

 #ifdef ENABLE_DEBUG_ENTRIES
@ -236,7 +236,7 @@ static GimpItemFactoryEntry toolbox_entries[] =

  { { N_("/Xtns/Module Browser..."), NULL,
      dialogs_create_toplevel_cmd_callback, 0 },
-    "gimp:module-browser-dialog",
+    "gimp-module-browser-dialog",
    "dialogs/module_browser.html", NULL },

  SEPARATOR ("/Xtns/---"),
@ -257,11 +257,11 @@ static GimpItemFactoryEntry toolbox_entries[] =
    "help/context_help.html", NULL },
  { { N_("/Help/Tip of the Day..."), NULL,
      dialogs_create_toplevel_cmd_callback, 0 },
-    "gimp:tips-dialog",
+    "gimp-tips-dialog",
    "help/dialogs/tip_of_the_day.html", NULL },
  { { N_("/Help/About..."), NULL,
      dialogs_create_toplevel_cmd_callback, 0 },
-    "gimp:about-dialog",
+    "gimp-about-dialog",
    "help/dialogs/about.html", NULL }
 };

@ -657,7 +657,7 @@ static GimpItemFactoryEntry image_entries[] =

  { { N_("/Image/Undo History..."), NULL,
      dialogs_create_toplevel_cmd_callback, 0 },
-    "gimp:undo-history-dialog",
+    "gimp-undo-history-dialog",
    "dialogs/undo_history.html", NULL },

 /*  <Image>/Layer  */
@ -849,55 +849,55 @@ static GimpItemFactoryEntry image_entries[] =
    NULL, NULL },
  { { N_("/Dialogs/Tool Options..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:tool-options",
+    "gimp-tool-options",
    "dialogs/tool_options.html", NULL },
  { { N_("/Dialogs/Device Status..."), NULL,
      dialogs_create_toplevel_cmd_callback, 0 },
-    "gimp:device-status-dialog",
+    "gimp-device-status-dialog",
    "dialogs/device_status.html", NULL },

  SEPARATOR ("/Dialogs/---"),

  { { N_("/Dialogs/Brushes..."), "<control><shift>B",
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:brush-grid",
+    "gimp-brush-grid",
    "dialogs/brush_selection.html", NULL },
  { { N_("/Dialogs/Patterns..."), "<control><shift>P",
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:pattern-grid",
+    "gimp-pattern-grid",
    "dialogs/pattern_selection.html", NULL },
  { { N_("/Dialogs/Gradients..."), "<control>G",
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:gradient-list",
+    "gimp-gradient-list",
    "dialogs/gradient_selection.html", NULL },
  { { N_("/Dialogs/Palettes..."), "<control>P",
      dialogs_create_dockable_cmd_callback, 0,
      "<StockItem>", GTK_STOCK_SELECT_COLOR },
-    "gimp:palette-list",
+    "gimp-palette-list",
    "dialogs/palette_selection.html", NULL },
  { { N_("/Dialogs/Indexed Palette..."), NULL,
      dialogs_create_dockable_cmd_callback, 0,
      "<StockItem>", GTK_STOCK_SELECT_COLOR },
-    "gimp:indexed-palette",
+    "gimp-indexed-palette",
    "dialogs/indexed_palette.html", NULL },
  { { N_("/Dialogs/Buffers..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:buffer-list",
+    "gimp-buffer-list",
    NULL, NULL },
  { { N_("/Dialogs/Images..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:image-list",
+    "gimp-image-list",
    NULL, NULL },

  SEPARATOR ("/Dialogs/---"),

  { { N_("/Dialogs/Document History..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:document-history",
+    "gimp-document-history",
    "dialogs/document_index.html", NULL },
  { { N_("/Dialogs/Error Console..."), NULL,
      dialogs_create_dockable_cmd_callback, 0 },
-    "gimp:error-console",
+    "gimp-error-console",
    "dialogs/error_console.html", NULL },

  SEPARATOR ("/---"),
@ -1340,28 +1340,28 @@ static GimpItemFactoryEntry dialogs_entries[] =
    NULL, NULL },


-  ADD_TAB (N_("/Add Tab/Layers..."),           "gimp:layer-list", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Channels..."),         "gimp:channel-list", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Paths..."),            "gimp:vectors-list", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Old Paths..."),        "gimp:path-list", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Document History..."), "gimp:document-history", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Error Console..."),    "gimp:error-console", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Layers..."),           "gimp-layer-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Channels..."),         "gimp-channel-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Paths..."),            "gimp-vectors-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Old Paths..."),        "gimp-path-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Document History..."), "gimp-document-history", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Error Console..."),    "gimp-error-console", NULL, NULL),

  SEPARATOR ("/Add Tab/---"),

-  ADD_TAB (N_("/Add Tab/Brushes..."),         "gimp:brush-grid", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Patterns..."),        "gimp:pattern-grid", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Gradients..."),       "gimp:gradient-list", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Palettes..."),        "gimp:palette-list",
+  ADD_TAB (N_("/Add Tab/Brushes..."),         "gimp-brush-grid", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Patterns..."),        "gimp-pattern-grid", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Gradients..."),       "gimp-gradient-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Palettes..."),        "gimp-palette-list",
           "<StockItem>",                     GTK_STOCK_SELECT_COLOR),
-  ADD_TAB (N_("/Add Tab/Indexed Palette..."), "gimp:indexed-palette",
+  ADD_TAB (N_("/Add Tab/Indexed Palette..."), "gimp-indexed-palette",
           "<StockItem>",                     GTK_STOCK_SELECT_COLOR),
-  ADD_TAB (N_("/Add Tab/Buffers..."),         "gimp:buffer-list", NULL, NULL),
-  ADD_TAB (N_("/Add Tab/Images..."),          "gimp:image-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Buffers..."),         "gimp-buffer-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Images..."),          "gimp-image-list", NULL, NULL),

  SEPARATOR ("/Add Tab/---"),

-  ADD_TAB (N_("/Add Tab/Tools..."), "gimp:tool-list", NULL, NULL),
+  ADD_TAB (N_("/Add Tab/Tools..."), "gimp-tool-list", NULL, NULL),

  SEPARATOR ("/---"),

@ -2076,12 +2076,12 @@ menus_init (Gimp *gimp)

  /*  create tool menu items  */
  {
-    static const gchar *color_tools[] = { "gimp:color_balance_tool",
-                                          "gimp:hue_saturation_tool",
-                                          "gimp:brightness_contrast_tool",
-                                          "gimp:threshold_tool",
-                                          "gimp:levels_tool",
-                                          "gimp:curves_tool" };
+    static const gchar *color_tools[] = { "gimp-color-balance-tool",
+                                          "gimp-hue-saturation-tool",
+                                          "gimp-brightness-contrast-tool",
+                                          "gimp-threshold-tool",
+                                          "gimp-levels-tool",
+                                          "gimp-curves-tool" };
    GtkWidget    *menu_item;
    GimpToolInfo *tool_info;
    GList        *list;
@ -2118,7 +2118,7 @@ menus_init (Gimp *gimp)
    /*  reorder <Image>/Image/Colors  */
    tool_info = (GimpToolInfo *)
      gimp_container_get_child_by_name (gimp->tool_info_list,
-                                        "gimp:posterize_tool");
+                                        "gimp-posterize-tool");

    menu_item = gtk_item_factory_get_widget (GTK_ITEM_FACTORY (image_factory),
                                             tool_info->menu_path);
--- a/app/paint/gimpink.c
+++ b/app/paint/gimpink.c
@ -255,7 +255,7 @@ gimp_ink_tool_register (Gimp                     *gimp,
                GIMP_TYPE_INK_TOOL,
                ink_options_new,
                TRUE,
-                "gimp:ink_tool",
+                "gimp-ink-tool",
                _("Ink Tool"),
                _("Draw in ink"),
                N_("/Tools/Paint Tools/Ink"), "K",
--- a/app/tools/gimpairbrushtool.c
+++ b/app/tools/gimpairbrushtool.c
@ -58,7 +58,7 @@ gimp_airbrush_tool_register (Gimp                     *gimp,
                GIMP_TYPE_AIRBRUSH_TOOL,
                airbrush_options_new,
                TRUE,
-                "gimp:airbrush_tool",
+                "gimp-airbrush-tool",
                _("Airbrush"),
                _("Airbrush with variable pressure"),
                N_("/Tools/Paint Tools/Airbrush"), "A",
--- a/app/tools/gimpbezierselecttool.c
+++ b/app/tools/gimpbezierselecttool.c
@ -280,7 +280,7 @@ gimp_bezier_select_tool_register (Gimp                     *gimp,
                GIMP_TYPE_BEZIER_SELECT_TOOL,
                selection_options_new,
                FALSE,
-                "gimp:bezier_select_tool",
+                "gimp-bezier-select-tool",
                _("Bezier Select"),
                _("Select regions using Bezier curves"),
                _("/Tools/Selection Tools/Bezier Select"), "B",
--- a/app/tools/gimpblendtool.c
+++ b/app/tools/gimpblendtool.c
@ -150,7 +150,7 @@ gimp_blend_tool_register (Gimp                     *gimp,
                GIMP_TYPE_BLEND_TOOL,
                blend_options_new,
                TRUE,
-                "gimp:blend_tool",
+                "gimp-blend-tool",
                _("Blend"),
                _("Fill with a color gradient"),
                N_("/Tools/Paint Tools/Blend"), "L",
--- a/app/tools/gimpbrightnesscontrasttool.c
+++ b/app/tools/gimpbrightnesscontrasttool.c
@ -120,7 +120,7 @@ gimp_brightness_contrast_tool_register (Gimp                     *gimp,
                GIMP_TYPE_BRIGHTNESS_CONTRAST_TOOL,
                NULL,
                FALSE,
-                "gimp:brightness_contrast_tool",
+                "gimp-brightness-contrast-tool",
                _("Brightness-Contrast"),
                _("Adjust brightness and contrast"),
                N_("/Layer/Colors/Brightness-Contrast..."), NULL,
--- a/app/tools/gimpbucketfilltool.c
+++ b/app/tools/gimpbucketfilltool.c
@ -115,7 +115,7 @@ gimp_bucket_fill_tool_register (Gimp                     *gimp,
                GIMP_TYPE_BUCKET_FILL_TOOL,
                bucket_options_new,
                TRUE,
-                "gimp:bucket_fill_tool",
+                "gimp-bucket-fill-tool",
                _("Bucket Fill"),
                _("Fill with a color or pattern"),
                N_("/Tools/Paint Tools/Bucket Fill"), "<shift>B",
--- a/app/tools/gimpbycolorselecttool.c
+++ b/app/tools/gimpbycolorselecttool.c
@ -162,7 +162,7 @@ gimp_by_color_select_tool_register (Gimp                     *gimp,
                GIMP_TYPE_BY_COLOR_SELECT_TOOL,
                selection_options_new,
                FALSE,
-                "gimp:by_color_select_tool",
+                "gimp-by-color-select-tool",
                _("Select By Color"),
                _("Select regions by color"),
                _("/Tools/Selection Tools/By Color Select"), "C",
--- a/app/tools/gimpclonetool.c
+++ b/app/tools/gimpclonetool.c
@ -92,7 +92,7 @@ gimp_clone_tool_register (Gimp                     *gimp,
                GIMP_TYPE_CLONE_TOOL,
                clone_options_new,
                TRUE,
-                "gimp:clone_tool",
+                "gimp-clone-tool",
                _("Clone"),
                _("Paint using Patterns or Image Regions"),
                N_("/Tools/Paint Tools/Clone"), "C",
--- a/app/tools/gimpcolorbalancetool.c
+++ b/app/tools/gimpcolorbalancetool.c
@ -104,7 +104,7 @@ gimp_color_balance_tool_register (Gimp                     *gimp,
                GIMP_TYPE_COLOR_BALANCE_TOOL,
                NULL,
                FALSE,
-                "gimp:color_balance_tool",
+                "gimp-color-balance-tool",
                _("Color Balance"),
                _("Adjust color balance"),
                N_("/Layer/Colors/Color Balance..."), NULL,
--- a/app/tools/gimpcolorpickertool.c
+++ b/app/tools/gimpcolorpickertool.c
@ -129,7 +129,7 @@ gimp_color_picker_tool_register (Gimp                     *gimp,
                GIMP_TYPE_COLOR_PICKER_TOOL,
                gimp_color_picker_tool_options_new,
                FALSE,
-                "gimp:color_picker_tool",
+                "gimp-color-picker-tool",
                _("Color Picker"),
                _("Pick colors from the image"),
                N_("/Tools/Color Picker"), "<shift>O",
--- a/app/tools/gimpconvolvetool.c
+++ b/app/tools/gimpconvolvetool.c
@ -84,7 +84,7 @@ gimp_convolve_tool_register (Gimp                     *gimp,
                GIMP_TYPE_CONVOLVE_TOOL,
                convolve_options_new,
                TRUE,
-                "gimp:convolve_tool",
+                "gimp-convolve-tool",
                _("Convolve"),
                _("Blur or Sharpen"),
                N_("/Tools/Paint Tools/Convolve"), "B",
--- a/app/tools/gimpcroptool.c
+++ b/app/tools/gimpcroptool.c
@ -183,7 +183,7 @@ gimp_crop_tool_register (Gimp                     *gimp,
                GIMP_TYPE_CROP_TOOL,
                crop_options_new,
                FALSE,
-                "gimp:crop_tool",
+                "gimp-crop-tool",
                _("Crop Tool"),
                _("Crop or Resize an image"),
                N_("/Tools/Transform Tools/Crop Tool"), "<shift>C",
--- a/app/tools/gimpcurvestool.c
+++ b/app/tools/gimpcurvestool.c
@ -212,7 +212,7 @@ gimp_curves_tool_register (Gimp                     *gimp,
                GIMP_TYPE_CURVES_TOOL,
                NULL,
                FALSE,
-                "gimp:curves_tool",
+                "gimp-curves-tool",
                _("Curves"),
                _("Adjust color curves"),
                N_("/Layer/Colors/Curves..."), NULL,
--- a/app/tools/gimpdodgeburntool.c
+++ b/app/tools/gimpdodgeburntool.c
@ -64,7 +64,7 @@ gimp_dodgeburn_tool_register (Gimp                     *gimp,
                GIMP_TYPE_DODGEBURN_TOOL,
                gimp_dodgeburn_tool_options_new,
                TRUE,
-                "gimp:dodgeburn_tool",
+                "gimp-dodgeburn-tool",
                _("Dodge/Burn"),
                _("Dodge or Burn strokes"),
                N_("/Tools/Paint Tools/DodgeBurn"), "<shift>D",
--- a/app/tools/gimpellipseselecttool.c
+++ b/app/tools/gimpellipseselecttool.c
@ -65,7 +65,7 @@ gimp_ellipse_select_tool_register (Gimp                     *gimp,
                GIMP_TYPE_ELLIPSE_SELECT_TOOL,
                selection_options_new,
                FALSE,
-                "gimp:ellipse_select_tool",
+                "gimp-ellipse-select-tool",
                _("Ellipse Select"),
                _("Select elliptical regions"),
                _("/Tools/Selection Tools/Ellipse Select"), "E",
--- a/app/tools/gimperasertool.c
+++ b/app/tools/gimperasertool.c
@ -62,7 +62,7 @@ gimp_eraser_tool_register (Gimp                     *gimp,
                GIMP_TYPE_ERASER_TOOL,
                gimp_eraser_tool_options_new,
                TRUE,
-                "gimp:eraser_tool",
+                "gimp-eraser-tool",
                _("Eraser"),
                _("Erase to background or transparency"),
                N_("/Tools/Paint Tools/Eraser"), "<shift>E",
--- a/app/tools/gimpfliptool.c
+++ b/app/tools/gimpfliptool.c
@ -91,7 +91,7 @@ gimp_flip_tool_register (Gimp                     *gimp,
                GIMP_TYPE_FLIP_TOOL,
                flip_options_new,
                FALSE,
-                "gimp:flip_tool",
+                "gimp-flip-tool",
                _("Flip Tool"),
                _("Flip the layer or selection"),
                N_("/Tools/Transform Tools/Flip"), "<shift>F",
--- a/app/tools/gimpfreeselecttool.c
+++ b/app/tools/gimpfreeselecttool.c
@ -89,7 +89,7 @@ gimp_free_select_tool_register (Gimp                     *gimp,
                GIMP_TYPE_FREE_SELECT_TOOL,
                selection_options_new,
                FALSE,
-                "gimp:free_select_tool",
+                "gimp-free-select-tool",
                _("Free Select"),
                _("Select hand-drawn regions"),
                _("/Tools/Selection Tools/Free Select"), "F",
--- a/app/tools/gimpfuzzyselecttool.c
+++ b/app/tools/gimpfuzzyselecttool.c
@ -98,7 +98,7 @@ gimp_fuzzy_select_tool_register (Gimp                     *gimp,
                GIMP_TYPE_FUZZY_SELECT_TOOL,
                selection_options_new,
                FALSE,
-                "gimp:fuzzy_select_tool",
+                "gimp-fuzzy-select-tool",
                _("Fuzzy Select"),
                _("Select contiguous regions"),
                _("/Tools/Selection Tools/Fuzzy Select"), "Z",
--- a/app/tools/gimphistogramtool.c
+++ b/app/tools/gimphistogramtool.c
@ -127,7 +127,7 @@ gimp_histogram_tool_register (Gimp                     *gimp,
                GIMP_TYPE_HISTOGRAM_TOOL,
                NULL,
                FALSE,
-                "gimp:histogram_tool",
+                "gimp-histogram-tool",
                _("Histogram"),
                _("View image histogram"),
                N_("/Layer/Colors/Histogram..."), NULL,
--- a/app/tools/gimphuesaturationtool.c
+++ b/app/tools/gimphuesaturationtool.c
@ -130,7 +130,7 @@ gimp_hue_saturation_tool_register (Gimp                     *gimp,
                GIMP_TYPE_HUE_SATURATION_TOOL,
                NULL,
                FALSE,
-                "gimp:hue_saturation_tool",
+                "gimp-hue-saturation-tool",
                _("Hue-Saturation"),
                _("Adjust hue and saturation"),
                N_("/Layer/Colors/Hue-Saturation..."), NULL,
--- a/app/tools/gimpinktool.c
+++ b/app/tools/gimpinktool.c
@ -255,7 +255,7 @@ gimp_ink_tool_register (Gimp                     *gimp,
                GIMP_TYPE_INK_TOOL,
                ink_options_new,
                TRUE,
-                "gimp:ink_tool",
+                "gimp-ink-tool",
                _("Ink Tool"),
                _("Draw in ink"),
                N_("/Tools/Paint Tools/Ink"), "K",
--- a/app/tools/gimpiscissorstool.c
+++ b/app/tools/gimpiscissorstool.c
@ -264,7 +264,7 @@ gimp_iscissors_tool_register (Gimp                     *gimp,
                GIMP_TYPE_ISCISSORS_TOOL,
                selection_options_new,
                FALSE,
-                "gimp:iscissors_tool",
+                "gimp-iscissors-tool",
                _("Intelligent Scissors"),
                _("Select shapes from image"),
                N_("/Tools/Selection Tools/Intelligent Scissors"),
--- a/app/tools/gimplevelstool.c
+++ b/app/tools/gimplevelstool.c
@ -209,7 +209,7 @@ gimp_levels_tool_register (Gimp                     *gimp,
                GIMP_TYPE_LEVELS_TOOL,
                NULL,
                FALSE,
-                "gimp:levels_tool",
+                "gimp-levels-tool",
                _("Levels"),
                _("Adjust color levels"),
                N_("/Layer/Colors/Levels..."), NULL,
--- a/app/tools/gimpmagnifytool.c
+++ b/app/tools/gimpmagnifytool.c
@ -119,7 +119,7 @@ gimp_magnify_tool_register (Gimp                     *gimp,
                GIMP_TYPE_MAGNIFY_TOOL,
                magnify_options_new,
                FALSE,
-                "gimp:magnify_tool",
+                "gimp-magnify-tool",
                _("Magnify"),
                _("Zoom in & out"),
                N_("/Tools/Magnify"), NULL,
--- a/app/tools/gimpmeasuretool.c
+++ b/app/tools/gimpmeasuretool.c
@ -133,7 +133,7 @@ gimp_measure_tool_register (Gimp                     *gimp,
                GIMP_TYPE_MEASURE_TOOL,
                measure_tool_options_new,
                FALSE,
-                "gimp:measure_tool",
+                "gimp-measure-tool",
                _("Measure Tool"),
                _("Measure angles and lengths"),
                N_("/Tools/Measure"), NULL,
--- a/app/tools/gimpmovetool.c
+++ b/app/tools/gimpmovetool.c
@ -116,7 +116,7 @@ gimp_move_tool_register (Gimp                     *gimp,
                GIMP_TYPE_MOVE_TOOL,
                move_options_new,
                FALSE,
-                "gimp:move_tool",
+                "gimp-move-tool",
                _("Move Tool"),
                _("Move layers & selections"),
                N_("/Tools/Transform Tools/Move"), "M",
--- a/app/tools/gimppaintbrushtool.c
+++ b/app/tools/gimppaintbrushtool.c
@ -49,7 +49,7 @@ gimp_paintbrush_tool_register (Gimp                     *gimp,
                GIMP_TYPE_PAINTBRUSH_TOOL,
                paint_options_new,
                TRUE,
-                "gimp:paintbrush_tool",
+                "gimp-paintbrush-tool",
                _("Paintbrush"),
                _("Paint fuzzy brush strokes"),
                N_("/Tools/Paint Tools/Paintbrush"), "P",
--- a/app/tools/gimppathtool.c
+++ b/app/tools/gimppathtool.c
@ -112,7 +112,7 @@ gimp_path_tool_register (Gimp                     *gimp,
                GIMP_TYPE_PATH_TOOL,
                NULL,
                FALSE,
-                "gimp:path_tool",
+                "gimp-path-tool",
                _("Path Tool"),
                _("Path tool prototype"),
                N_("/Tools/Path"), NULL,
--- a/app/tools/gimppenciltool.c
+++ b/app/tools/gimppenciltool.c
@ -49,7 +49,7 @@ gimp_pencil_tool_register (Gimp                     *gimp,
                GIMP_TYPE_PENCIL_TOOL,
                paint_options_new,
                TRUE,
-                "gimp:pencil_tool",
+                "gimp-pencil-tool",
                _("Pencil"),
                _("Paint hard edged pixels"),
                N_("/Tools/Paint Tools/Pencil"), "P",
--- a/app/tools/gimpperspectivetool.c
+++ b/app/tools/gimpperspectivetool.c
@ -73,7 +73,7 @@ gimp_perspective_tool_register (Gimp                     *gimp,
                GIMP_TYPE_PERSPECTIVE_TOOL,
                transform_options_new,
                FALSE,
-                "gimp:perspective_tool",
+                "gimp-perspective-tool",
                _("Perspective Tool"),
                _("Change perspective of the layer or selection"),
                N_("/Tools/Transform Tools/Perspective"), "<shift>P",
--- a/app/tools/gimpposterizetool.c
+++ b/app/tools/gimpposterizetool.c
@ -103,7 +103,7 @@ gimp_posterize_tool_register (Gimp                     *gimp,
                GIMP_TYPE_POSTERIZE_TOOL,
                NULL,
                FALSE,
-                "gimp:posterize_tool",
+                "gimp-posterize-tool",
                _("Posterize"),
                _("Reduce image to a fixed numer of colors"),
                N_("/Layer/Colors/Posterize..."), NULL,
--- a/app/tools/gimprectselecttool.c
+++ b/app/tools/gimprectselecttool.c
@ -88,7 +88,7 @@ gimp_rect_select_tool_register (Gimp                     *gimp,
                GIMP_TYPE_RECT_SELECT_TOOL,
                selection_options_new,
                FALSE,
-                "gimp:rect_select_tool",
+                "gimp-rect-select-tool",
                _("Rect Select"),
                _("Select rectangular regions"),
                _("/Tools/Selection Tools/Rect Select"), "R",
--- a/app/tools/gimpregionselecttool.c
+++ b/app/tools/gimpregionselecttool.c
@ -98,7 +98,7 @@ gimp_fuzzy_select_tool_register (Gimp                     *gimp,
                GIMP_TYPE_FUZZY_SELECT_TOOL,
                selection_options_new,
                FALSE,
-                "gimp:fuzzy_select_tool",
+                "gimp-fuzzy-select-tool",
                _("Fuzzy Select"),
                _("Select contiguous regions"),
                _("/Tools/Selection Tools/Fuzzy Select"), "Z",
--- a/app/tools/gimprotatetool.c
+++ b/app/tools/gimprotatetool.c
@ -92,7 +92,7 @@ gimp_rotate_tool_register (Gimp                     *gimp,
                GIMP_TYPE_ROTATE_TOOL,
                transform_options_new,
                FALSE,
-                "gimp:rotate_tool",
+                "gimp-rotate-tool",
                _("Rotate Tool"),
                _("Rotate the layer or selection"),
                N_("/Tools/Transform Tools/Rotate"), "<shift>R",
--- a/app/tools/gimpscaletool.c
+++ b/app/tools/gimpscaletool.c
@ -87,7 +87,7 @@ gimp_scale_tool_register (Gimp                     *gimp,
                GIMP_TYPE_SCALE_TOOL,
                transform_options_new,
                FALSE,
-                "gimp:scale_tool",
+                "gimp-scale-tool",
                _("Scale Tool"),
                _("Scale the layer or selection"),
                N_("/Tools/Transform Tools/Scale"), "<shift>T",
--- a/app/tools/gimpsheartool.c
+++ b/app/tools/gimpsheartool.c
@ -90,7 +90,7 @@ gimp_shear_tool_register (Gimp                     *gimp,
                GIMP_TYPE_SHEAR_TOOL,
                transform_options_new,
                FALSE,
-                "gimp:shear_tool",
+                "gimp-shear-tool",
                _("Shear Tool"),
                _("Shear the layer or selection"),
                N_("/Tools/Transform Tools/Shear"), "<shift>F",
--- a/app/tools/gimpsmudgetool.c
+++ b/app/tools/gimpsmudgetool.c
@ -54,7 +54,7 @@ gimp_smudge_tool_register (Gimp                     *gimp,
                GIMP_TYPE_SMUDGE_TOOL,
                smudge_options_new,
                TRUE,
-                "gimp:smudge_tool",
+                "gimp-smudge-tool",
                _("Smudge"),
                _("Smudge image"),
                N_("/Tools/Paint Tools/Smudge"), "S",
--- a/app/tools/gimpsourcetool.c
+++ b/app/tools/gimpsourcetool.c
@ -92,7 +92,7 @@ gimp_clone_tool_register (Gimp                     *gimp,
                GIMP_TYPE_CLONE_TOOL,
                clone_options_new,
                TRUE,
-                "gimp:clone_tool",
+                "gimp-clone-tool",
                _("Clone"),
                _("Paint using Patterns or Image Regions"),
                N_("/Tools/Paint Tools/Clone"), "C",
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@ -132,7 +132,7 @@ gimp_text_tool_register (Gimp                     *gimp,
                GIMP_TYPE_TEXT_TOOL,
                text_tool_options_new,
                FALSE,
-                "gimp:text_tool",
+                "gimp-text-tool",
                _("Text Tool"),
                _("Add text to the image"),
                N_("/Tools/Text"), "T",
--- a/app/tools/gimpthresholdtool.c
+++ b/app/tools/gimpthresholdtool.c
@ -110,7 +110,7 @@ gimp_threshold_tool_register (Gimp                     *gimp,
                GIMP_TYPE_THRESHOLD_TOOL,
                NULL,
                FALSE,
-                "gimp:threshold_tool",
+                "gimp-threshold-tool",
                _("Threshold"),
                _("Reduce image to two colors using a threshold"),
                N_("/Layer/Colors/Threshold..."), NULL,
--- a/app/tools/gimpvectortool.c
+++ b/app/tools/gimpvectortool.c
@ -112,7 +112,7 @@ gimp_vector_tool_register (Gimp                     *gimp,
                GIMP_TYPE_VECTOR_TOOL,
                vector_tool_options_new,
                FALSE,
-                "gimp:vector_tool",
+                "gimp-vector-tool",
                _("Vector Tool"),
                _("Vector angles and lengths"),
                N_("/Tools/Vector"), NULL,
--- a/app/widgets/gimpdnd.c
+++ b/app/widgets/gimpdnd.c
@ -1512,7 +1512,7 @@ gimp_dnd_set_tool_data (GtkWidget *widget,

  g_print ("gimp_dnd_set_tool_data() got >>%s<<\n", name);

-  if (strcmp (name, "gimp:standard_tool") == 0)
+  if (strcmp (name, "gimp-standard-tool") == 0)
    tool_info = gimp_tool_info_get_standard (the_gimp);
  else
    tool_info = (GimpToolInfo *)
--- a/app/widgets/gimptoolbox-indicator-area.c
+++ b/app/widgets/gimptoolbox-indicator-area.c
@ -52,7 +52,7 @@ brush_preview_clicked (GtkWidget   *widget,
 		       GimpToolbox *toolbox)
 {
  gimp_dialog_factory_dialog_raise (GIMP_DOCK (toolbox)->dialog_factory,
-				    "gimp:brush-grid", -1);
+				    "gimp-brush-grid", -1);
 }

 static void
@ -72,7 +72,7 @@ pattern_preview_clicked (GtkWidget   *widget,
 			 GimpToolbox *toolbox)
 {
  gimp_dialog_factory_dialog_raise (GIMP_DOCK (toolbox)->dialog_factory,
-				    "gimp:pattern-grid", -1);
+				    "gimp-pattern-grid", -1);
 }

 static void
@ -92,7 +92,7 @@ gradient_preview_clicked (GtkWidget   *widget,
 			  GimpToolbox *toolbox)
 {
  gimp_dialog_factory_dialog_raise (GIMP_DOCK (toolbox)->dialog_factory,
-				    "gimp:gradient-list", -1);
+				    "gimp-gradient-list", -1);
 }

 static void
--- a/app/widgets/gimptoolbox.c
+++ b/app/widgets/gimptoolbox.c
@ -234,7 +234,7 @@ gimp_toolbox_size_allocate (GtkWidget     *widget,

  tool_info = (GimpToolInfo *)
    gimp_container_get_child_by_name (gimp->tool_info_list,
-                                      "gimp:rect_select_tool");
+                                      "gimp-rect-select-tool");
  tool_button = g_object_get_data (G_OBJECT (tool_info), "toolbox-button");

  if (tool_button)
@ -334,7 +334,7 @@ gimp_toolbox_style_set (GtkWidget *widget,

  tool_info = (GimpToolInfo *)
    gimp_container_get_child_by_name (gimp->tool_info_list,
-                                      "gimp:rect_select_tool");
+                                      "gimp-rect-select-tool");
  tool_button = g_object_get_data (G_OBJECT (tool_info), "toolbox-button");

  if (tool_button)
@ -649,7 +649,7 @@ toolbox_tool_button_press (GtkWidget      *widget,
  if ((event->type == GDK_2BUTTON_PRESS) && (event->button == 1))
    {
      gimp_dialog_factory_dialog_raise (GIMP_DOCK (toolbox)->dialog_factory,
-                                        "gimp:tool-options",
+                                        "gimp-tool-options",
                                        -1);
    }

--- a/plug-ins/tools/common/gimpbrushselecttool.c
+++ b/plug-ins/tools/common/gimpbrushselecttool.c
@ -104,7 +104,7 @@ gimp_tool_module_register_tool (Gimp                     *gimp,
                GIMP_TYPE_BRUSH_SELECT_TOOL,
                selection_options_new,
                FALSE,
-                "gimp:brush_select_tool",
+                "gimp-brush-select-tool-module",
                _("Brush Select"),
                _("Select hand-painted regions"),
                _("/Tools/Selection Tools/Brush Select"), "B",