diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids
index 26314697e..ab469ef01 100644
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -57,7 +57,7 @@ LayoutSwitcher/Caption: Layout
 LoadedModules/Caption: Loaded Modules
 LoadedModules/Hint: These are the currently loaded tiddler modules linked to their source tiddlers. Any italicised modules lack a source tiddler, typically because they were setup during the boot process.
 Palette/Caption: Palette
-Palette/CustomEditor/Prompt: Custom editor for current palette: <<palette-link>>
+Palette/CustomSettings/Prompt: Custom settings for current palette: <<palette-link>>
 Palette/Editor/Clone/Caption: clone
 Palette/Editor/Clone/Prompt: It is recommended that you clone this shadow palette before editing it
 Palette/Editor/Delete/Hint: delete this entry from the current palette
diff --git a/core/palettes/AutoToggle.tid b/core/palettes/AutoToggle.tid
index 25a87f828..84e5a8c6c 100644
--- a/core/palettes/AutoToggle.tid
+++ b/core/palettes/AutoToggle.tid
@@ -5,6 +5,6 @@ tags: $:/tags/Palette
 type: application/x-tiddler-dictionary
 color-scheme: [{$:/info/browser/darkmode}match[no]then[light]else[dark]]
 palette-type: classic
-editor: $:/palette-editors/AutoToggle
+settings: $:/palettes/AutoToggle/Settings
 palette-import@light: $:/palettes/FlexokiLight
 palette-import@dark: $:/palettes/FlexokiDark
diff --git a/core/palettes/AutoToggleEditor.tid b/core/palettes/AutoToggleSettings.tid
similarity index 95%
rename from core/palettes/AutoToggleEditor.tid
rename to core/palettes/AutoToggleSettings.tid
index cd97c8c61..7bf141ab0 100644
--- a/core/palettes/AutoToggleEditor.tid
+++ b/core/palettes/AutoToggleSettings.tid
@@ -1,4 +1,4 @@
-title: $:/palette-editors/AutoToggle
+title: $:/palettes/AutoToggle/Settings
 
 \procedure set-imported-palette(field)
 <$select field=<<field>>>
diff --git a/core/palettes/TwentyTwenties.tid b/core/palettes/TwentyTwenties.tid
index b466b4c1d..29caaf7d1 100644
--- a/core/palettes/TwentyTwenties.tid
+++ b/core/palettes/TwentyTwenties.tid
@@ -5,7 +5,7 @@ tags: $:/tags/Palette
 type: application/x-tiddler-dictionary
 color-scheme: light
 palette-type: modern
-editor: $:/palette-editors/TwentyTwenties
+settings: $:/palettes/TwentyTwenties/Settings
 
 # Background and foreground colours, which are interpolated as required
 base-paper: #FFFCF0
diff --git a/core/palettes/TwentyTwentiesEditor.tid b/core/palettes/TwentyTwentiesSettings.tid
similarity index 92%
rename from core/palettes/TwentyTwentiesEditor.tid
rename to core/palettes/TwentyTwentiesSettings.tid
index e58ba239b..7b83bed53 100644
--- a/core/palettes/TwentyTwentiesEditor.tid
+++ b/core/palettes/TwentyTwentiesSettings.tid
@@ -1,4 +1,4 @@
-title: $:/palette-editors/TwentyTwenties
+title: $:/palettes/TwentyTwenties/Settings
 
 \procedure entry(name,description)
 <$text text=<<description>>/>: <$edit-text tiddler={{$:/palette}} index=<<name>> type="color" tag="input" default={{{ [function[colour],<name>] }}}/>
diff --git a/core/ui/PaletteManager.tid b/core/ui/PaletteManager.tid
index a10c2de64..524ab02d0 100644
--- a/core/ui/PaletteManager.tid
+++ b/core/ui/PaletteManager.tid
@@ -17,12 +17,12 @@ title: $:/PaletteManager
 {{$:/snippets/palettetests}}
 
 <$let
-	paletteEditor={{{ [{$:/palette}get[editor]] :else[{$:/palette}get[palette-import]!match[]get[editor]] }}}
+	paletteSettings={{{ [{$:/palette}get[settings]] :else[{$:/palette}get[palette-import]!match[]get[settings]] }}}
 >
-	<%if [<paletteEditor>!match[]] %>
+	<%if [<paletteSettings>!match[]] %>
 		<div>
-			<<lingo CustomEditor/Prompt>>
-			<$transclude $tiddler=<<paletteEditor>> $mode="block"/>
+			<<lingo CustomSettings/Prompt>>
+			<$transclude $tiddler=<<paletteSettings>> $mode="block"/>
 		</div>
 	<%endif%>
 </$let>