diff --git a/Editor/Inspector/Menu/ToggleCreatorShortcut.cs b/Editor/Inspector/Menu/ToggleCreatorShortcut.cs
index ca5fcc0b..b813fd45 100644
--- a/Editor/Inspector/Menu/ToggleCreatorShortcut.cs
+++ b/Editor/Inspector/Menu/ToggleCreatorShortcut.cs
@@ -8,13 +8,13 @@ namespace nadena.dev.modular_avatar.core.editor
 {
     internal static class ToggleCreatorShortcut
     {
-        [MenuItem(UnityMenuItems.GameObject_SetupToggle, false, UnityMenuItems.GameObject_SetupToggleOrder)]
-        private static void SetupToggle(MenuCommand command) => CreateToggleImpl(command, true);
+        [MenuItem(UnityMenuItems.GameObject_CreateToggleForSelection, false, UnityMenuItems.GameObject_CreateToggleForSelectionOrder)]
+        private static void CreateToggleForSelection(MenuCommand command) => CreateToggleImpl(command, true);
 
         [MenuItem(UnityMenuItems.GameObject_CreateToggle, false, UnityMenuItems.GameObject_CreateToggleOrder)]
         private static void CreateToggle(MenuCommand command) => CreateToggleImpl(command, false);
         
-        private static void CreateToggleImpl(MenuCommand command, bool setup)
+        private static void CreateToggleImpl(MenuCommand command, bool forSelection)
         {
             var selected = command.context as GameObject;
             if (selected == null) return;
@@ -41,12 +41,12 @@ namespace nadena.dev.modular_avatar.core.editor
                 // ignore
             }
 
-            var name = setup ? selected.name + " Toggle"  : "New Toggle";
+            var name = forSelection ? selected.name + " Toggle"  : "New Toggle";
             
             var toggle = new GameObject(name);
             
             var objToggle = toggle.AddComponent<ModularAvatarObjectToggle>();
-            if (setup)
+            if (forSelection)
             {
                 var path = RuntimeUtil.RelativePath(avatarRoot.gameObject, selected);
                 objToggle.Objects.Add(new ToggledObject
diff --git a/Runtime/UI/UnityMenuItems.cs b/Runtime/UI/UnityMenuItems.cs
index 823439c9..40a35d8d 100644
--- a/Runtime/UI/UnityMenuItems.cs
+++ b/Runtime/UI/UnityMenuItems.cs
@@ -8,11 +8,11 @@
         internal const string GameObject_CreateToggle = "GameObject/Modular Avatar/Create Toggle";
         internal const int GameObject_CreateToggleOrder = GameObject_SetupOutfitOrder + 1;
 
-        internal const string GameObject_SetupToggle = "GameObject/Modular Avatar/Setup Toggle";
-        internal const int GameObject_SetupToggleOrder = GameObject_CreateToggleOrder + 1;
+        internal const string GameObject_CreateToggleForSelection = "GameObject/Modular Avatar/Create Toggle for Selection";
+        internal const int GameObject_CreateToggleForSelectionOrder = GameObject_CreateToggleOrder + 1;
 
         internal const string GameObject_ManualBake = "GameObject/Modular Avatar/Manual Bake Avatar";
-        internal const int GameObject_ManualBakeOrder = GameObject_SetupToggleOrder + 1;
+        internal const int GameObject_ManualBakeOrder = GameObject_CreateToggleForSelectionOrder + 1;
 
         // <separator>