diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index ee38789e0a..0bfc21da8d 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -2135,7 +2135,7 @@ MixerStrip::hide_master_spacer (bool yn)
 void
 MixerStrip::set_trigger_display (boost::shared_ptr<TriggerBox> tb)
 {
-	_tmaster->set_trigger (tb);
+	_tmaster->set_triggerbox (tb);
 	trigger_display.set_triggerbox (tb.get());
 }
 
diff --git a/gtk2_ardour/trigger_master.cc b/gtk2_ardour/trigger_master.cc
index a12beedd98..8cd222231a 100644
--- a/gtk2_ardour/trigger_master.cc
+++ b/gtk2_ardour/trigger_master.cc
@@ -231,7 +231,7 @@ TriggerMaster::~TriggerMaster ()
 }
 
 void
-TriggerMaster::set_trigger (boost::shared_ptr<ARDOUR::TriggerBox> t)
+TriggerMaster::set_triggerbox (boost::shared_ptr<ARDOUR::TriggerBox> t)
 {
 	_triggerbox = t;
 }
diff --git a/gtk2_ardour/trigger_master.h b/gtk2_ardour/trigger_master.h
index 4f0a6b7a48..35fc0b9d12 100644
--- a/gtk2_ardour/trigger_master.h
+++ b/gtk2_ardour/trigger_master.h
@@ -67,7 +67,7 @@ public:
 	TriggerMaster (ArdourCanvas::Item* canvas);
 	~TriggerMaster ();
 
-	void set_trigger (boost::shared_ptr<ARDOUR::TriggerBox>);
+	void set_triggerbox (boost::shared_ptr<ARDOUR::TriggerBox>);
 
 	void render (ArdourCanvas::Rect const&, Cairo::RefPtr<Cairo::Context>) const;
 
diff --git a/gtk2_ardour/trigger_strip.cc b/gtk2_ardour/trigger_strip.cc
index 9e6fc2477e..70e6040e89 100644
--- a/gtk2_ardour/trigger_strip.cc
+++ b/gtk2_ardour/trigger_strip.cc
@@ -190,7 +190,7 @@ TriggerStrip::set_route (boost::shared_ptr<Route> rt)
 {
 	RouteUI::set_route (rt);
 
-	_tmaster->set_trigger(_route->triggerbox ());
+	_tmaster->set_triggerbox(_route->triggerbox ());
 
 	_processor_box.set_route (rt);