diff --git a/haveyourcake2.patch b/haveyourcake2.patch
index 4e529d200..669d9258c 100644
--- a/haveyourcake2.patch
+++ b/haveyourcake2.patch
@@ -2,7 +2,7 @@ diff --git a/levels/ending/geo.c b/levels/ending/geo.c
 index 867bebb..b8e2711 100644
 --- a/levels/ending/geo.c
 +++ b/levels/ending/geo.c
-@@ -21,9 +21,7 @@ const GeoLayout ending_geo_000050[] = {
+@@ -21,9 +21,7 @@ const GeoLayout ending_geo_area_1[] = {
        GEO_OPEN_NODE(),
           GEO_NODE_ORTHO(100),
           GEO_OPEN_NODE(),
diff --git a/levels/ending/geo.c b/levels/ending/geo.c
index 867bebb56..ff8ed8ff9 100644
--- a/levels/ending/geo.c
+++ b/levels/ending/geo.c
@@ -14,7 +14,7 @@
 #include "levels/ending/header.h"
 
 // 0x0E000050
-const GeoLayout ending_geo_000050[] = {
+const GeoLayout ending_geo_area_1[] = {
    GEO_NODE_SCREEN_AREA(10, SCREEN_WIDTH/2, SCREEN_HEIGHT/2, SCREEN_WIDTH/2, SCREEN_HEIGHT/2),
    GEO_OPEN_NODE(),
       GEO_ZBUFFER(0),
diff --git a/levels/ending/header.h b/levels/ending/header.h
index 30bee900d..4725123f5 100644
--- a/levels/ending/header.h
+++ b/levels/ending/header.h
@@ -4,18 +4,17 @@
 #include "types.h"
 
 // geo
-extern const GeoLayout ending_geo_000050[];
+extern const GeoLayout ending_geo_area_1[];
 
 // leveldata
 extern const Gfx dl_cake_end_screen[];
 #ifndef EU_CUSTOM_CAKE_FIX
-extern const Gfx dl_cake_end_screen_eu_070296F8[];
-extern const Gfx dl_cake_end_screen_eu_07029768[];
-extern const Gfx dl_cake_end_screen_eu_070297D8[];
+extern const Gfx dl_cake_end_screen_eu_english[];
+extern const Gfx dl_cake_end_screen_eu_french[];
+extern const Gfx dl_cake_end_screen_eu_german[];
 #else
 extern const Gfx dl_cake_end_screen_eu_fix[];
 #endif
-extern const Gfx dl_cake_end_screen[];
 
 // script
 extern const LevelScript level_ending_entry[];
diff --git a/levels/ending/leveldata.c b/levels/ending/leveldata.c
index 88eab4ed9..c1e9c3e1a 100644
--- a/levels/ending/leveldata.c
+++ b/levels/ending/leveldata.c
@@ -10,32 +10,32 @@
 #include "levels/ending/cake_eu.inc.c"
 
 // 0x07023000 - 0x07023FFF
-ALIGNED8 static const Texture cake_end_texture_eu_35[] = {
+ALIGNED8 static const Texture cake_end_texture_eu_35_thank_you[] = {
 #include "levels/ending/eu_023000.rgba16.inc.c"
 };
 
 // 0x07024000 - 0x07024FFF
-ALIGNED8 static const Texture cake_end_texture_eu_36[] = {
+ALIGNED8 static const Texture cake_end_texture_eu_36_merci[] = {
 #include "levels/ending/eu_024000.rgba16.inc.c"
 };
 
 // 0x07025000 - 0x07025FFF
-ALIGNED8 static const Texture cake_end_texture_eu_37[] = {
+ALIGNED8 static const Texture cake_end_texture_eu_37_vrelen_dank[] = {
 #include "levels/ending/eu_025000.rgba16.inc.c"
 };
 
 // 0x07026000 - 0x07026FFF
-ALIGNED8 static const Texture cake_end_texture_eu_38[] = {
+ALIGNED8 static const Texture cake_end_texture_eu_38_the_end[] = {
 #include "levels/ending/eu_026000.rgba16.inc.c"
 };
 
 // 0x07027000 - 0x07027FFF
-ALIGNED8 static const Texture cake_end_texture_eu_39[] = {
+ALIGNED8 static const Texture cake_end_texture_eu_39_fin[] = {
 #include "levels/ending/eu_027000.rgba16.inc.c"
 };
 
 // 0x07028000 - 0x07028FFF
-ALIGNED8 static const Texture cake_end_texture_eu_40[] = {
+ALIGNED8 static const Texture cake_end_texture_eu_40_ende[] = {
 #include "levels/ending/eu_028000.rgba16.inc.c"
 };
 
@@ -193,7 +193,7 @@ const Gfx dl_cake_end_screen[] = {
 };
 
 // 0x070296D8 - 0x070296F8
-static const Gfx dl_cake_end_eu_070296D8[] = {
+static const Gfx dl_cake_end_eu_end[] = {
     gsDPPipeSync(),
     gsDPSetCycleType(G_CYC_1CYCLE),
     gsDPSetTexturePersp(G_TP_PERSP),
@@ -202,50 +202,50 @@ static const Gfx dl_cake_end_eu_070296D8[] = {
 
 #ifndef EU_CUSTOM_CAKE_FIX
 // 0x070296F8 - 0x07029768
-const Gfx dl_cake_end_screen_eu_070296F8[] = {
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_38),
+const Gfx dl_cake_end_screen_eu_english[] = {
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_38_the_end),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
     gsSPTextureRectangle(128 << 2, 200 << 2, (128 + 63) << 2, (200 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_35),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_35_thank_you),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
     gsSPTextureRectangle(128 << 2, 125 << 2, (128 + 63) << 2, (125 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10),
-    gsSPDisplayList(dl_cake_end_eu_070296D8),
+    gsSPDisplayList(dl_cake_end_eu_end),
     gsSPEndDisplayList(),
 };
 
 // 0x07029768 - 0x070297D8
-const Gfx dl_cake_end_screen_eu_07029768[] = {
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_39),
+const Gfx dl_cake_end_screen_eu_french[] = {
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_39_fin),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
     gsSPTextureRectangle(128 << 2, 200 << 2, (128 + 63) << 2, (200 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_36),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_36_merci),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
     gsSPTextureRectangle(128 << 2, 125 << 2, (128 + 63) << 2, (125 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10),
-    gsSPDisplayList(dl_cake_end_eu_070296D8),
+    gsSPDisplayList(dl_cake_end_eu_end),
     gsSPEndDisplayList(),
 };
 
 // 0x070297D8 - 0x07029848
-const Gfx dl_cake_end_screen_eu_070297D8[] = {
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_40),
+const Gfx dl_cake_end_screen_eu_german[] = {
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_40_ende),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
     gsSPTextureRectangle(128 << 2, 200 << 2, (128 + 63) << 2, (200 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10),
-    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_37),
+    gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_eu_37_vrelen_dank),
     gsDPLoadSync(),
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
     gsSPTextureRectangle(128 << 2, 125 << 2, (128 + 63) << 2, (125 + 31) << 2, G_TX_RENDERTILE, 0, 0, 4 << 10, 1 << 10),
-    gsSPDisplayList(dl_cake_end_eu_070296D8),
+    gsSPDisplayList(dl_cake_end_eu_end),
     gsSPEndDisplayList(),
 };
 
 #else
 const Gfx dl_cake_end_screen_eu_fix[] = {
-    gsSPDisplayList(dl_cake_end_eu_070296D8),
+    gsSPDisplayList(dl_cake_end_eu_end),
     gsSPEndDisplayList(),
 };
 #endif
@@ -255,27 +255,27 @@ const Gfx dl_cake_end_screen_eu_fix[] = {
 
 #include "levels/ending/cake.inc.c"
 
-#define NUM_CAKE_TEXTURES 40
+#define NUM_CAKE_TEXTURES  40
 #define NUM_CAKE_TEXTURES_X 5
 #define NUM_CAKE_TEXTURES_Y (NUM_CAKE_TEXTURES / NUM_CAKE_TEXTURES_X)
-#define CAKE_TEX_WIDTH (320 / NUM_CAKE_TEXTURES_X)
-#define CAKE_TEX_HEIGHT (240 / NUM_CAKE_TEXTURES_Y)
+#define CAKE_TEX_WIDTH          (SCREEN_WIDTH  / NUM_CAKE_TEXTURES_X)
+#define CAKE_TEX_HEIGHT         (SCREEN_HEIGHT / NUM_CAKE_TEXTURES_Y)
 
 #define MAKE_RECT_VERTICES(i, startX, startY, dx, dy, starts, startt) \
-    {{{2 + (((i) % NUM_CAKE_TEXTURES_X) * (CAKE_TEX_WIDTH - 1) + startX +  0), 240 - 6 - (((i) / NUM_CAKE_TEXTURES_X) * (CAKE_TEX_HEIGHT - 1) + startY +  0), -1}, 0, {(starts +  0) << 5, (startt +  0) << 5}, {0xFF, 0xFF, 0xFF, 0xFF}}},\
-    {{{2 + (((i) % NUM_CAKE_TEXTURES_X) * (CAKE_TEX_WIDTH - 1) + startX + dx), 240 - 6 - (((i) / NUM_CAKE_TEXTURES_X) * (CAKE_TEX_HEIGHT - 1) + startY +  0), -1}, 0, {(starts + dx) << 5, (startt +  0) << 5}, {0xFF, 0xFF, 0xFF, 0xFF}}},\
-    {{{2 + (((i) % NUM_CAKE_TEXTURES_X) * (CAKE_TEX_WIDTH - 1) + startX +  0), 240 - 6 - (((i) / NUM_CAKE_TEXTURES_X) * (CAKE_TEX_HEIGHT - 1) + startY + dy), -1}, 0, {(starts +  0) << 5, (startt + dy) << 5}, {0xFF, 0xFF, 0xFF, 0xFF}}},\
-    {{{2 + (((i) % NUM_CAKE_TEXTURES_X) * (CAKE_TEX_WIDTH - 1) + startX + dx), 240 - 6 - (((i) / NUM_CAKE_TEXTURES_X) * (CAKE_TEX_HEIGHT - 1) + startY + dy), -1}, 0, {(starts + dx) << 5, (startt + dy) << 5}, {0xFF, 0xFF, 0xFF, 0xFF}}}
+    {{{2 + (((i) % NUM_CAKE_TEXTURES_X) * (CAKE_TEX_WIDTH - 1) + startX +  0), (SCREEN_HEIGHT - 6) - (((i) / NUM_CAKE_TEXTURES_X) * (CAKE_TEX_HEIGHT - 1) + startY +  0), -1}, 0, {(starts +  0) << 5, (startt +  0) << 5}, {0xFF, 0xFF, 0xFF, 0xFF}}},\
+    {{{2 + (((i) % NUM_CAKE_TEXTURES_X) * (CAKE_TEX_WIDTH - 1) + startX + dx), (SCREEN_HEIGHT - 6) - (((i) / NUM_CAKE_TEXTURES_X) * (CAKE_TEX_HEIGHT - 1) + startY +  0), -1}, 0, {(starts + dx) << 5, (startt +  0) << 5}, {0xFF, 0xFF, 0xFF, 0xFF}}},\
+    {{{2 + (((i) % NUM_CAKE_TEXTURES_X) * (CAKE_TEX_WIDTH - 1) + startX +  0), (SCREEN_HEIGHT - 6) - (((i) / NUM_CAKE_TEXTURES_X) * (CAKE_TEX_HEIGHT - 1) + startY + dy), -1}, 0, {(starts +  0) << 5, (startt + dy) << 5}, {0xFF, 0xFF, 0xFF, 0xFF}}},\
+    {{{2 + (((i) % NUM_CAKE_TEXTURES_X) * (CAKE_TEX_WIDTH - 1) + startX + dx), (SCREEN_HEIGHT - 6) - (((i) / NUM_CAKE_TEXTURES_X) * (CAKE_TEX_HEIGHT - 1) + startY + dy), -1}, 0, {(starts + dx) << 5, (startt + dy) << 5}, {0xFF, 0xFF, 0xFF, 0xFF}}}
 
 #define MAKE_TEXT_VERTICES(i) \
-    MAKE_RECT_VERTICES(i, 0, 0, CAKE_TEX_WIDTH - 1, CAKE_TEX_HEIGHT - 1, 0, 0)
+    MAKE_RECT_VERTICES(i, 0, 0, (CAKE_TEX_WIDTH - 1), (CAKE_TEX_HEIGHT - 1), 0, 0)
 
 #define MAKE_ROW_VERTICES(row) \
-    MAKE_TEXT_VERTICES(row * NUM_CAKE_TEXTURES_X + 0), \
-    MAKE_TEXT_VERTICES(row * NUM_CAKE_TEXTURES_X + 1), \
-    MAKE_TEXT_VERTICES(row * NUM_CAKE_TEXTURES_X + 2), \
-    MAKE_TEXT_VERTICES(row * NUM_CAKE_TEXTURES_X + 3), \
-    MAKE_TEXT_VERTICES(row * NUM_CAKE_TEXTURES_X + 4)
+    MAKE_TEXT_VERTICES((row * NUM_CAKE_TEXTURES_X) + 0), \
+    MAKE_TEXT_VERTICES((row * NUM_CAKE_TEXTURES_X) + 1), \
+    MAKE_TEXT_VERTICES((row * NUM_CAKE_TEXTURES_X) + 2), \
+    MAKE_TEXT_VERTICES((row * NUM_CAKE_TEXTURES_X) + 3), \
+    MAKE_TEXT_VERTICES((row * NUM_CAKE_TEXTURES_X) + 4)
 
 const Vtx cake_verts[] = {
     MAKE_ROW_VERTICES(0),
@@ -292,11 +292,11 @@ const Vtx cake_verts[] = {
     gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, cake_end_texture_data + (CAKE_TEX_WIDTH * CAKE_TEX_HEIGHT * 2 * (i))), \
     gsDPLoadSync(), \
     gsDPLoadBlock(G_TX_LOADTILE, 0, 0, \
-        (((CAKE_TEX_WIDTH)*(CAKE_TEX_HEIGHT) + G_IM_SIZ_16b_INCR) >> G_IM_SIZ_16b_SHIFT)-1, \
+        ((((CAKE_TEX_WIDTH) * (CAKE_TEX_HEIGHT)) + G_IM_SIZ_16b_INCR) >> G_IM_SIZ_16b_SHIFT) - 1, \
         CALC_DXT(CAKE_TEX_WIDTH, G_IM_SIZ_16b_BYTES))
 
 #define LOAD_CAKE_VERTICES(i) \
-    gsSPVertex(cake_verts + 4 * (i), 4, 0)
+    gsSPVertex((cake_verts + (4 * (i))), 4, 0)
 
 #define CAKE_TRIS(i) \
     LOAD_CAKE_TEXTURE(i), \
@@ -307,11 +307,11 @@ const Vtx cake_verts[] = {
     CAKE_TRIS(i) \
 
 #define CAKE_ROW(row) \
-    CAKE_RECT((row) * NUM_CAKE_TEXTURES_X + 0),\
-    CAKE_RECT((row) * NUM_CAKE_TEXTURES_X + 1),\
-    CAKE_RECT((row) * NUM_CAKE_TEXTURES_X + 2),\
-    CAKE_RECT((row) * NUM_CAKE_TEXTURES_X + 3),\
-    CAKE_RECT((row) * NUM_CAKE_TEXTURES_X + 4)
+    CAKE_RECT(((row) * NUM_CAKE_TEXTURES_X) + 0),\
+    CAKE_RECT(((row) * NUM_CAKE_TEXTURES_X) + 1),\
+    CAKE_RECT(((row) * NUM_CAKE_TEXTURES_X) + 2),\
+    CAKE_RECT(((row) * NUM_CAKE_TEXTURES_X) + 3),\
+    CAKE_RECT(((row) * NUM_CAKE_TEXTURES_X) + 4)
 
 // 0x07026400 - 0x07027350
 const Gfx dl_cake_end_screen[] = {
@@ -324,12 +324,12 @@ const Gfx dl_cake_end_screen[] = {
         G_TX_LOADTILE, 0,
         G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD,
         G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD),
-    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, (((CAKE_TEX_WIDTH * G_IM_SIZ_16b_LINE_BYTES)+7)>>3), 0,
+    gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, (((CAKE_TEX_WIDTH * G_IM_SIZ_16b_LINE_BYTES) + 7) >> 3), 0,
         G_TX_RENDERTILE, 0,
         G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD,
         G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD),
     gsDPSetTileSize(G_TX_RENDERTILE, 0, 0,
-        (CAKE_TEX_WIDTH - 1) << G_TEXTURE_IMAGE_FRAC,
+        (CAKE_TEX_WIDTH  - 1) << G_TEXTURE_IMAGE_FRAC,
         (CAKE_TEX_HEIGHT - 1) << G_TEXTURE_IMAGE_FRAC),
 
     CAKE_ROW(0),
diff --git a/levels/ending/script.c b/levels/ending/script.c
index 301faa587..a77ebbe0f 100644
--- a/levels/ending/script.c
+++ b/levels/ending/script.c
@@ -21,7 +21,7 @@ const LevelScript level_ending_entry[] = {
     /*1*/ LOAD_YAY0(/*seg*/ 0x07, _ending_segment_7SegmentRomStart, _ending_segment_7SegmentRomEnd),
     /*4*/ ALLOC_LEVEL_POOL(),
 
-    /*5*/ AREA(/*index*/ 1, ending_geo_000050),
+    /*5*/ AREA(/*index*/ 1, ending_geo_area_1),
     /*7*/ END_AREA(),
 
     /*8*/ FREE_LEVEL_POOL(),
diff --git a/levels/rr/flying_carpet/model.inc.c b/levels/rr/flying_carpet/model.inc.c
index 422911341..6d4350099 100644
--- a/levels/rr/flying_carpet/model.inc.c
+++ b/levels/rr/flying_carpet/model.inc.c
@@ -28,7 +28,7 @@ const s16 flying_carpet_static_vertex_data[] = {
      205,    0,  992,  308,
      205, -204,    0,  308,
      307,  205,    0,    0,
-     307,    0,  990,    0,
+     307,    0,  992,    0,
      307, -204,    0,    0,
 };
 
diff --git a/src/game/geo_misc.c b/src/game/geo_misc.c
index db106342a..41965c14b 100644
--- a/src/game/geo_misc.c
+++ b/src/game/geo_misc.c
@@ -131,7 +131,7 @@ Gfx *geo_exec_flying_carpet_create(s32 callContext, struct GraphNode *node, UNUS
     Vtx *verts;
     struct GraphNodeGenerated *generatedNode = (struct GraphNodeGenerated *) node;
 
-    s16 *sp64 = segmented_to_virtual(&flying_carpet_static_vertex_data);
+    s16 *vertexData = segmented_to_virtual(&flying_carpet_static_vertex_data);
     Gfx *displayList = NULL;
     Gfx *displayListHead = NULL;
     struct Object *curGraphNodeObject;
@@ -150,11 +150,11 @@ Gfx *geo_exec_flying_carpet_create(s32 callContext, struct GraphNode *node, UNUS
             row = n / 3;
             col = n % 3;
 
-            x  = sp64[n * 4 + 0];
+            x  = vertexData[(n * 4) + 0];
             y  = round_float(sins(sFlyingCarpetRippleTimer + (row << 12) + (col << 14)) * 20.0f);
-            z  = sp64[n * 4 + 1];
-            tx = sp64[n * 4 + 2];
-            ty = sp64[n * 4 + 3];
+            z  = vertexData[(n * 4) + 1];
+            tx = vertexData[(n * 4) + 2];
+            ty = vertexData[(n * 4) + 3];
 
             make_vertex(verts, n, x, y, z, tx, ty, 0, 127, 0, 255);
         }
@@ -208,13 +208,13 @@ Gfx *geo_exec_cake_end_screen(s32 callContext, struct GraphNode *node, UNUSED Ma
 #else
     switch (eu_get_language()) {
             case LANGUAGE_ENGLISH:
-                gSPDisplayList(displayListHead++, dl_cake_end_screen_eu_070296F8);
+                gSPDisplayList(displayListHead++, dl_cake_end_screen_eu_english);
                 break;
             case LANGUAGE_FRENCH:
-                gSPDisplayList(displayListHead++, dl_cake_end_screen_eu_07029768);
+                gSPDisplayList(displayListHead++, dl_cake_end_screen_eu_french );
                 break;
             case LANGUAGE_GERMAN:
-                gSPDisplayList(displayListHead++, dl_cake_end_screen_eu_070297D8);
+                gSPDisplayList(displayListHead++, dl_cake_end_screen_eu_german );
                 break;
         }
 #endif