diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index 6eb1ce01fc..0fdcdd4d24 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -30,6 +30,7 @@
 
 #include "pbd/rcu.h"
 #include "pbd/signals.h"
+#include "pbd/controllable.h"
 
 #include "evoral/ControlSet.h"
 
@@ -55,7 +56,7 @@ public:
 
 	virtual ~Automatable();
 
-	virtual void automatables (AutomationControlSet&) const;
+	virtual void automatables (PBD::ControllableSet&) const;
 
 	static bool skip_saving_automation; // to be used only by session-state
 
diff --git a/libs/ardour/ardour/mixer_scene.h b/libs/ardour/ardour/mixer_scene.h
index 7bdd6bb86a..2b656f69b1 100644
--- a/libs/ardour/ardour/mixer_scene.h
+++ b/libs/ardour/ardour/mixer_scene.h
@@ -40,7 +40,7 @@ public:
 
 	void snapshot ();
 	bool apply () const;
-	bool apply (AutomationControlSet const&) const;
+	bool apply (PBD::ControllableSet const&) const;
 	void clear ();
 	bool empty () const { return _ctrl_map.empty (); }
 
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index af28bc2d6b..376f73b331 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -258,7 +258,7 @@ public:
 
 	boost::shared_ptr<AutomationControl> automation_control_recurse (PBD::ID const & id) const;
 
-	 void automatables (AutomationControlSet&) const;
+	 void automatables (PBD::ControllableSet&) const;
 
 	/* special processors */
 
diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index 8d62a27c5e..e01732ae94 100644
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -611,7 +611,7 @@ Automatable::control_factory(const Evoral::Parameter& param)
 }
 
 void
-Automatable::automatables (AutomationControlSet& s) const
+Automatable::automatables (ControllableSet& s) const
 {
 	for (auto const& i : _controls) {
 		boost::shared_ptr<AutomationControl> ac = boost::dynamic_pointer_cast<AutomationControl> (i.second);
diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc
index a0cd532bb6..980b4a3159 100644
--- a/libs/ardour/luabindings.cc
+++ b/libs/ardour/luabindings.cc
@@ -512,6 +512,7 @@ LuaBindings::common (lua_State* L)
 		.addCast<AutomationControl> ("to_automationcontrol")
 		.addFunction ("name", &PBD::Controllable::name)
 		.addFunction ("get_value", &PBD::Controllable::get_value)
+		.addStaticFunction ("registered_controllables", &PBD::Controllable::registered_controllables)
 		.addStaticFunction ("dump_registry", &PBD::Controllable::dump_registry)
 		.endClass ()
 
@@ -1847,7 +1848,7 @@ LuaBindings::common (lua_State* L)
 
 		.beginWSPtrClass <MixerScene> ("MixerScene")
 		.addFunction ("apply", (bool (MixerScene::*)() const)&MixerScene::apply)
-		.addFunction ("apply_to", (bool (MixerScene::*)(AutomationControlSet const&) const)&MixerScene::apply)
+		.addFunction ("apply_to", (bool (MixerScene::*)(PBD::ControllableSet const&) const)&MixerScene::apply)
 		.addFunction ("snapshot", &MixerScene::snapshot)
 		.addFunction ("clear", &MixerScene::clear)
 		.addFunction ("empty", &MixerScene::empty)
@@ -2145,6 +2146,10 @@ LuaBindings::common (lua_State* L)
 		.beginStdVector <boost::shared_ptr<Region> > ("RegionVector")
 		.endClass ()
 
+		// typedef std::set <boost::shared_ptr<PBD::Controllable> > PBD::ControllableSet;
+		.beginStdSet <boost::shared_ptr<PBD::Controllable>> ("ControllableSet")
+		.endClass ()
+
 		// typedef std::vector<samplepos_t> XrunPositions
 		.beginStdVector <samplepos_t> ("XrunPositions")
 		.endClass ()
diff --git a/libs/ardour/mixer_scene.cc b/libs/ardour/mixer_scene.cc
index 5a5c447965..aa7ea93b37 100644
--- a/libs/ardour/mixer_scene.cc
+++ b/libs/ardour/mixer_scene.cc
@@ -139,7 +139,7 @@ MixerScene::apply () const
 }
 
 bool
-MixerScene::apply (AutomationControlSet const& acs) const
+MixerScene::apply (ControllableSet const& acs) const
 {
 	bool rv = false;
 	std::set<PBD::ID> done;
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 5364daf958..399144d364 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -6307,7 +6307,7 @@ Route::automation_control_recurse (PBD::ID const & id) const
 }
 
 void
-Route::automatables (AutomationControlSet& s) const
+Route::automatables (PBD::ControllableSet& s) const
 {
 	Automatable::automatables (s);
 	if  (_pannable) {
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 62f08ffbbe..b479d9f85e 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -7552,7 +7552,7 @@ Session::apply_nth_mixer_scene (size_t nth, RouteList const& rl)
 	}
 	assert (scene);
 
-	AutomationControlSet acs;
+	ControllableSet acs;
 	for (auto const& r : rl) {
 		r->automatables (acs);
 	}