diff --git a/data/language/english_uk.txt b/data/language/english_uk.txt
index be5f6534f3..abd1a8ea03 100644
--- a/data/language/english_uk.txt
+++ b/data/language/english_uk.txt
@@ -3957,10 +3957,10 @@ STR_5615    :L
 STR_5616    :{SMALLFONT}{BLACK}Last element for tile flag
 STR_5617    :{SMALLFONT}{BLACK}Move selected element up.
 STR_5618    :{SMALLFONT}{BLACK}Move selected element down.
-STR_5619    :RCT1 Classic
-STR_5620    :Corkscrew Follies
+STR_5619    :RollerCoaster Tycoon
+STR_5620    :Added Attractions
 STR_5621    :Loopy Landscapes
-STR_5622    :RCT2 Vanilla
+STR_5622    :RollerCoaster Tycoon 2
 STR_5623    :Wacky Worlds
 STR_5624    :Time Twister
 STR_5625    :{OPENQUOTES}Real{ENDQUOTES} Parks
diff --git a/src/localisation/string_ids.h b/src/localisation/string_ids.h
index 3dcfce3d49..e62e622dc0 100644
--- a/src/localisation/string_ids.h
+++ b/src/localisation/string_ids.h
@@ -2240,10 +2240,10 @@ enum {
 	STR_NOTIFICATION_GUEST_USED_FACILITY = 5605,
 	STR_NOTIFICATION_GUEST_DIED = 5606,
 
-	STR_SCENARIO_CATEGORY_RCT1_CLASSIC = 5619,
-	STR_SCENARIO_CATEGORY_RCT1_CF = 5620,
+	STR_SCENARIO_CATEGORY_RCT1 = 5619,
+	STR_SCENARIO_CATEGORY_RCT1_AA = 5620,
 	STR_SCENARIO_CATEGORY_RCT1_LL = 5621,
-	STR_SCENARIO_CATEGORY_RCT2_VANILLA = 5622,
+	STR_SCENARIO_CATEGORY_RCT2 = 5622,
 	STR_SCENARIO_CATEGORY_RCT2_WW = 5623,
 	STR_SCENARIO_CATEGORY_RCT2_TT = 5624,
 	STR_SCENARIO_CATEGORY_REAL_PARKS = 5625,
diff --git a/src/scenario.h b/src/scenario.h
index 1da4609a82..19f3d84bab 100644
--- a/src/scenario.h
+++ b/src/scenario.h
@@ -73,12 +73,12 @@ typedef struct {
 } rct_scenario_scores_header;
 
 typedef enum {
-	SCENARIO_SOURCE_RCT1_CLASSIC,
-	SCENARIO_SOURCE_RCT1_CORKSCREW,
-	SCENARIO_SOURCE_RCT1_LOOPY,
-	SCENARIO_SOURCE_RCT2_VANILLA,
-	SCENARIO_SOURCE_RCT2_WACKY,
-	SCENARIO_SOURCE_RCT2_TIME,
+	SCENARIO_SOURCE_RCT1,
+	SCENARIO_SOURCE_RCT1_AA,
+	SCENARIO_SOURCE_RCT1_LL,
+	SCENARIO_SOURCE_RCT2,
+	SCENARIO_SOURCE_RCT2_WW,
+	SCENARIO_SOURCE_RCT2_TT,
 	SCENARIO_SOURCE_REAL,
 	SCENARIO_SOURCE_OTHER
 } scenario_source;
@@ -100,7 +100,7 @@ typedef struct {
 	sint32 flags;				// 0x0268
 	uint32 company_value;		// 0x026C
 	char completed_by[64];		// 0x0270
-	scenario_source source_game;// new in OpenRCT2
+	uint8 source_game;			// new in OpenRCT2
 	sint16 source_index;		// new in OpenRCT2
 } rct_scenario_basic;
 
diff --git a/src/scenario_list.c b/src/scenario_list.c
index 73ff7caab4..8980250d97 100644
--- a/src/scenario_list.c
+++ b/src/scenario_list.c
@@ -56,7 +56,7 @@ sint16 get_scenario_index(rct_scenario_basic *scenario)
 	return -1;
 }
 
