diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index d94fc6a80b..a23fe35414 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1805,7 +1805,7 @@ ARDOUR_UI::transport_record (bool roll)
 {
 	if (_session) {
 		switch (_session->record_status()) {
-		case Session::Disabled:
+		case Disabled:
 			if (_session->ntracks() == 0) {
 				ArdourMessageDialog msg (_main_window, _("Please create one or more tracks before trying to record.\nYou can do this with the \"Add Track or Bus\" option in the Session menu."));
 				msg.run ();
@@ -1817,7 +1817,7 @@ ARDOUR_UI::transport_record (bool roll)
 				transport_roll ();
 			}
 			break;
-		case Session::Recording:
+		case Recording:
 			if (roll) {
 				_session->request_stop();
 			} else {
@@ -1825,7 +1825,7 @@ ARDOUR_UI::transport_record (bool roll)
 			}
 			break;
 
-		case Session::Enabled:
+		case Enabled:
 			if (roll) {
 				transport_roll();
 			} else {
diff --git a/gtk2_ardour/ardour_ui3.cc b/gtk2_ardour/ardour_ui3.cc
index 08dc4145d8..8992706c25 100644
--- a/gtk2_ardour/ardour_ui3.cc
+++ b/gtk2_ardour/ardour_ui3.cc
@@ -205,7 +205,7 @@ ARDOUR_UI::record_state_changed ()
 
 	ActionManager::set_sensitive (ActionManager::rec_sensitive_actions, !_session->actively_recording());
 
-	if (_session->record_status () == Session::Recording && _session->have_rec_enabled_track ()) {
+	if (_session->record_status () == Recording && _session->have_rec_enabled_track ()) {
 		big_clock->set_active (true);
 	} else {
 		big_clock->set_active (false);
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 254a6ed7cd..c57e7832d1 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -217,7 +217,7 @@ AudioStreamView::setup_rec_box ()
 		// cerr << "\trolling\n";
 
 		if (!rec_active &&
-		    _trackview.session()->record_status() == Session::Recording &&
+		    _trackview.session()->record_status() == Recording &&
 		    _trackview.track()->rec_enable_control()->get_value()) {
 			if (_trackview.audio_track()->mode() == Normal && UIConfiguration::instance().get_show_waveforms_while_recording() && rec_regions.size() == rec_rects.size()) {
 
@@ -270,7 +270,7 @@ AudioStreamView::setup_rec_box ()
 			create_rec_box(sample_pos, 0);
 
 		} else if (rec_active &&
-		           (_trackview.session()->record_status() != Session::Recording ||
+		           (_trackview.session()->record_status() != Recording ||
 		            !_trackview.track()->rec_enable_control()->get_value())) {
 			screen_update_connection.disconnect();
 			rec_active = false;
diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index 59a014bf47..9e122d98b5 100644
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -305,7 +305,7 @@ MidiStreamView::setup_rec_box ()
 	    (_trackview.session()->transport_rolling() || _trackview.session()->get_record_enabled())) {
 
 		if (!rec_active &&
-		    _trackview.session()->record_status() == Session::Recording &&
+		    _trackview.session()->record_status() == Recording &&
 		    _trackview.track()->rec_enable_control()->get_value()) {
 
 			if (UIConfiguration::instance().get_show_waveforms_while_recording() && rec_regions.size() == rec_rects.size()) {
@@ -374,7 +374,7 @@ MidiStreamView::setup_rec_box ()
 			create_rec_box (_trackview.midi_track()->current_capture_start(), 0);
 
 		} else if (rec_active &&
-		           (_trackview.session()->record_status() != Session::Recording ||
+		           (_trackview.session()->record_status() != Recording ||
 		            !_trackview.track()->rec_enable_control()->get_value())) {
 			screen_update_connection.disconnect();
 			rec_active = false;
diff --git a/gtk2_ardour/route_list_base.cc b/gtk2_ardour/route_list_base.cc
index 4b8186f82c..2404cdc7b4 100644
--- a/gtk2_ardour/route_list_base.cc
+++ b/gtk2_ardour/route_list_base.cc
@@ -1162,7 +1162,7 @@ RouteListBase::idle_update_mute_rec_solo_etc ()
 			std::shared_ptr<MidiTrack> mt = std::dynamic_pointer_cast<MidiTrack> (route);
 
 			if (trk->rec_enable_control ()->get_value ()) {
-				if (_session->record_status () == Session::Recording) {
+				if (_session->record_status () == Recording) {
 					(*i)[_columns.rec_state] = 1;
 				} else {
 					(*i)[_columns.rec_state] = 2;
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 2b46c538e5..74b31bb227 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -1389,12 +1389,12 @@ RouteUI::blink_rec_display (bool blinkOn)
 
 	if (track()->rec_enable_control()->get_value()) {
 		switch (_session->record_status ()) {
-			case Session::Recording:
+			case Recording:
 				rec_enable_button->set_active_state (Gtkmm2ext::ExplicitActive);
 				break;
 
-			case Session::Disabled:
-			case Session::Enabled:
+			case Disabled:
+			case Enabled:
 				if (!UIConfiguration::instance().get_no_strobe() && UIConfiguration::instance().get_blink_rec_arm()) {
 					rec_enable_button->set_active_state ( blinkOn ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off );
 				} else {
diff --git a/gtk2_ardour/transport_control_ui.cc b/gtk2_ardour/transport_control_ui.cc
index 574228836d..01edda1cd9 100644
--- a/gtk2_ardour/transport_control_ui.cc
+++ b/gtk2_ardour/transport_control_ui.cc
@@ -306,20 +306,20 @@ TransportControlUI::blink_rec_enable (bool onoff)
 		return;
 	}
 
-	Session::RecordState const r = _session->record_status ();
+	RecordState const r = _session->record_status ();
 	bool const h = _session->have_rec_enabled_track ();
 
 	if (UIConfiguration::instance().get_no_strobe()) {
 		onoff = true;
 	}
 
-	if (r == Session::Enabled || (r == Session::Recording && !h)) {
+	if (r == Enabled || (r == Recording && !h)) {
 		if (onoff) {
 			rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
 		} else {
 			rec_button.set_active_state (Gtkmm2ext::Off);
 		}
-	} else if (r == Session::Recording && h) {
+	} else if (r == Recording && h) {
 		rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
 	} else {
 		rec_button.unset_active_state ();