diff --git a/src/openrct2/ride/ride.h b/src/openrct2/ride/ride.h
index 217883c154..1730d43f93 100644
--- a/src/openrct2/ride/ride.h
+++ b/src/openrct2/ride/ride.h
@@ -423,10 +423,10 @@ enum {
 	// Lifting arm rotation ride (enterprise)
 	RIDE_ENTRY_FLAG_ALTERNATIVE_ROTATION_MODE_2		= 1 << 6,
 	RIDE_ENTRY_FLAG_7								= 1 << 7,
-	RIDE_ENTRY_FLAG_8								= 1 << 8,
-	RIDE_ENTRY_FLAG_9								= 1 << 9,
+	RIDE_ENTRY_FLAG_PLAY_SPLASH_SOUND				= 1 << 8,
+	RIDE_ENTRY_FLAG_PLAY_SPLASH_SOUND_SLIDE			= 1 << 9,
 	RIDE_ENTRY_FLAG_COVERED_RIDE					= 1 << 10,
-	RIDE_ENTRY_FLAG_11								= 1 << 11,
+	RIDE_ENTRY_FLAG_LIMIT_AIRTIME_BONUS				= 1 << 11,
 	RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME				= 1 << 12,
 	RIDE_ENTRY_FLAG_SEPARATE_RIDE					= 1 << 13,
 	RIDE_ENTRY_FLAG_CANNOT_BREAK_DOWN				= 1 << 14,
@@ -434,7 +434,7 @@ enum {
 	RIDE_ENTRY_FLAG_16								= 1 << 16,
 	RIDE_ENTRY_DISABLE_FIRST_TWO_OPERATING_MODES	= 1 << 17,
 	RIDE_ENTRY_FLAG_18								= 1 << 18,
-	RIDE_ENTRY_FLAG_19								= 1 << 19,
+	RIDE_ENTRY_FLAG_DISABLE_COLOUR_TAB				= 1 << 19,
 	// Must be set with swing mode 1 as well.
 	RIDE_ENTRY_FLAG_ALTERNATIVE_SWING_MODE_2		= 1 << 20,
 	RIDE_ENTRY_FLAG_21								= 1 << 21,
diff --git a/src/openrct2/ride/ride_ratings.c b/src/openrct2/ride/ride_ratings.c
index 46dedd9630..89db531694 100644
--- a/src/openrct2/ride/ride_ratings.c
+++ b/src/openrct2/ride/ride_ratings.c
@@ -754,7 +754,7 @@ static void ride_ratings_apply_adjustments(rct_ride *ride, rating_tuple *ratings
 #ifdef ORIGINAL_RATINGS
 	if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_HAS_AIR_TIME) {
 		uint16 totalAirTime = ride->total_air_time;
-		if (rideEntry->flags & RIDE_ENTRY_FLAG_11) {
+		if (rideEntry->flags & RIDE_ENTRY_FLAG_LIMIT_AIRTIME_BONUS) {
 			if (totalAirTime >= 96) {
 				totalAirTime -= 96;
 				ratings->excitement -= totalAirTime / 8;
@@ -767,7 +767,7 @@ static void ride_ratings_apply_adjustments(rct_ride *ride, rating_tuple *ratings
 	}
 #else
 	if (RideData4[ride->type].flags & RIDE_TYPE_FLAG4_HAS_AIR_TIME) {
-		if (rideEntry->flags & RIDE_ENTRY_FLAG_11) {
+		if (rideEntry->flags & RIDE_ENTRY_FLAG_LIMIT_AIRTIME_BONUS) {
 			// Limit airtime bonus for heartline twister coaster (see issues #2031 and #2064)
 			ratings->excitement += min(ride->total_air_time, 96) / 8;
 		} else {
diff --git a/src/openrct2/ride/vehicle.c b/src/openrct2/ride/vehicle.c
index 35c1ac4319..b2050f8a23 100644
--- a/src/openrct2/ride/vehicle.c
+++ b/src/openrct2/ride/vehicle.c
@@ -6968,8 +6968,8 @@ static void vehicle_update_handle_water_splash(rct_vehicle *vehicle)
 	rct_ride_entry *rideEntry = get_ride_entry(vehicle->ride_subtype);
 	int trackType = vehicle->track_type >> 2;
 
-	if (!(rideEntry->flags & RIDE_ENTRY_FLAG_8)) {
-		if (rideEntry->flags & RIDE_ENTRY_FLAG_9) {
+	if (!(rideEntry->flags & RIDE_ENTRY_FLAG_PLAY_SPLASH_SOUND)) {
+		if (rideEntry->flags & RIDE_ENTRY_FLAG_PLAY_SPLASH_SOUND_SLIDE) {
 			if (!vehicle->is_child) {
 				if (track_element_is_covered(trackType)) {
 					rct_vehicle *nextVehicle = GET_VEHICLE(vehicle->next_vehicle_on_ride);
@@ -8899,7 +8899,7 @@ loc_6DC316:
 		}
 	}
 
-	if (rideEntry->flags & RIDE_ENTRY_FLAG_9) {
+	if (rideEntry->flags & RIDE_ENTRY_FLAG_PLAY_SPLASH_SOUND_SLIDE) {
 		if (!vehicle->is_child) {
 			regs.bx = vehicle->track_type >> 2;
 			if (track_element_is_covered(regs.bx)) {
diff --git a/src/openrct2/windows/ride.c b/src/openrct2/windows/ride.c
index 87b6e56c74..727abbe63d 100644
--- a/src/openrct2/windows/ride.c
+++ b/src/openrct2/windows/ride.c
@@ -1468,7 +1468,7 @@ static void window_ride_disable_tabs(rct_window *w)
 	if (type == NULL) {
 		disabled_tabs |= 1 << WIDX_TAB_2 | 1 << WIDX_TAB_3 | 1 << WIDX_TAB_4 | 1 << WIDX_TAB_5 | 1 << WIDX_TAB_6
 					   | 1 << WIDX_TAB_7 | 1 << WIDX_TAB_8 | 1 << WIDX_TAB_9 | 1 << WIDX_TAB_10;
-	} else if ((type->flags & RIDE_ENTRY_FLAG_19) != 0)
+	} else if ((type->flags & RIDE_ENTRY_FLAG_DISABLE_COLOUR_TAB) != 0)
 		disabled_tabs |= (1 << WIDX_TAB_5); // 0x100
 
 	w->disabled_widgets = disabled_tabs;