diff --git a/src/addresses.h b/src/addresses.h
index c962328e60..cb3f4a35ca 100644
--- a/src/addresses.h
+++ b/src/addresses.h
@@ -40,7 +40,7 @@
 #define RCT2_CALLPROC_4(address, a1, a2, a3, a4, v1, v2, v3, v4)			RCT2_CALLFUNC_4(address, void, a1, a2, a3, a4, v1, v2, v3, v4)
 #define RCT2_CALLPROC_5(address, a1, a2, a3, a4, a5, v1, v2, v3, v4, v5)	RCT2_CALLFUNC_5(address, void, a1, a2, a3, a4, a5, v1, v2, v3, v4, v5)
 
-#define RCT2_ADDRESS_RIDE_PROPERTIES				0x00997c9d
+#define RCT2_ADDRESS_RIDE_PROPERTIES				0x00997C9D
 #define RCT2_ADDRESS_LAND_TOOL_SIZE					0x009A9800
 
 #define RCT2_ADDRESS_SCENARIO_LIST					0x009A9FF4
@@ -54,6 +54,8 @@
 #define RCT2_ADDRESS_CONFIG_KEYBOARD_SHORTCUTS		0x009AAC7A
 #define RCT2_ADDRESS_CONFIG_EDGE_SCROLLING			0x009AACBA
 
+#define RCT2_ADDRESS_EXPANSION_NAMES				0x009AACC0
+#define RCT2_ADDRESS_EXPANSION_FLAGS				0x009AB4C0
 #define RCT2_ADDRESS_CONFIG_RESOLUTION_WIDTH		0x009AB4C2
 #define RCT2_ADDRESS_CONFIG_RESOLUTION_HEIGHT		0x009AB4C4
 
@@ -68,8 +70,6 @@
 #define RCT2_ADDRESS_SCREEN_DPI						0x009ABDC8
 #define RCT2_ADDRESS_SCREEN_WIDTH					0x009ABDD8
 #define RCT2_ADDRESS_SCREEN_HEIGHT					0x009ABDDA
-#define RCT2_ADDRESS_SCREEN_CAP_BPP					0x01423C10
-#define RCT2_ADDRESS_SCREEN_CAP_RASTER_STRETCH		0x01423C14
 
 #define RCT2_ADDRESS_DIRTY_BLOCK_WIDTH				0x009ABDE4
 #define RCT2_ADDRESS_DIRTY_BLOCK_HEIGHT				0x009ABDE6
@@ -215,8 +215,8 @@
 #define RCT2_ADDRESS_MEM_TOTAL_PAGEFILE				0x01423B60
 #define RCT2_ADDRESS_MEM_TOTAL_VIRTUAL				0x01423B64
 
-#define RCT2_ADDRESS_EXPANSION_FLAGS				0x009AB4C0
-#define RCT2_ADDRESS_EXPANSION_NAMES				0x009AACC0
+#define RCT2_ADDRESS_SCREEN_CAP_BPP					0x01423C10
+#define RCT2_ADDRESS_SCREEN_CAP_RASTER_STRETCH		0x01423C14
 
 static void RCT2_CALLPROC_EBPSAFE(int address)
 {