diff --git a/include/variables.h b/include/variables.h
index 32983d58c4..4aa711b99c 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -358,8 +358,7 @@ extern OSMesgQueue viEventQueue;
 extern u16 viRetrace;
 extern DmaEntry dmadata[1568];
 // extern UNK_TYPE1 D_80186028;
-// extern UNK_TYPE1 D_801AAAB0;
-extern u64 gJpegUCode[];
+extern u64 aspMainTextStart[];
 extern ActorInit En_A_Obj_InitVars;
 extern ColliderCylinderInit enAObjCylinderInit;
 extern InitChainEntry enAObjInitVar;
@@ -3085,15 +3084,11 @@ extern const s16 gAudioTatumInit[];
 extern const AudioContextInitSizes gAudioContextInitSizes;
 // extern UNK_TYPE4 D_801E1108;
 // extern UNK_TYPE4 D_801E110C;
-// extern UNK_TYPE2 D_801E1180;
-// extern UNK_TYPE1 D_801E1420;
-// extern UNK_TYPE2 D_801E1630;
-// extern UNK_TYPE1 D_801E1E40;
-// extern UNK_TYPE1 D_801E1E80;
-extern u64 gspF3DEX2_NoN_fifoTextStart[];
-extern u64 gspF3DEX2_NoN_fifoDataStart[];
-extern u64 gJpegUCodeData[];
-// extern UNK_TYPE1 D_801E3FA0;
+// extern UNK_TYPE2 gSoundFontTable;
+// extern UNK_TYPE1 gSequenceFontTable;
+// extern UNK_TYPE2 gSequenceTable;
+// extern UNK_TYPE1 gSampleBankTable;
+extern u64 aspMainDataStart[];
 
 // bss
 // extern UNK_TYPE1 D_801ED890;
diff --git a/spec b/spec
index 2215b88ab0..2f18e27d30 100644
--- a/spec
+++ b/spec
@@ -14,7 +14,7 @@ beginseg
     name "boot"
     address 0x80080060
     include "build/src/boot_O2_g3/boot_main.o"
-    include "build/data/boot/rsp_boot.data.o"
+    include "build/data/boot/rspboot.data.o"
     include "build/src/boot_O2_g3/idle.o"
     include "build/src/boot_O2_g3/idle_extra_bss.o"
     include "build/src/boot_O2_g3/viconfig.o"
@@ -422,7 +422,9 @@ beginseg
     compress
     after "dmadata"
     include "build/src/code/z_en_a_keep.o"
-    include "build/data/code/rsp.data.o"
+    include "build/data/code/aspMain.data.o"
+    include "build/data/code/gspS2DEX2.fifo.data.o"
+    include "build/data/code/njpgdspMain.data.o"
     include "build/data/code/code_801ADE60.data.o"
     include "build/data/code/code_801E3FA0.bss.o"
     include "build/src/code/z_en_item00.o"
@@ -662,7 +664,11 @@ beginseg
     include "build/src/code/jpegdecoder.o"
     include_readonly "build/src/code/z_game_over.o"
     include "build/src/code/z_construct.o"
-    include "build/data/code/rsp.rodata.o"
+    include "build/data/code/audio_tables.rodata.o"
+    include "build/data/code/aspMain.rodata.o"
+    include "build/data/code/gspF3DZEX2.NoN.PosLight.fifo.rodata.o"
+    include "build/data/code/gspS2DEX2.fifo.rodata.o"
+    include "build/data/code/njpgdspMain.rodata.o"
 endseg
 
 beginseg
diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c
index 9bde9e6df3..f9433eab22 100644
--- a/src/code/sys_ucode.c
+++ b/src/code/sys_ucode.c
@@ -7,8 +7,11 @@
 extern u64 rspbootTextStart[];
 extern u64 rspbootTextEnd[];
 
