diff --git a/gtk2_ardour/clearlooks.rc.in b/gtk2_ardour/clearlooks.rc.in
index 4e598d5a57..13c588017b 100644
--- a/gtk2_ardour/clearlooks.rc.in
+++ b/gtk2_ardour/clearlooks.rc.in
@@ -1174,8 +1174,8 @@ widget "*FadeCurve*" style:highest "medium_bold_entry"
 widget "*RouteParamsListDisplay" style:highest "inspector_track_list_display"
 widget "*TearOffArrow" style:highest "tearoff_arrow"
 widget "*RouteParamsTitleLabel" style:highest "medium_text"
-widget "*PluginAutomateButton" style:highest "small_button"
-widget "*PluginAutomateButton*" style:highest "small_button"
+widget "*plugin automation state button" style:highest "small_button"
+widget "*plugin automation state button*" style:highest "small_button"
 widget "*PluginSaveButton" style:highest "small_button"
 widget "*PluginSaveButton*" style:highest "small_button"
 widget "*PluginEditorButton*" style:highest "default_toggle_button"
diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index 010dfe5237..2be161035f 100644
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -555,7 +555,7 @@ GenericPluginUI::ControlUI::ControlUI (const Evoral::Parameter& p)
 	, meterinfo (0)
 	, knobtable (0)
 {
-	automate_button.set_name ("PluginAutomateButton");
+	automate_button.set_name ("plugin automation state button");
 	set_tooltip (automate_button, _("Automation control"));
 
 	/* XXX translators: use a string here that will be at least as long
diff --git a/gtk2_ardour/themes/blueberry-milk-ardour.colors b/gtk2_ardour/themes/blueberry-milk-ardour.colors
index e667a0aa0d..7a6a1e332f 100644
--- a/gtk2_ardour/themes/blueberry-milk-ardour.colors
+++ b/gtk2_ardour/themes/blueberry-milk-ardour.colors
@@ -286,7 +286,7 @@
     <ColorAlias name="midi sysex fill" alias="color 32"/>
     <ColorAlias name="midi sysex outline" alias="color 64"/>
     <ColorAlias name="midi track base" alias="color 82"/>
-    <ColorAlias name="PluginAutomateButton: fill active" alias="color 8"/>
+    <ColorAlias name="plugin automation state button: fill active" alias="color 8"/>
     <ColorAlias name="mixer strip button: fill active" alias="color 8"/>
     <ColorAlias name="mixer strip button: led active" alias="color 8"/>
     <ColorAlias name="mixer strip name button: fill active" alias="color 67"/>
diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors
index fee34cea17..7b4fe2eb38 100644
--- a/gtk2_ardour/themes/caineville-ardour.colors
+++ b/gtk2_ardour/themes/caineville-ardour.colors
@@ -286,7 +286,7 @@
     <ColorAlias name="midi sysex fill" alias="color 32"/>
     <ColorAlias name="midi sysex outline" alias="color 64"/>
     <ColorAlias name="midi track base" alias="color 39"/>
-    <ColorAlias name="PluginAutomateButton: fill active" alias="color 8"/>
+    <ColorAlias name="plugin automation state button: fill active" alias="color 8"/>
     <ColorAlias name="mixer strip button: fill active" alias="color 8"/>
     <ColorAlias name="mixer strip button: led active" alias="color 8"/>
     <ColorAlias name="mixer strip name button: fill active" alias="color 67"/>
diff --git a/gtk2_ardour/themes/clear-gray-ardour.colors b/gtk2_ardour/themes/clear-gray-ardour.colors
index 4ecc33df22..c266e3842c 100644
--- a/gtk2_ardour/themes/clear-gray-ardour.colors
+++ b/gtk2_ardour/themes/clear-gray-ardour.colors
@@ -286,7 +286,7 @@
     <ColorAlias name="midi sysex fill" alias="color 10"/>
     <ColorAlias name="midi sysex outline" alias="color 64"/>
     <ColorAlias name="midi track base" alias="color 74"/>
-    <ColorAlias name="PluginAutomateButton: fill active" alias="color 8"/>
+    <ColorAlias name="plugin automation state button: fill active" alias="color 8"/>
     <ColorAlias name="mixer strip button: fill active" alias="color 8"/>
     <ColorAlias name="mixer strip button: led active" alias="color 8"/>
     <ColorAlias name="mixer strip name button: fill active" alias="color 67"/>
diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors
index 88bd48dad2..c39450c54e 100644
--- a/gtk2_ardour/themes/cubasish-ardour.colors
+++ b/gtk2_ardour/themes/cubasish-ardour.colors
@@ -286,7 +286,7 @@
     <ColorAlias name="midi sysex fill" alias="color 32"/>
     <ColorAlias name="midi sysex outline" alias="color 64"/>
     <ColorAlias name="midi track base" alias="color 39"/>
-    <ColorAlias name="PluginAutomateButton: fill active" alias="color 8"/>
+    <ColorAlias name="plugin automation state button: fill active" alias="color 8"/>
     <ColorAlias name="mixer strip button: fill active" alias="color 8"/>
     <ColorAlias name="mixer strip button: led active" alias="color 8"/>
     <ColorAlias name="mixer strip name button: fill active" alias="color 67"/>
diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors
index 95d6888523..37cf1377b7 100644
--- a/gtk2_ardour/themes/dark-ardour.colors
+++ b/gtk2_ardour/themes/dark-ardour.colors
@@ -286,7 +286,7 @@
     <ColorAlias name="midi sysex fill" alias="color 32"/>
     <ColorAlias name="midi sysex outline" alias="color 64"/>
     <ColorAlias name="midi track base" alias="color 41"/>
-    <ColorAlias name="PluginAutomateButton: fill active" alias="color 8"/>
+    <ColorAlias name="plugin automation state button: fill active" alias="color 8"/>
     <ColorAlias name="mixer strip button: fill active" alias="color 8"/>
     <ColorAlias name="mixer strip button: led active" alias="color 8"/>
     <ColorAlias name="mixer strip name button: fill active" alias="color 67"/>
diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors
index 07b9179b25..176d690b52 100644
--- a/gtk2_ardour/themes/unastudia-ardour.colors
+++ b/gtk2_ardour/themes/unastudia-ardour.colors
@@ -291,7 +291,7 @@
 		<ColorAlias name="midi sysex fill" alias="color 105"/>
 		<ColorAlias name="midi sysex outline" alias="color 17"/>
 		<ColorAlias name="midi track base" alias="color 27"/>
-		<ColorAlias name="PluginAutomateButton: fill active" alias="color 1"/>
+		<ColorAlias name="plugin automation state button: fill active" alias="color 1"/>
 		<ColorAlias name="mixer strip button: fill active" alias="color 1"/>
 		<ColorAlias name="mixer strip button: led active" alias="color 1"/>
 		<ColorAlias name="mixer strip name button: fill active" alias="color 67"/>