diff --git a/Source/Apps/VGM/Build.cmd b/Source/Apps/VGM/Build.cmd
index 7e2fe40e..08e013f5 100644
--- a/Source/Apps/VGM/Build.cmd
+++ b/Source/Apps/VGM/Build.cmd
@@ -6,7 +6,7 @@ set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
 tasm -t180 -g3 -fFF -dWBW vgmplay.asm vgmplay.com vgmplay.lst || exit /b
-tasm -t180 -g3 -fFF -dWBW ym2612.asm ym2612.com ym2612.lst || exit /b
+tasm -t180 -g3 -fFF -dWBW ymfmdemo.asm ymfmdemo.com ymfmdemo.lst || exit /b
 
 copy /Y vgmplay.com ..\..\..\Binary\Apps\ || exit /b
 copy /Y Tunes\*.vgm ..\..\..\Binary\Apps\Tunes\ || exit /b
diff --git a/Source/Apps/VGM/Makefile b/Source/Apps/VGM/Makefile
index 58cc9428..fdb643d9 100644
--- a/Source/Apps/VGM/Makefile
+++ b/Source/Apps/VGM/Makefile
@@ -11,8 +11,8 @@ vgmplay.com: $(DEPS)
 	$(TASM) -dWBW vgmplay.asm vgmplay.com vgmplay.lst
 
 ym2612.com: 
-	$(TASM) -dWBW ym2612.asm ym2612.com ym2612.lst
+	$(TASM) -dWBW ymfmdemo.asm ymfmdemo.com ymfmdemo.lst
 
 all::
 	mkdir -p $(DEST)/Tunes
-	cp Tunes/* $(DEST)/Tunes
+	cp Tunes/*.vgm $(DEST)/Tunes
diff --git a/Source/Apps/VGM/YM2612.ASM b/Source/Apps/VGM/ymfmdemo.asm
similarity index 98%
rename from Source/Apps/VGM/YM2612.ASM
rename to Source/Apps/VGM/ymfmdemo.asm
index b2014b64..ba45f419 100644
--- a/Source/Apps/VGM/YM2612.ASM
+++ b/Source/Apps/VGM/ymfmdemo.asm
@@ -25,6 +25,7 @@ MBC		.equ	2
 ;
 plt_romwbw	.equ	1			; Build for ROMWBW?
 plt_type	.equ	sbcecb			; Select build configuration
+plt_cpuspd	.equ	6			; Non ROMWBW cpu speed default
 debug		.equ	0
 
 ctc_delay	.equ	0