diff --git a/include/common.h b/include/common.h
index 31d8ec5..024f517 100644
--- a/include/common.h
+++ b/include/common.h
@@ -554,7 +554,6 @@ extern s32 func_80173B60(s32);
 extern s32 D_800AF0B0;
 
 extern void Unpack(u8* buffer, u32 size); 
-extern OSMesgQueue MQ_800AF320;
 
 typedef struct {
         /* 0x00 */ s32 field_0x0;
diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt
index f57a979..5493cd2 100644
--- a/linker_scripts/symbols/addr.txt
+++ b/linker_scripts/symbols/addr.txt
@@ -946,7 +946,7 @@ __MUS_MEM_800B1868 = 0x800B1868;
 MQ_SWAP_BUFFER = 0x800E9BA8;
 MQ_800E7988 = 0x800E7988;
 MQ_800C35A0 = 0x800C35A0;
-MQ_800AF320 = 0x800AF320;
+obUnpackQueue = 0x800AF320;
 MQ_800B1880 = 0x800B1880;
 MQ_800E79C8 = 0x800E79C8;
 MQ_800C49E8 = 0x800C49E8;
diff --git a/src/_ob_rabid_jar.c b/src/_ob_rabid_jar.c
index f7276b3..97f4c48 100644
--- a/src/_ob_rabid_jar.c
+++ b/src/_ob_rabid_jar.c
@@ -58,6 +58,8 @@ extern void* D_800C47F0[4];
 extern void func_8007819C();
 extern s32 func_80173B60(s32);
 
+extern OSMesgQueue obUnpackQueue;
+
 INCLUDE_ASM(const s32, "_ob_rabid_jar", __calls_loads_overlay_array);
 
 INCLUDE_ASM(const s32, "_ob_rabid_jar", func_80076150);
@@ -450,7 +452,7 @@ INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007AB30);
 /* AF7C 8007AB7C  */
 void obSendUnpackMesg(OBUnpackMesg* msg) {
     msg->format = 1;
-    osSendMesg(&MQ_800AF320, msg, 1);
+    osSendMesg(&obUnpackQueue, msg, OS_MESG_BLOCK);
 }
 
 INCLUDE_ASM(const s32, "_ob_rabid_jar", func_8007ABAC);
@@ -460,7 +462,7 @@ void UnpackProc(void) {
     OBUnpackMesg *msg = NULL;
 
     while(1) {
-        osRecvMesg(&MQ_800AF320, (OSMesg)&msg, 1);
+        osRecvMesg(&obUnpackQueue, (OSMesg)&msg, 1);
         if (msg->format == 1) {
             Unpack(msg->buffer, msg->size);
             osSendMesg(msg->queue, msg, OS_MESG_BLOCK);