diff --git a/src/actions/actions-effect.cpp b/src/actions/actions-effect.cpp
index 75d814eb213157c985c132d6d455990586ac20e5..640a219ab35b3325e1ed17d4cb5b7c991b72c9a3 100644
--- a/src/actions/actions-effect.cpp
+++ b/src/actions/actions-effect.cpp
@@ -58,9 +58,9 @@ last_effect_pref(InkscapeApplication *app)
 std::vector<std::vector<Glib::ustring>> raw_data_effect =
 {
     // clang-format off
-    {"app.edit-remove-filter",      N_("Remove Filters"),                   "Filter",           N_("Remove any filters from selected objects")},
-    {"app.last-effect",             N_("Previous Extension"),               "Extension",        N_("Repeat the last extension with the same settings")},
-    {"app.last-effect-pref",        N_("Previous Extension Settings"),      "Extension",        N_("Repeat the last extension with new settings")}
+    {"app.edit-remove-filter",      N_("Remove Filters"),                   "Filters",          N_("Remove any filters from selected objects")},
+    {"app.last-effect",             N_("Previous Extension"),               "Extensions",       N_("Repeat the last extension with the same settings")},
+    {"app.last-effect-pref",        N_("Previous Extension Settings"),      "Extensions",       N_("Repeat the last extension with new settings")}
     // clang-format on
 };
 