-void normalize_scenario_name(rct_scenario_basic *scenario)
+void normalise_scenario_name(rct_scenario_basic *scenario)
 {
 	char* name = scenario->name;
 
@@ -78,18 +78,18 @@ void normalize_scenario_name(rct_scenario_basic *scenario)
 
 scenario_source source_by_index(uint8 index)
 {
-	if (index >= SCENARIO_SOURCE_RCT1_CLASSIC_INDEX && index < SCENARIO_SOURCE_RCT1_CORKSCREW_INDEX) {
-		return SCENARIO_SOURCE_RCT1_CLASSIC;
-	} else if (index >= SCENARIO_SOURCE_RCT1_CORKSCREW_INDEX && index < SCENARIO_SOURCE_RCT1_LOOPY_INDEX) {
-		return SCENARIO_SOURCE_RCT1_CORKSCREW;
-	} else if (index >= SCENARIO_SOURCE_RCT1_LOOPY_INDEX && index < SCENARIO_SOURCE_RCT2_VANILLA_INDEX) {
-		return SCENARIO_SOURCE_RCT1_LOOPY;
-	} else if (index >= SCENARIO_SOURCE_RCT2_VANILLA_INDEX && index < SCENARIO_SOURCE_RCT2_WACKY_INDEX) {
-		return SCENARIO_SOURCE_RCT2_VANILLA;
-	} else if (index >= SCENARIO_SOURCE_RCT2_WACKY_INDEX && index < SCENARIO_SOURCE_RCT2_TIME_INDEX) {
-		return SCENARIO_SOURCE_RCT2_WACKY;
-	} else if (index >= SCENARIO_SOURCE_RCT2_TIME_INDEX && index < SCENARIO_SOURCE_REAL_INDEX) {
-		return SCENARIO_SOURCE_RCT2_TIME;
+	if (index >= SCENARIO_SOURCE_RCT1_INDEX && index < SCENARIO_SOURCE_RCT1_AA_INDEX) {
+		return SCENARIO_SOURCE_RCT1;
+	} else if (index >= SCENARIO_SOURCE_RCT1_AA_INDEX && index < SCENARIO_SOURCE_RCT1_LL_INDEX) {
+		return SCENARIO_SOURCE_RCT1_AA;
+	} else if (index >= SCENARIO_SOURCE_RCT1_LL_INDEX && index < SCENARIO_SOURCE_RCT2_INDEX) {
+		return SCENARIO_SOURCE_RCT1_LL;
+	} else if (index >= SCENARIO_SOURCE_RCT2_INDEX && index < SCENARIO_SOURCE_RCT2_WW_INDEX) {
+		return SCENARIO_SOURCE_RCT2;
+	} else if (index >= SCENARIO_SOURCE_RCT2_WW_INDEX && index < SCENARIO_SOURCE_RCT2_TT_INDEX) {
+		return SCENARIO_SOURCE_RCT2_WW;
+	} else if (index >= SCENARIO_SOURCE_RCT2_TT_INDEX && index < SCENARIO_SOURCE_REAL_INDEX) {
+		return SCENARIO_SOURCE_RCT2_TT;
 	} else if (index >= SCENARIO_SOURCE_REAL_INDEX && index < NUM_ORIGINAL_SCENARIOS) {
 		return SCENARIO_SOURCE_REAL;
 	} else {
@@ -186,7 +186,7 @@ static void scenario_list_add(const char *path)
 	}
 
 	// Normalize the name to make the scenario as recognisable as possible.
-	normalize_scenario_name(scenario);
+	normalise_scenario_name(scenario);
 
 	// Look up and store information regarding the origins of this scenario.
 	scenario->source_index = get_scenario_index(scenario);
diff --git a/src/scenario_sources.h b/src/scenario_sources.h
index 248669d7bf..9c82307844 100644
--- a/src/scenario_sources.h
+++ b/src/scenario_sources.h
@@ -1,12 +1,12 @@
 #define NUM_ORIGINAL_SCENARIOS 136
 #define NUM_ALIASES 5
 
-#define SCENARIO_SOURCE_RCT1_CLASSIC_INDEX 0
-#define SCENARIO_SOURCE_RCT1_CORKSCREW_INDEX 22
-#define SCENARIO_SOURCE_RCT1_LOOPY_INDEX 52
-#define SCENARIO_SOURCE_RCT2_VANILLA_INDEX 82
-#define SCENARIO_SOURCE_RCT2_WACKY_INDEX 97
-#define SCENARIO_SOURCE_RCT2_TIME_INDEX 114
+#define SCENARIO_SOURCE_RCT1_INDEX 0
+#define SCENARIO_SOURCE_RCT1_AA_INDEX 22
+#define SCENARIO_SOURCE_RCT1_LL_INDEX 52
+#define SCENARIO_SOURCE_RCT2_INDEX 82
+#define SCENARIO_SOURCE_RCT2_WW_INDEX 97
+#define SCENARIO_SOURCE_RCT2_TT_INDEX 114
 #define SCENARIO_SOURCE_REAL_INDEX 128
 
 const char * const scenario_aliases[NUM_ALIASES * 2] = {
diff --git a/src/windows/title_scenarioselect.c b/src/windows/title_scenarioselect.c
index b87c5added..62bb58e979 100644
--- a/src/windows/title_scenarioselect.c
+++ b/src/windows/title_scenarioselect.c
@@ -331,7 +331,7 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi)
 		y = (widget->top + widget->bottom) / 2 + w->y - 3;
 
 		if (gConfigGeneral.scenario_select_mode == 1) {
-			RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 0, short) = STR_SCENARIO_CATEGORY_RCT1_CLASSIC + i;
+			RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 0, short) = STR_SCENARIO_CATEGORY_RCT1 + i;
 		} else { // old-style
 			RCT2_GLOBAL(RCT2_ADDRESS_COMMON_FORMAT_ARGS + 0, short) = STR_BEGINNER_PARKS + i;
 		}