-u64* initialgspUcodeText = gspF3DEX2_NoN_fifoTextStart;
-u64* initialgspUcodeData = gspF3DEX2_NoN_fifoDataStart;
+extern u64 gspF3DZEX2_NoN_PosLight_fifoTextStart[];
+extern u64 gspF3DZEX2_NoN_PosLight_fifoDataStart[];
+
+u64* initialgspUcodeText = gspF3DZEX2_NoN_PosLight_fifoTextStart;
+u64* initialgspUcodeData = gspF3DZEX2_NoN_PosLight_fifoDataStart;
 
 u64* SysUcode_GetUCodeBoot(void) {
     return rspbootTextStart;
diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c
index c611ab1f87..7b9254ccd3 100644
--- a/src/code/z_jpeg.c
+++ b/src/code/z_jpeg.c
@@ -16,6 +16,9 @@
 #define MARKER_COM 0xFE
 #define MARKER_EOI 0xD9
 
+extern u64 njpgdspMainTextStart[];
+extern u64 njpgdspMainDataStart[];
+
 /**
  * Configures and schedules a JPEG decoder task and waits for it to finish.
  */
@@ -25,9 +28,9 @@ void Jpeg_ScheduleDecoderTask(JpegContext* jpegCtx) {
         0,                    // flags
         NULL,                 // ucode_boot
         0,                    // ucode_boot_size
-        gJpegUCode,           // ucode
+        njpgdspMainTextStart, // ucode
         0x1000,               // ucode_size
-        gJpegUCodeData,       // ucode_data
+        njpgdspMainDataStart, // ucode_data
         0x800,                // ucode_data_size
         NULL,                 // dram_stack
         0,                    // dram_stack_size
diff --git a/tools/disasm/files.txt b/tools/disasm/files.txt
index 175365f8e8..66e4e88f38 100644
--- a/tools/disasm/files.txt
+++ b/tools/disasm/files.txt
@@ -245,7 +245,7 @@
             0x80096930 : "__osMemcpy",
 
             # .data section
-            0x800969C0 : "rsp_boot",
+            0x800969C0 : "rspboot",
             0x80096B20 : "idle",
             0x80096B40 : "viconfig",
             0x80096B50 : "z_std_dma",
@@ -503,7 +503,9 @@
             0x801AAAA0 : "z_construct",
 
             # .data section
-            0x801AAAB0 : "rsp",
+            0x801AAAB0 : "aspMain",
+            0x801ABAB0 : "gspS2DEX2.fifo",
+            0x801AD370 : "njpgdspMain",
             0x801ADE60 : "",
             0x801ADEC0 : "z_en_item00",
             0x801AE240 : "z_eff_blure",
@@ -674,7 +676,11 @@
             0x801E1070 : "code_801A7B10",
             0x801E1100 : "audio_init_params",
             0x801E1110 : "z_game_over",
-            0x801E1180 : "rsp",
+            0x801E1180 : "audio_tables",
+            0x801E1E80 : "aspMain",
+            0x801E2160 : "gspF3DZEX2.NoN.PosLight.fifo",
+            0x801E3BB0 : "gspS2DEX2.fifo",
+            0x801E3F40 : "njpgdspMain",
 
             # .bss section
             0x801E3FA0 : "code_801E3FA0",
diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt
index 6c8568e840..21b9ee5e96 100644
--- a/tools/disasm/variables.txt
+++ b/tools/disasm/variables.txt
@@ -365,9 +365,9 @@
     0x8009F8A0:("viRetrace","u16","",0x2),
     0x8009F8B0:("dmadata","DmaEntry","[1568]",0x6200),
     0x80186028:("D_80186028","s16","[1316]",0xa48),
-    0x801AAAB0:("D_801AAAB0","UNK_TYPE1","",0x1),
-    0x801ABAB0:("D_801ABAB0","UNK_TYPE1","",0x1),
-    0x801AD370:("gJpegUCode","UNK_TYPE1","",0x1),
+    0x801AAAB0:("aspMainTextStart","UNK_TYPE1","",0x1),
+    0x801ABAB0:("gspS2DEX2_fifoTextStart","UNK_TYPE1","",0x1),
+    0x801AD370:("njpgdspMainTextStart","UNK_TYPE1","",0x1),
     0x801ADE60:("En_A_Obj_InitVars","ActorInit","",0x20),
     0x801ADE80:("enAObjCylinderInit","ColliderCylinderInit","",0x2c),
     0x801ADEAC:("enAObjInitVar","ActorInitVar","",0x4),
@@ -3873,15 +3873,15 @@
     0x801E1104:("gAudioContextInitSizes","AudioContextInitSizes","",0xC),
     0x801E1110:("sGameOverTimer","UNK_TYPE2","",0x2),
     0x801E1120:("jtbl_801E1120","UNK_PTR","",0x4),
-    0x801E1180:("D_801E1180","UNK_TYPE2","",0x2),
-    0x801E1420:("D_801E1420","UNK_TYPE1","",0x1),
-    0x801E1630:("D_801E1630","UNK_TYPE2","",0x2),
-    0x801E1E40:("D_801E1E40","UNK_TYPE1","",0x1),
-    0x801E1E80:("D_801E1E80","UNK_TYPE1","",0x1),
-    0x801E2160:("gspF3DEX2_NoN_fifoTextStart","UNK_TYPE1","",0x1),
-    0x801E3790:("gspF3DEX2_NoN_fifoDataStart","UNK_TYPE1","",0x1),
-    0x801E3BB0:("D_801E3BB0","UNK_TYPE1","",0x1),
-    0x801E3F40:("gJpegUCodeData","UNK_TYPE1","",0x1),
+    0x801E1180:("gSoundFontTable","UNK_TYPE2","",0x2),
+    0x801E1420:("gSequenceFontTable","UNK_TYPE1","",0x1),
+    0x801E1630:("gSequenceTable","UNK_TYPE2","",0x2),
+    0x801E1E40:("gSampleBankTable","UNK_TYPE1","",0x1),
+    0x801E1E80:("aspMainDataStart","UNK_TYPE1","",0x2E0),
+    0x801E2160:("gspF3DZEX2_NoN_PosLight_fifoTextStart","UNK_TYPE1","",0x1),
+    0x801E3790:("gspF3DZEX2_NoN_PosLight_fifoDataStart","UNK_TYPE1","",0x1),
+    0x801E3BB0:("gspS2DEX2_fifoDataStart","UNK_TYPE1","",0x1),
+    0x801E3F40:("njpgdspMainDataStart","UNK_TYPE1","",0x1),
     0x801E3FA0:("D_801E3FA0","UNK_TYPE1","",0x1),
     0x801E3FB0:("sEffectContext","EffectContext","",0x98E0),
     0x801ED890:("D_801ED890","UNK_TYPE1","",0x1),