Index: rom/bios.s
===================================================================
--- rom/bios.s	(revision 8325447d07a5d175402b922c7c6881b9bbf0a20d)
+++ rom/bios.s	(revision 16badfe1b6c70af99c55c5c3bb131d348a5a37c3)
@@ -467,5 +467,5 @@
 
 		move.l	#rsarea,savptr		| Setup pointer to register area
-		move.l	#RSMAGIC,_rsflag	| Set magic in _rsflag
+		move.l	#RSMAGIC,rsflag		| Set magic in rsflag
 
 		move.l	#nullrts,timevec	| Set timer interrupt vector
@@ -505,6 +505,6 @@
 		move.l	#nullrte,0x007C		| Set level 7 vector
 
-		move.l	#trap13,0x00B4		| Set trap13 vector
-		move.l	#trap14,0x00B8		| Set trap14 vector
+		move.l	#trap13_,0x00B4		| Set trap13 vector
+		move.l	#trap14_,0x00B8		| Set trap14 vector
 
 		.page
@@ -704,5 +704,5 @@
 		move.l	#rsarea,savptr		| Restore system save pointer
 		move.l	#SSTACK,a7		| Reset the stack pointer
-		move.l	#RSMAGIC,_rsflag	| ... and the stack sentinel
+		move.l	#RSMAGIC,rsflag		| ... and the stack sentinel
 		trap	#15			| TRAP to ROMP
 
@@ -805,12 +805,12 @@
 		.page
 
-| trap14 -- Extended BIOS entry point
-| ------    -------------------------
-trap14:		lea	t14tab,a0		| Setup trap 14 table address
+| trap14_ -- Extended BIOS entry point
+| -------    -------------------------
+trap14_:	lea	t14tab,a0		| Setup trap 14 table address
 		bra	trapent			| Go process trap
 
-| trap13 -- Main BIOS entry point
-| ------    ---------------------
-trap13:		lea	t13tab,a0		| Setup trap 13 table address
+| trap13_ -- Main BIOS entry point
+| -------    ---------------------
+trap13_:	lea	t13tab,a0		| Setup trap 13 table address
 
 trapent:	move.l	savptr,a1		| Get save area pointer
@@ -3732,5 +3732,5 @@
 savptr:		.ds.l	1		| Pointer to register save area
 
-_rsflag:	.ds.l	1		| Register save area overflow flag
+rsflag:		.ds.l	1		| Register save area overflow flag
 		.ds.l	18*32		| Register save area  (32 levels)
 rsarea:		.ds.l	1		| Dummy long word at top of save area
Index: rom/lowram.s
===================================================================
--- rom/lowram.s	(revision 8325447d07a5d175402b922c7c6881b9bbf0a20d)
+++ rom/lowram.s	(revision 16badfe1b6c70af99c55c5c3bb131d348a5a37c3)
@@ -79,8 +79,8 @@
 | The equate for HI_RAM must be set to match the memory configuration used.
 
-| 	For a  512K system, _Hi_RAM = 0x080000
-| 	For a 1024K system, _Hi_RAM = 0x100000
+| 	For a  512K system, Hi_RAM = 0x080000
+| 	For a 1024K system, Hi_RAM = 0x100000
 
-_Hi_RAM		=	0x100000		| highest RAM address + 1
+Hi_RAM		=	0x100000		| highest RAM address + 1
 
 		.page
@@ -91,5 +91,5 @@
 LOWRAM:		lea	basebss,a0		| setup bss base
 		move.l	a0,p_bbase		| ...
-		lea	_Hi_RAM-0x400,a1	| setup faked bss length
+		lea	Hi_RAM-0x400,a1		| setup faked bss length
 		suba.l	a0,a1			| ...
 		move.l	a1,p_blen		| ...
@@ -107,5 +107,5 @@
 		move.l	a1,p_tlen		| ...
 
-		lea	_Hi_RAM,a7		| setup stack pointer
+		lea	Hi_RAM,a7		| setup stack pointer
 
 		lea	p_lowtpa,a0		| setup TPA base