diff --git a/gtk2_ardour/trigger_master.cc b/gtk2_ardour/trigger_master.cc
index ee19c47506..35974cfd18 100644
--- a/gtk2_ardour/trigger_master.cc
+++ b/gtk2_ardour/trigger_master.cc
@@ -579,9 +579,9 @@ CueMaster::event_handler (GdkEvent* ev)
 		case GDK_BUTTON_PRESS:
 			if (ev->button.button == 1) {
 				if (Keyboard::modifier_state_equals (ev->button.state, Keyboard::PrimaryModifier)) {
-					_session->stop_all_triggers (true);  //stop 'now'
+					_session->trigger_stop_all (true);  //stop 'now'
 				} else {
-					_session->stop_all_triggers (false);  //stop quantized (bar end)
+					_session->trigger_stop_all (false);  //stop quantized (bar end)
 				}
 				return true;
 			}
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index eadea5ced2..238445c17b 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -490,7 +490,7 @@ public:
 	double default_play_speed ();
 	void reset_transport_speed (TransportRequestSource origin = TRS_UI);
 
-	void stop_all_triggers (bool now = true);
+	void trigger_stop_all (bool now = true);
 
 	void request_transport_speed (double speed, TransportRequestSource origin = TRS_UI);
 	void request_default_play_speed (double speed, TransportRequestSource origin = TRS_UI);
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 3119483141..345869b851 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -434,7 +434,7 @@ Session::set_transport_speed (double speed)
 
 /** Called from the gui thread */
 void
-Session::stop_all_triggers (bool now)
+Session::trigger_stop_all (bool now)
 {
 	boost::shared_ptr<RouteList> rl = routes.reader();
 
diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc
index 1e0333243f..ac0040ebb1 100644
--- a/libs/surfaces/control_protocol/basic_ui.cc
+++ b/libs/surfaces/control_protocol/basic_ui.cc
@@ -463,9 +463,9 @@ BasicUI::transport_rolling () const
 }
 
 void
-BasicUI::stop_all_triggers (bool stop_all)
+BasicUI::trigger_stop_all (bool stop_all)
 {
-	session->stop_all_triggers (stop_all);
+	session->trigger_stop_all (stop_all);
 }
 
 void
diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
index 2d505553e2..f2b8452ced 100644
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -101,7 +101,7 @@ class LIBCONTROLCP_API BasicUI {
 	void midi_panic();
 
 	void trigger_cue_row (int cue);
-	void stop_all_triggers (bool stop_now = false);
+	void trigger_stop_all (bool stop_now = false);
 
 	void toggle_monitor_mute();
 	void toggle_monitor_dim();
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 2743fa4512..a287d7eea2 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -460,7 +460,7 @@ OSC::register_callbacks()
 		REGISTER_CALLBACK (serv, X_("/locate"), "ii", locate);
 
 		REGISTER_CALLBACK (serv, X_("/trigger_cue_row"), "i", trigger_cue_row);
-		REGISTER_CALLBACK (serv, X_("/stop_all_triggers"), "i", stop_all_triggers);
+		REGISTER_CALLBACK (serv, X_("/trigger_stop_all"), "i", trigger_stop_all);
 
 		REGISTER_CALLBACK (serv, X_("/save_state"), "", save_state);
 		REGISTER_CALLBACK (serv, X_("/save_state"), "f", save_state);
diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h
index 5bd6f1a918..5805c0d648 100644
--- a/libs/surfaces/osc/osc.h
+++ b/libs/surfaces/osc/osc.h
@@ -487,7 +487,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
 	}
 
 	PATH_CALLBACK1(trigger_cue_row,i,);
-	PATH_CALLBACK1(stop_all_triggers,i,);  //0 = "stop at end of bar"  1 = "stop now"
+	PATH_CALLBACK1(trigger_stop_all,i,);  //0 = "stop at end of bar"  1 = "stop now"
 
 	PATH_CALLBACK1(set_transport_speed,f,);
 	PATH_CALLBACK1(add_marker_name,s,&);
diff --git a/libs/surfaces/push2/cues.cc b/libs/surfaces/push2/cues.cc
index b57fee2748..6a35e4ae23 100644
--- a/libs/surfaces/push2/cues.cc
+++ b/libs/surfaces/push2/cues.cc
@@ -487,7 +487,7 @@ void
 CueLayout::button_stop_press ()
 {
 	if (_p2.modifier_state() == Push2::ModShift) {
-		_p2.get_session().stop_all_triggers (false); /* quantized global stop */
+		_p2.get_session().trigger_stop_all (false); /* quantized global stop */
 	}
 }
 void