diff --git a/src/panfrost/bifrost/valhall/ISA.xml b/src/panfrost/bifrost/valhall/ISA.xml
index 53cf0cc5311..221faebd83c 100644
--- a/src/panfrost/bifrost/valhall/ISA.xml
+++ b/src/panfrost/bifrost/valhall/ISA.xml
@@ -94,7 +94,7 @@
     <value name="Return from shader">return</value>
   </enum>
 
-  <enum name="Thread storage pointers">
+  <enum name="FAU special page 1">
     <desc>
       Situated between the immediates hard-coded in the hardware and the
       uniforms defined purely in software, Valhall has a some special
@@ -120,7 +120,7 @@
     <reserved/>
   </enum>
 
-  <enum name="Thread identification">
+  <enum name="FAU special page 3">
     <desc>
       Situated between the immediates hard-coded in the hardware and the
       uniforms defined purely in software, Valhall has a some special
diff --git a/src/panfrost/bifrost/valhall/asm.py b/src/panfrost/bifrost/valhall/asm.py
index 9a7f0d22f7b..17ec0b068ad 100644
--- a/src/panfrost/bifrost/valhall/asm.py
+++ b/src/panfrost/bifrost/valhall/asm.py
@@ -116,12 +116,12 @@ def encode_source(op, fau):
         return (val & 0x3F) | 0x80
     elif op[0] == 'i':
         return int(op[3:]) | 0xC0
-    elif op in enums['thread_storage_pointers'].bare_values:
-        idx = 32 + (enums['thread_storage_pointers'].bare_values.index(op) << 1)
+    elif op in enums['fau_special_page_1'].bare_values:
+        idx = 32 + (enums['fau_special_page_1'].bare_values.index(op) << 1)
         fau.set_page(1)
         return idx | 0xC0
-    elif op in enums['thread_identification'].bare_values:
-        idx = 32 + (enums['thread_identification'].bare_values.index(op) << 1)
+    elif op in enums['fau_special_page_3'].bare_values:
+        idx = 32 + (enums['fau_special_page_3'].bare_values.index(op) << 1)
         fau.set_page(3)
         return idx | 0xC0
     elif op.startswith('0x'):
diff --git a/src/panfrost/bifrost/valhall/disasm.py b/src/panfrost/bifrost/valhall/disasm.py
index 3d30a310419..72617ff6085 100644
--- a/src/panfrost/bifrost/valhall/disasm.py
+++ b/src/panfrost/bifrost/valhall/disasm.py
@@ -86,10 +86,10 @@ va_print_src(FILE *fp, uint8_t src, unsigned fau_page)
                 else
                     fprintf(fp, "unk:%X", value);
             } else if (fau_page == 1) {
-                fputs(valhall_thread_storage_pointers[(value - 0x20) >> 1] + 1, fp);
+                fputs(valhall_fau_special_page_1[(value - 0x20) >> 1] + 1, fp);
                 fprintf(fp, ".w%u", value & 1);
             } else if (fau_page == 3) {
-                fputs(valhall_thread_identification[(value - 0x20) >> 1] + 1, fp);
+                fputs(valhall_fau_special_page_3[(value - 0x20) >> 1] + 1, fp);
                 fprintf(fp, ".w%u", value & 1);
             } else {
                     fprintf(fp, "unk:%X", value);