diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 960cea6a88..9e509813c5 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -6766,7 +6766,7 @@ Editor::toggle_solo ()
 {
 	bool new_state = false;
 	bool first = true;
-	std::shared_ptr<ControlList> cl (new ControlList);
+	std::shared_ptr<AutomationControlList> cl (new AutomationControlList);
 
 	for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
 		StripableTimeAxisView *stav = dynamic_cast<StripableTimeAxisView *>(*i);
@@ -6791,7 +6791,7 @@ Editor::toggle_mute ()
 {
 	bool new_state = false;
 	bool first = true;
-	std::shared_ptr<ControlList> cl (new ControlList);
+	std::shared_ptr<AutomationControlList> cl (new AutomationControlList);
 
 	for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
 		StripableTimeAxisView *stav = dynamic_cast<StripableTimeAxisView *>(*i);
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index e0e47bd73d..5d7d64cc18 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -1041,7 +1041,7 @@ Mixer_UI::fan_out (std::weak_ptr<Route> wr, bool to_busses, bool group)
 					r = tl.front ();
 					assert (r);
 
-					std::shared_ptr<ControlList> cl (new ControlList);
+					std::shared_ptr<AutomationControlList> cl (new AutomationControlList);
 					cl->push_back (r->monitoring_control ());
 					_session->set_controls (cl, (double) MonitorInput, Controllable::NoGroup);
 				}
@@ -3707,7 +3707,7 @@ Mixer_UI::load_bindings ()
 template<class T> void
 Mixer_UI::control_action (std::shared_ptr<T> (Stripable::*get_control)() const)
 {
-	std::shared_ptr<ControlList> cl (new ControlList);
+	std::shared_ptr<AutomationControlList> cl (new AutomationControlList);
 	std::shared_ptr<AutomationControl> ac;
 	bool val = false;
 	bool have_val = false;
@@ -3759,8 +3759,8 @@ Mixer_UI::selected_gaincontrols ()
 		MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
 		if (ms) {
 			std::shared_ptr<GainControl> ac (ms->route()->gain_control());
-			ControlList cl (ac->grouped_controls());
-			for (ControlList::const_iterator c = cl.begin(); c != cl.end (); ++c) {
+			AutomationControlList cl (ac->grouped_controls());
+			for (AutomationControlList::const_iterator c = cl.begin(); c != cl.end (); ++c) {
 				rv.insert (*c);
 			}
 			rv.insert (ac);