diff --git a/Ghidra/Processors/AARCH64/data/languages/AARCH64.dwarf b/Ghidra/Processors/AARCH64/data/languages/AARCH64.dwarf
index c3ba26e523..83e2e74abe 100644
--- a/Ghidra/Processors/AARCH64/data/languages/AARCH64.dwarf
+++ b/Ghidra/Processors/AARCH64/data/languages/AARCH64.dwarf
@@ -1,7 +1,7 @@
 <dwarf>
 	<register_mappings>
 		<register_mapping dwarf="0" ghidra="x0" auto_count="31"/> <!-- x0..x30 -->
-		<register_mapping dwarf="31" ghidra="xzr" stackpointer="true"/>
+		<register_mapping dwarf="31" ghidra="sp" stackpointer="true"/>
 		<register_mapping dwarf="64" ghidra="q0" auto_count="32"/> <!-- q0..q31 -->
 	</register_mappings>
 	<call_frame_cfa value="0"/>
diff --git a/Ghidra/Processors/AARCH64/data/languages/AARCH64_golang.register.info b/Ghidra/Processors/AARCH64/data/languages/AARCH64_golang.register.info
index ffecb12ba7..ff42eb3c66 100644
--- a/Ghidra/Processors/AARCH64/data/languages/AARCH64_golang.register.info
+++ b/Ghidra/Processors/AARCH64/data/languages/AARCH64_golang.register.info
@@ -5,6 +5,6 @@
 		<float_registers list="q0,q1,q2,q3,q4,q5,q6,q7,q8,q9,q10,q11,q12,q13,q14,q15"/>
 		<stack initialoffset="8" maxalign="8"/>
 		<current_goroutine register="x28"/>
-		<zero_register register="ZR"/>
+		<zero_register register="xzr" builtin="true"/>
 	</register_info>
 </golang>
\ No newline at end of file