diff --git a/snes/main.a65 b/snes/main.a65
index 0d8d335..92a069c 100644
--- a/snes/main.a65
+++ b/snes/main.a65
@@ -4,11 +4,11 @@
 GAME_MAIN:
 	sep #$20 : .as
 	lda #$00
-	sta @AVR_CMD
+	sta @MCU_CMD		; clear MCU command register
 	rep #$20 : .al
 	lda #$0000
-	sta @AVR_PARAM
-	sta @AVR_PARAM+2
+	sta @MCU_PARAM		; clear MCU command parameters
+	sta @MCU_PARAM+2
 	sep #$20 : .as
 	stz $4200 ; inhibit VBlank NMI
 
diff --git a/snes/memmap.i65 b/snes/memmap.i65
index c4abea6..e1c1b09 100644
--- a/snes/memmap.i65
+++ b/snes/memmap.i65
@@ -22,8 +22,8 @@
 #define BG1_TILE_BAK	$7E9000
 #define BG2_TILE_BAK	$7E8000
 
-#define AVR_CMD		$307000
-#define AVR_PARAM	$307004
+#define MCU_CMD		$307000
+#define MCU_PARAM	$307004
 #define RTC_STATUS	$307100
 #define LAST_STATUS	$307101
 #define SYSINFO_BLK	$307200
diff --git a/snes/menu.a65 b/snes/menu.a65
index a8e72ce..29dc5a1 100644
--- a/snes/menu.a65
+++ b/snes/menu.a65
@@ -530,19 +530,19 @@ sel_is_spc
 	bra select_item_cont
 
 select_file:
-	; have avr load the rom
+	; have MCU load the rom
 	dey
 	rep #$20 : .al
 	lda [dirptr_addr], y
 	and #$00ff
-	sta @AVR_PARAM+2
+	sta @MCU_PARAM+2
 	dey
 	dey
 	lda [dirptr_addr], y
-	sta @AVR_PARAM
+	sta @MCU_PARAM
 	sep #$20 : .as
 	lda #$01
-	sta @AVR_CMD
+	sta @MCU_CMD
 select_file_fade:
 	lda #$00
 	sta @$4200
@@ -651,16 +651,16 @@ select_spc:
 	rep #$20 : .al
 	lda [dirptr_addr], y
 	and #$00ff
-	sta @AVR_PARAM+2
+	sta @MCU_PARAM+2
 	dey
 	dey
 	lda [dirptr_addr], y
-	sta @AVR_PARAM
+	sta @MCU_PARAM
 	sep #$20 : .as
 	lda #CMD_LOADSPC
-	sta @AVR_CMD
+	sta @MCU_CMD
 wait_spc:
-	lda @AVR_CMD
+	lda @MCU_CMD
 	cmp #$00
 	bne wait_spc
 	jsr spcplayer
@@ -806,7 +806,7 @@ select_last_file:
 	and pad1trig+1
 	beq -
 	lda #$04
-	sta @AVR_CMD
+	sta @MCU_CMD
 	jmp select_file_fade
 +	jsr restore_screen
 	plp
diff --git a/snes/spcplay.a65 b/snes/spcplay.a65
index c20e434..baafb08 100644
--- a/snes/spcplay.a65
+++ b/snes/spcplay.a65
@@ -201,7 +201,7 @@ spc_key_b:
 	sei		; Blank screen & issue CMD_RESET command to Microcontroller...
 	stz $2100	; ...this is required, because there is no other way to stop S-SMP & S-DSP
 	lda #CMD_RESET
-	sta @AVR_CMD
+	sta @MCU_CMD
 -
 	bra -		; At this point, the SNES waits for an external reset from the Microcontroller
 
diff --git a/snes/sysinfo.a65 b/snes/sysinfo.a65
index ae1e3a1..ff2b79a 100644
--- a/snes/sysinfo.a65
+++ b/snes/sysinfo.a65
@@ -47,7 +47,7 @@ sysinfo_printloop:
 	sep #$20 : .as
 	rep #$10 : .xl
 	lda #CMD_SYSINFO
-	sta @AVR_CMD
+	sta @MCU_CMD
 	lda #^SYSINFO_BLK
 	ldx #!SYSINFO_BLK
 	sta print_bank
@@ -130,5 +130,5 @@ sysinfo_printloop:
 +	plp
 	jsr restore_screen
 	lda #$00
-	sta @AVR_CMD
+	sta @MCU_CMD
 	rtl
diff --git a/snes/time.a65 b/snes/time.a65
index d10de79..d70a527 100644
--- a/snes/time.a65
+++ b/snes/time.a65
@@ -680,31 +680,31 @@ is_leapyear_400th
 
 settime
 	lda time_y100
-	sta @AVR_PARAM
+	sta @MCU_PARAM
 	lda time_y10
-	sta @AVR_PARAM+1
+	sta @MCU_PARAM+1
 	lda time_y1
-	sta @AVR_PARAM+2
+	sta @MCU_PARAM+2
 	lda time_mon
-	sta @AVR_PARAM+3
+	sta @MCU_PARAM+3
 	lda time_d10
-	sta @AVR_PARAM+4
+	sta @MCU_PARAM+4
 	lda time_d1
-	sta @AVR_PARAM+5
+	sta @MCU_PARAM+5
 	lda time_h10
-	sta @AVR_PARAM+6
+	sta @MCU_PARAM+6
 	lda time_h1
-	sta @AVR_PARAM+7
+	sta @MCU_PARAM+7
 	lda time_m10
-	sta @AVR_PARAM+8
+	sta @MCU_PARAM+8
 	lda time_m1
-	sta @AVR_PARAM+9
+	sta @MCU_PARAM+9
 	lda time_s10
-	sta @AVR_PARAM+10
+	sta @MCU_PARAM+10
 	lda time_s1
-	sta @AVR_PARAM+11
+	sta @MCU_PARAM+11
 	lda #$02 ; set clock
-	sta @AVR_CMD
+	sta @MCU_CMD
 	rts
 
 printtime: