diff --git a/Binary/RCZ180_nat.com b/Binary/RCZ180_nat.com
deleted file mode 100644
index 17029f7c..00000000
Binary files a/Binary/RCZ180_nat.com and /dev/null differ
diff --git a/Source/HBIOS/cfg_master.asm b/Source/HBIOS/cfg_master.asm
index 41395a09..9bc94944 100644
--- a/Source/HBIOS/cfg_master.asm
+++ b/Source/HBIOS/cfg_master.asm
@@ -96,6 +96,7 @@ UARTSBC		.EQU	FALSE		; UART: AUTO-DETECT SBC/ZETA ONBOARD UART
 UARTCAS		.EQU	FALSE		; UART: AUTO-DETECT ECB CASSETTE UART
 UARTMFP		.EQU	FALSE		; UART: AUTO-DETECT MF/PIC UART
 UART4		.EQU	FALSE		; UART: AUTO-DETECT 4UART UART
+UARTCASSPD	.EQU	SER_300_8N1	; UART: ECB CASSETTE UART DEFAULT SPEED
 ;
 ASCIENABLE	.EQU	FALSE		; ASCI: ENABLE Z180 ASCI SERIAL DRIVER (ASCI.ASM)
 ASCI0CFG	.EQU	DEFSERCFG	; ASCI 0: SERIAL LINE CONFIG
diff --git a/Source/HBIOS/cfg_mk4.asm b/Source/HBIOS/cfg_mk4.asm
index 24c26947..7291659f 100644
--- a/Source/HBIOS/cfg_mk4.asm
+++ b/Source/HBIOS/cfg_mk4.asm
@@ -81,7 +81,7 @@ UARTSBC		.EQU	FALSE		; UART: AUTO-DETECT SBC/ZETA ONBOARD UART
 UARTCAS		.EQU	TRUE		; UART: AUTO-DETECT ECB CASSETTE UART
 UARTMFP		.EQU	FALSE		; UART: AUTO-DETECT MF/PIC UART
 UART4		.EQU	TRUE		; UART: AUTO-DETECT 4UART UART
-UARTCASSPD	.EQU	SER_300_8N1	; ECB CASSETTE UART DEFAULT SPEED
+UARTCASSPD	.EQU	SER_300_8N1	; UART: ECB CASSETTE UART DEFAULT SPEED
 ;
 ASCIENABLE	.EQU	TRUE		; ASCI: ENABLE Z180 ASCI SERIAL DRIVER (ASCI.ASM)
 ASCI0CFG	.EQU	DEFSERCFG	; ASCI 0: SERIAL LINE CONFIG
diff --git a/Source/HBIOS/cfg_n8.asm b/Source/HBIOS/cfg_n8.asm
index e61adc2d..f63be838 100644
--- a/Source/HBIOS/cfg_n8.asm
+++ b/Source/HBIOS/cfg_n8.asm
@@ -84,7 +84,7 @@ UARTSBC		.EQU	FALSE		; UART: AUTO-DETECT SBC/ZETA ONBOARD UART
 UARTCAS		.EQU	TRUE		; UART: AUTO-DETECT ECB CASSETTE UART
 UARTMFP		.EQU	FALSE		; UART: AUTO-DETECT MF/PIC UART
 UART4		.EQU	TRUE		; UART: AUTO-DETECT 4UART UART
-UARTCASSPD	.EQU	SER_300_8N1	; ECB CASSETTE UART DEFAULT SPEED
+UARTCASSPD	.EQU	SER_300_8N1	; UART: ECB CASSETTE UART DEFAULT SPEED
 ;
 ASCIENABLE	.EQU	TRUE		; ASCI: ENABLE Z180 ASCI SERIAL DRIVER (ASCI.ASM)
 ASCI0CFG	.EQU	DEFSERCFG	; ASCI 0: SERIAL LINE CONFIG
diff --git a/Source/HBIOS/cfg_sbc.asm b/Source/HBIOS/cfg_sbc.asm
index b2f6bd43..3622da7b 100644
--- a/Source/HBIOS/cfg_sbc.asm
+++ b/Source/HBIOS/cfg_sbc.asm
@@ -75,7 +75,7 @@ UARTSBC		.EQU	TRUE		; UART: AUTO-DETECT SBC/ZETA ONBOARD UART
 UARTCAS		.EQU	TRUE		; UART: AUTO-DETECT ECB CASSETTE UART
 UARTMFP		.EQU	TRUE		; UART: AUTO-DETECT MF/PIC UART
 UART4		.EQU	TRUE		; UART: AUTO-DETECT 4UART UART
-UARTCASSPD	.EQU	SER_300_8N1	; ECB CASSETTE UART DEFAULT SPEED
+UARTCASSPD	.EQU	SER_300_8N1	; UART: ECB CASSETTE UART DEFAULT SPEED
 ;
 ASCIENABLE	.EQU	FALSE		; ASCI: ENABLE Z180 ASCI SERIAL DRIVER (ASCI.ASM)
 ;
diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 19aa457b..7e879f51 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -1180,8 +1180,8 @@ HB_CPU2:
 ;
 	LD	A,FORCECON		; CALCULATE PRE-INIT TABLE		; A IS INDEX OF CONSOLE DEVICE ENTRY
 	RLCA				; ENTRY THAT WE WANT TO			; A IS OFFSET OF CONSOLE DEVICE ENTRY
-	LD	DE,(PC_INITTBL)		; EXECUTE FIRST				; DE IS VALUE OF TOP ENTRY
-	LD	HL,PC_INITTBL							; HL IS ADDRESS OF TOP OF TABLE
+	LD	DE,(HB_PCINITTBL)		; EXECUTE FIRST			; DE IS VALUE OF TOP ENTRY
+	LD	HL,HB_PCINITTBL							; HL IS ADDRESS OF TOP OF TABLE
 	PUSH	HL								; PUSH (1) TOP OF TABLE
 	PUSH	DE								; PUSH (2) VALUE OF TOP ENTRY 
 	PUSH	HL								; PUSH (3) TOP OF TABLE
@@ -1195,15 +1195,15 @@ HB_CPU2:
 	LD	(HL),E								; SAVE DE OVER ORIGINAL ENTRY
 	INC	HL
 	LD	(HL),D
-	LD	B,PC_INITTBLLEN
+	LD	B,HB_PCINITTBLLEN
 	POP	DE								; POP (1) DE IS ADDRESS OF TOP OF TABLE
 
 #IF (BT_REC_TYPE != BT_REC_NONE)
 	LD	A,(HB_BOOT_REC)		; IF WE ARE IN RECOVERY MODE
 	OR	A			; POINT TO THE RECOVER MODE
 	JR	Z,NOT_REC_M0		; INITIALIZATION TABLE
-	LD	B,PC_INITRLEN
-	LD	DE,PC_INIT_REC
+	LD	B,HB_PCINITRLEN
+	LD	DE,HB_PCINIT_REC
 NOT_REC_M0:
 
 #ENDIF
@@ -1504,12 +1504,12 @@ CALLDUMMY:
 ;
 #IF (BT_REC_TYPE != BT_REC_NONE)
 ;
-PC_INIT_REC:
+HB_PCINIT_REC:
   #IF (PLATFORM == PLT_SBC)
 	.DW	UART_PREINIT
 ;	.DW	CALLDUMMY
   #ENDIF
-PC_INITRLEN	.EQU	(($ - PC_INIT_REC) / 2)
+HB_PCINITRLEN	.EQU	(($ - HB_PCINIT_REC) / 2)
 ;
 HB_INIT_REC:
   #IF (PLATFORM == PLT_SBC)
@@ -1524,7 +1524,7 @@ HB_INITRLEN	.EQU	(($ - HB_INIT_REC) / 2)
 ;   TABLE OF PRE-CONSOLE INITIALIZATION ENTRY POINTS
 ;==================================================================================================
 ;
-PC_INITTBL:
+HB_PCINITTBL:
 	.DW	CALLDUMMY	; RESERVED FOR FORCING PRIMARY CONSOLE
 #IF (ASCIENABLE)
 	.DW	ASCI_PREINIT
@@ -1544,7 +1544,7 @@ PC_INITTBL:
 #IF (UFENABLE)
 	.DW	UF_PREINIT
 #ENDIF
-PC_INITTBLLEN	.EQU	(($ - PC_INITTBL) / 2)
+HB_PCINITTBLLEN	.EQU	(($ - HB_PCINITTBL) / 2)
 
 ;==================================================================================================
 ;   TABLE OF INITIALIZATION ENTRY POINTS