diff --git a/src/actions/actions-layer.cpp b/src/actions/actions-layer.cpp
index e97e8dfdaaa36e01717795c6678446f22af976b7..a1063d091913d98d93bb4e57c90170953379c6b0 100644
--- a/src/actions/actions-layer.cpp
+++ b/src/actions/actions-layer.cpp
@@ -457,28 +457,28 @@ group_exit (InkscapeWindow* win)
 std::vector<std::vector<Glib::ustring>> raw_data_layer =
 {
     // clang-format off
-    {"win.layer-new",                       N_("Add Layer"),                        "Layers",     N_("Create a new layer")},
-    {"win.layer-duplicate",                 N_("Duplicate Current Layer"),          "Layers",     N_("Duplicate the current layer")},
-    {"win.layer-delete",                    N_("Delete Current Layer"),             "Layers",     N_("Delete the current layer")},
-    {"win.layer-rename",                    N_("Rename Layer"),                     "Layers",     N_("Rename the current layer")},
+    {"win.layer-new",                       N_("Add Layer"),                        "Layer",     N_("Create a new layer")},
+    {"win.layer-duplicate",                 N_("Duplicate Current Layer"),          "Layer",     N_("Duplicate the current layer")},
+    {"win.layer-delete",                    N_("Delete Current Layer"),             "Layer",     N_("Delete the current layer")},
+    {"win.layer-rename",                    N_("Rename Layer"),                     "Layer",     N_("Rename the current layer")},
 
-    {"win.layer-hide-toggle",               N_("Show/Hide Current Layer"),          "Layers",     N_("Toggle visibility of current layer")},
-    {"win.layer-lock-toggle",               N_("Lock/Unlock Current Layer"),        "Layers",     N_("Toggle lock on current layer")},
+    {"win.layer-hide-toggle",               N_("Show/Hide Current Layer"),          "Layer",     N_("Toggle visibility of current layer")},
+    {"win.layer-lock-toggle",               N_("Lock/Unlock Current Layer"),        "Layer",     N_("Toggle lock on current layer")},
 
-    {"win.layer-previous",                  N_("Switch to Layer Above"),            "Layers",     N_("Switch to the layer above the current")},
-    {"win.layer-next",                      N_("Switch to Layer Below"),            "Layers",     N_("Switch to the layer below the current")},
+    {"win.layer-previous",                  N_("Switch to Layer Above"),            "Layer",     N_("Switch to the layer above the current")},
+    {"win.layer-next",                      N_("Switch to Layer Below"),            "Layer",     N_("Switch to the layer below the current")},
 
-    {"win.selection-move-to-layer-above",   N_("Move Selection to Layer Above"),    "Layers",     N_("Move selection to the layer above the current")},
-    {"win.selection-move-to-layer-below",   N_("Move Selection to Layer Below"),    "Layers",     N_("Move selection to the layer below the current")},
-    {"win.selection-move-to-layer",         N_("Move Selection to Layer..."),       "Layers",     N_("Move selection to layer")},
+    {"win.selection-move-to-layer-above",   N_("Move Selection to Layer Above"),    "Layer",     N_("Move selection to the layer above the current")},
+    {"win.selection-move-to-layer-below",   N_("Move Selection to Layer Below"),    "Layer",     N_("Move selection to the layer below the current")},
+    {"win.selection-move-to-layer",         N_("Move Selection to Layer..."),       "Layer",     N_("Move selection to layer")},
 
-    {"win.layer-top",                       N_("Layer to Top"),                     "Layers",     N_("Raise the current layer to the top")},
-    {"win.layer-raise",                     N_("Raise Layer"),                      "Layers",     N_("Raise the current layer")},
-    {"win.layer-lower",                     N_("Lower Layer"),                      "Layers",     N_("Lower the current layer")},
-    {"win.layer-bottom",                    N_("Layer to Bottom"),                  "Layers",     N_("Lower the current layer to the bottom")},
+    {"win.layer-top",                       N_("Layer to Top"),                     "Layer",     N_("Raise the current layer to the top")},
+    {"win.layer-raise",                     N_("Raise Layer"),                      "Layer",     N_("Raise the current layer")},
+    {"win.layer-lower",                     N_("Lower Layer"),                      "Layer",     N_("Lower the current layer")},
+    {"win.layer-bottom",                    N_("Layer to Bottom"),                  "Layer",     N_("Lower the current layer to the bottom")},
 
-    {"win.layer-to-group",                  N_("Layer to Group"),                   "Layers",     N_("Convert the current layer to a group")},
-    {"win.layer-from-group",                N_("Layer from Group"),                 "Layers",     N_("Convert the group to a layer")},
+    {"win.layer-to-group",                  N_("Layer to Group"),                   "Layer",     N_("Convert the current layer to a group")},
+    {"win.layer-from-group",                N_("Layer from Group"),                 "Layer",     N_("Convert the group to a layer")},
 
     // These use Layer technology even if they don't act on layers.
     {"win.selection-group-enter",           N_("Enter Group"),                      "Select",     N_("Enter group")},
diff --git a/src/extension/effect.cpp b/src/extension/effect.cpp
index cfd47f1689c8d46fe69c36c24fd833458657ab4d..0877d91e89f4703a0c74015782c03c8cd4a71fec 100644
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
@@ -144,15 +144,15 @@ Effect::Effect (Inkscape::XML::Node *in_repr, Implementation::Implementation *in
         if (local_effects_menu && local_effects_menu->attribute("name") && !strcmp(local_effects_menu->attribute("name"), ("Filters"))) {
 
             std::vector<std::vector<Glib::ustring>>raw_data_filter =
-                {{ action_id, get_name(), "Filter", description },
-                 { action_id + ".noprefs", Glib::ustring(get_name()) + " " + _("(No preferences)"), "Filter", description }};
+                {{ action_id, get_name(), "Filters", description },
+                 { action_id + ".noprefs", Glib::ustring(get_name()) + " " + _("(No preferences)"), "Filters (no prefs)", description }};
             app->get_action_extra_data().add_data(raw_data_filter);
 
         } else {
 
             std::vector<std::vector<Glib::ustring>>raw_data_effect =
-                {{ action_id, get_name(), "Effect", description },
-                 { action_id + ".noprefs", Glib::ustring(get_name()) + " " + _("(No preferences)"), "Effect", description }};
+                {{ action_id, get_name(), "Extensions", description },
+                 { action_id + ".noprefs", Glib::ustring(get_name()) + " " + _("(No preferences)"), "Extensions (no prefs)", description }};
             app->get_action_extra_data().add_data(raw_data_effect);
 
             sub_menu_list.push_front("Effects");