Mercurial > hg > Members > kono > nitros9-code

changeset 2868:cfa46960b6bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
makefiles: Rename DW3 to DW all over Rename dw3*.sb to dwio*.sb This is part of getting default and lwtools-port branches together, trying to avoid things falling through the cracks.
author Tormod Volden <debian.tormod@gmail.com>
date Sun, 24 Nov 2013 11:13:40 +0100
parents 97ba1059a8ce
children cfa6222348f7
files 3rdparty/customboots/boisy/makefile 3rdparty/packages/arcadepak/makefile 3rdparty/packages/fsim2/makefile 3rdparty/packages/koronis/makefile 3rdparty/packages/kyumgai/makefile 3rdparty/packages/mm/makefile 3rdparty/packages/multivue/makefile 3rdparty/packages/rof/makefile 3rdparty/packages/sierra/blackcauldron/makefile 3rdparty/packages/sierra/christmas86/makefile 3rdparty/packages/sierra/goldrush/makefile 3rdparty/packages/sierra/kingsquest1/makefile 3rdparty/packages/sierra/kingsquest2/makefile 3rdparty/packages/sierra/kingsquest3/makefile 3rdparty/packages/sierra/kingsquest4/makefile 3rdparty/packages/sierra/leisuresuitlarry/makefile 3rdparty/packages/sierra/manhunter1/makefile 3rdparty/packages/sierra/manhunter2/makefile 3rdparty/packages/sierra/policequest1/makefile 3rdparty/packages/sierra/spacequest0/makefile 3rdparty/packages/sierra/spacequest1/makefile 3rdparty/packages/sierra/spacequest2/makefile 3rdparty/packages/subsim/makefile level1/atari/bootfiles/makefile level1/atari/makefile level1/atari/modules/makefile level1/coco/bootfiles/makefile level1/coco/makefile level1/coco/modules/makefile level2/coco3/bootfiles/makefile level2/coco3/modules/makefile level2/coco3_6309/bootfiles/makefile level3/coco3/bootfiles/makefile level3/coco3/makefile level3/coco3/modules/makefile level3/coco3_6309/modules/makefile makefile
diffstat 37 files changed, 689 insertions(+), 689 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/customboots/boisy/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/customboots/boisy/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -41,10 +41,10 @@
 SRC_THESIS	= testmul.a testtfr.a testexg.a testadd.a testnop.a
 
 # We make our own bootfile and kernel track
-KERNEL		= $(MD)/rel_80 $(MD)/boot_dw3 $(MD)/krn
+KERNEL		= $(MD)/rel_80 $(MD)/boot_dw $(MD)/krn
 BOOTFILE_DWTERM	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb \
+		$(MD)/rbdw.dr $(MD)/dwio.sb \
 		$(MD)/rammer.dr $(MD)/r0_128k.dd \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/scf.mn \
@@ -58,12 +58,12 @@
 		$(MD)/n13_scdwn.dd $(MD)/n14_scdwn.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 \
+		$(MD)/clock_60hz $(MD)/clock2_dw \
 		$(MD)/sysgo_dd
 
 BOOTFILE_WINTERM	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb \
+		$(MD)/rbdw.dr $(MD)/dwio.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/scf.mn \
 		$(MD)/vtio.dr \
@@ -80,7 +80,7 @@
 		$(MD)/n13_scdwn.dd $(MD)/n14_scdwn.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 \
+		$(MD)/clock_60hz $(MD)/clock2_dw \
 		$(MD)/sysgo_dd
 
 SUPPORTFILES	= startup
--- a/3rdparty/packages/arcadepak/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/arcadepak/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -9,7 +9,7 @@
 CMD		= $(6809L2)/cmds
 DISK_40D	= arcadepack_40d.dsk
 DISK_80D	= arcadepack_80d.dsk
-DISK_DW3	= arcadepack_dw3.dsk
+DISK_DW	= arcadepack_dw.dsk
 DISK_BECKER	= arcadepack_becker.dsk
 CMDS		= grfdrv runb
 SHELLMODS	= $(CMD)/shell_21 $(CMD)/dir $(CMD)/echo $(CMD)/link $(CMD)/load $(CMD)/mdir
@@ -27,8 +27,8 @@
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_40 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_40 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_BECKER	= $(MD)/rel_40 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_40 $(MD)/boot_dw $(MD)/krn
+KERNEL_BECKER	= $(MD)/rel_40 $(MD)/boot_dw_becker $(MD)/krn
 
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -50,9 +50,9 @@
 		$(MD)/w6.dw $(MD)/w7.dw \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-OS9BOOT_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/cogrf.io $(MD)/term_win40.dt $(MD)/w.dw $(MD)/w1.dw \
@@ -62,7 +62,7 @@
 
 OS9BOOT_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/cogrf.io $(MD)/term_win40.dt $(MD)/w.dw $(MD)/w1.dw \
@@ -72,7 +72,7 @@
 
 ALLOBJS		= $(CMDS)
 
-DSKS		= $(DISK_40D) $(DISK_80D) $(DISK_DW3) $(DISK_BECKER)
+DSKS		= $(DISK_40D) $(DISK_80D) $(DISK_DW) $(DISK_BECKER)
 
 all: shell
 	$(CD) smash; make
@@ -145,12 +145,12 @@
 	$(foreach file, $(SHANGROOT), $(CP) shanghai/$(file) $@,$(file);)
 	$(CPL) startup $@,
 
-$(DISK_DW3): all
+$(DISK_DW): all
 	$(RM) $@
 	$(CD) $(6809L2); make
-	$(OS9FORMAT_DW3) $@ -n"NitrOS-9 Arcade Pack"
-	$(MERGE) $(OS9BOOT_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9FORMAT_DW) $@ -n"NitrOS-9 Arcade Pack"
+	$(MERGE) $(OS9BOOT_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -177,7 +177,7 @@
 $(DISK_BECKER): all
 	$(RM) $@
 	$(CD) $(6809L2); make
-	$(OS9FORMAT_DW3) $@ -n"NitrOS-9 Arcade Pack"
+	$(OS9FORMAT_DW) $@ -n"NitrOS-9 Arcade Pack"
 	$(MERGE) $(OS9BOOT_BECKER)>os9boot
 	$(MERGE) $(KERNEL_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
--- a/3rdparty/packages/fsim2/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/fsim2/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -6,18 +6,18 @@
 DEPENDS		= ./makefile
 
 DSK_FLOPPY	= fsim2.dsk
-DSK_DW3		= fsim2_dw3.dsk
-DSK_DW3_BECKER	= fsim2_becker.dsk
+DSK_DW		= fsim2_dw.dsk
+DSK_DW_BECKER	= fsim2_becker.dsk
 
 CMDS		= fs f2 f3 f4
 MD		= $(LEVEL2)/coco3/modules
 
-DSKS		= $(DSK_FLOPPY) $(DSK_DW3) $(DSK_DW3_BECKER)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)
 
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -29,24 +29,24 @@
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/ftdd.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 \
+		$(MD)/clock_60hz $(MD)/clock2_dw \
 		$(MD)/sysgo_dd
 
-BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/ftdd.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 \
+		$(MD)/clock_60hz $(MD)/clock2_dw \
 		$(MD)/sysgo_dd
 
 SUPPORTFILES	= fa fd fp sf.standard
@@ -60,12 +60,12 @@
 
 dsk:	all $(DSKS)
 
-$(DSK_DW3):
+$(DSK_DW):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n"Flight Simulator 2"
-	$(MERGE) $(BOOTFILE_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9FORMAT_DW) -q $@ -n"Flight Simulator 2"
+	$(MERGE) $(BOOTFILE_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -77,12 +77,12 @@
 	$(CP) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
-$(DSK_DW3_BECKER):
+$(DSK_DW_BECKER):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n"Flight Simulator 2"
-	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9FORMAT_DW) -q $@ -n"Flight Simulator 2"
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
--- a/3rdparty/packages/koronis/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/koronis/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -6,17 +6,17 @@
 DEPENDS		= ./makefile
 
 DSK_FLOPPY	= koronis.dsk
-DSK_DW3		= koronis_dw3.dsk
-DSK_DW3_BECKER	= koronis_becker.dsk
+DSK_DW		= koronis_dw.dsk
+DSK_DW_BECKER	= koronis_becker.dsk
 CMDS		= koronis
 MD		= $(LEVEL2)/coco3/modules
 
-DSKS		= $(DSK_FLOPPY) $(DSK_DW3) $(DSK_DW3_BECKER)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)
 
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -25,21 +25,21 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 SUPPORTFILES	= SAVE1 SAVE2 crobot2.c ctitle.c korvar \
 		level01 level02 level03 level04 level05 level06 level07 \
@@ -72,12 +72,12 @@
 	$(OS9RENAME) $@,CMDS/koronis AutoEx
 	$(CP) $(SUPPORTFILES) $@,.
 
-$(DSK_DW3):
+$(DSK_DW):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_SS35) -q $@ -n"Koronis Rift"
-	$(MERGE) $(BOOTFILE_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(MERGE) $(BOOTFILE_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -89,12 +89,12 @@
 	$(CP) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
-$(DSK_DW3_BECKER):
+$(DSK_DW_BECKER):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_SS35) -q $@ -n"Koronis Rift"
-	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
--- a/3rdparty/packages/kyumgai/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/kyumgai/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -6,18 +6,18 @@
 DEPENDS		= ./makefile
 
 DSK_FLOPPY	= kyumgai.dsk
-DSK_DW3		= kyumgai_dw3.dsk
-DSK_DW3_BECKER	= kyumgai_becker.dsk
+DSK_DW		= kyumgai_dw.dsk
+DSK_DW_BECKER	= kyumgai_becker.dsk
 
 CMDS		= ninja ninja.snd1 ninja.snd2
 MD		= $(LEVEL2)/coco3/modules
 
-DSKS		= $(DSK_FLOPPY) $(DSK_DW3) $(DSK_DW3_BECKER)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)
 
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -27,21 +27,21 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 SUPPORTFILES	= backgnd.dat backgnd2.dat bigblocks.dat blakguy.dat \
 		gameover.dat giant.dat kyumgai.pla level1.dat level2.dat \
@@ -77,12 +77,12 @@
 	$(CP) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
-$(DSK_DW3):
+$(DSK_DW):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_SS80) -q $@ -n"Kyum-Gai: To Be Ninja"
-	$(MERGE) $(BOOTFILE_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(MERGE) $(BOOTFILE_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -94,12 +94,12 @@
 	$(CP) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
-$(DSK_DW3_BECKER):
+$(DSK_DW_BECKER):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_SS80) -q $@ -n"Kyum-Gai: To Be Ninja"
-	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
--- a/3rdparty/packages/mm/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/mm/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -6,19 +6,19 @@
 DEPENDS		= ./makefile
 
 DSK_FLOPPY	= mm.dsk
-DSK_DW3		= mm_dw3.dsk
-DSK_DW3_BECKER	= mm_dw3_becker.dsk
+DSK_DW		= mm_dw.dsk
+DSK_DW_BECKER	= mm_dw_becker.dsk
 
 CMDS		= mm mod1.dat mod2.dat mod3.dat mod4.dat mod5.dat \
 		mod6.sbr mod7.sbr mod8.sbr
 MD		= $(LEVEL2)/coco3/modules
 
-DSKS		= $(DSK_FLOPPY) $(DSK_DW3) $(DSK_DW3_BECKER)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)
 
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -28,21 +28,21 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 SUPPORTFILES	= global.dat mm.lib mm.pnl mm.ttl mod7.lib
 
@@ -72,12 +72,12 @@
 	$(CP) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_EXEC) $@,$(file);)
 
-$(DSK_DW3):
+$(DSK_DW):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_SS80) -q $@ -n"Microscopic Mission"
-	$(MERGE) $(BOOTFILE_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(MERGE) $(BOOTFILE_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -89,12 +89,12 @@
 	$(CP) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_EXEC) $@,$(file);)
 
-$(DSK_DW3_BECKER):
+$(DSK_DW_BECKER):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_SS80) -q $@ -n"Microscopic Mission"
-	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
--- a/3rdparty/packages/multivue/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/multivue/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -5,10 +5,10 @@
 
 DSK68_FLOPPY	= multivue_6809.dsk
 DSK63_FLOPPY	= multivue_6309.dsk
-DSK68_DW3	= multivue_6809_dw3.dsk
-DSK63_DW3	= multivue_6309_dw3.dsk
-DSK68_DW3_BECKER	= multivue_6809_becker.dsk
-DSK63_DW3_BECKER	= multivue_6309_becker.dsk
+DSK68_DW	= multivue_6809_dw.dsk
+DSK63_DW	= multivue_6309_dw.dsk
+DSK68_DW_BECKER	= multivue_6809_becker.dsk
+DSK63_DW_BECKER	= multivue_6309_becker.dsk
 
 CMDS68	= $(shell $(CD) cmds_6809; make --no-print-directory showobjs)
 CMDS63	= $(shell $(CD) cmds_6309; make --no-print-directory showobjs)
@@ -18,17 +18,17 @@
 DEMO	= aif.dmo
 ROOTFILES = startup
 
-DSKS	= $(DSK68_FLOPPY) $(DSK63_FLOPPY) $(DSK68_DW3) $(DSK63_DW3) $(DSK68_DW3_BECKER) $(DSK63_DW3_BECKER)
+DSKS	= $(DSK68_FLOPPY) $(DSK63_FLOPPY) $(DSK68_DW) $(DSK63_DW) $(DSK68_DW_BECKER) $(DSK63_DW_BECKER)
 
 MD68	= $(LEVEL2)/coco3/modules
 MD63	= $(LEVEL2)/coco3_6309/modules
 
 KERNEL68_FLOPPY	= $(MD68)/rel_40 $(MD68)/boot_1773_6ms $(MD68)/krn
 KERNEL63_FLOPPY	= $(MD63)/rel_40 $(MD63)/boot_1773_6ms $(MD63)/krn
-KERNEL68_DW3	= $(MD68)/rel_40 $(MD68)/boot_dw3 $(MD68)/krn
-KERNEL63_DW3	= $(MD63)/rel_40 $(MD63)/boot_dw3 $(MD63)/krn
-KERNEL68_DW3_BECKER	= $(MD68)/rel_40 $(MD68)/boot_dw3_becker $(MD68)/krn
-KERNEL63_DW3_BECKER	= $(MD63)/rel_40 $(MD63)/boot_dw3_becker $(MD63)/krn
+KERNEL68_DW	= $(MD68)/rel_40 $(MD68)/boot_dw $(MD68)/krn
+KERNEL63_DW	= $(MD63)/rel_40 $(MD63)/boot_dw $(MD63)/krn
+KERNEL68_DW_BECKER	= $(MD68)/rel_40 $(MD68)/boot_dw_becker $(MD68)/krn
+KERNEL63_DW_BECKER	= $(MD63)/rel_40 $(MD63)/boot_dw_becker $(MD63)/krn
 
 BOOTFILE68_FLOPPY	= $(MD68)/krnp2 $(MD68)/ioman $(MD68)/init \
 		$(MD68)/rbf.mn \
@@ -54,52 +54,52 @@
 		$(MD63)/clock_60hz $(MD63)/clock2_soft \
 		$(MD63)/sysgo_dd
 
-BOOTFILE68_DW3	= $(MD68)/krnp2 $(MD68)/ioman $(MD68)/init \
+BOOTFILE68_DW	= $(MD68)/krnp2 $(MD68)/ioman $(MD68)/init \
 		$(MD68)/rbf.mn \
-		$(MD68)/rbdw3.dr $(MD68)/dw3.sb $(MD68)/ddx0.dd \
+		$(MD68)/rbdw.dr $(MD68)/dwio.sb $(MD68)/ddx0.dd \
 		$(MD68)/rb1773.dr $(MD68)/d0_40d.dd $(MD68)/d1_40d.dd \
 		$(MD68)/scf.mn $(MD68)/vtio.dr \
 		$(MD68)/keydrv_cc3.sb $(MD68)/joydrv_joy.sb $(MD68)/snddrv_cc3.sb \
 		$(MD68)/cowin.io $(MD68)/term_win40.dt \
 		$(MD68)/w.dw $(MD68)/w1.dw $(MD68)/w2.dw $(MD68)/w3.dw \
 		$(MD68)/w4.dw $(MD68)/w5.dw $(MD68)/w6.dw $(MD68)/w7.dw \
-		$(MD68)/clock_60hz $(MD68)/clock2_dw3 \
+		$(MD68)/clock_60hz $(MD68)/clock2_dw \
 		$(MD68)/sysgo_dd
 
-BOOTFILE68_DW3_BECKER	= $(MD68)/krnp2 $(MD68)/ioman $(MD68)/init \
+BOOTFILE68_DW_BECKER	= $(MD68)/krnp2 $(MD68)/ioman $(MD68)/init \
 		$(MD68)/rbf.mn \
-		$(MD68)/rbdw3.dr $(MD68)/dw3_becker.sb $(MD68)/ddx0.dd \
+		$(MD68)/rbdw.dr $(MD68)/dwio_becker.sb $(MD68)/ddx0.dd \
 		$(MD68)/rb1773.dr $(MD68)/d0_40d.dd $(MD68)/d1_40d.dd \
 		$(MD68)/scf.mn $(MD68)/vtio.dr \
 		$(MD68)/keydrv_cc3.sb $(MD68)/joydrv_joy.sb $(MD68)/snddrv_cc3.sb \
 		$(MD68)/cowin.io $(MD68)/term_win40.dt \
 		$(MD68)/w.dw $(MD68)/w1.dw $(MD68)/w2.dw $(MD68)/w3.dw \
 		$(MD68)/w4.dw $(MD68)/w5.dw $(MD68)/w6.dw $(MD68)/w7.dw \
-		$(MD68)/clock_60hz $(MD68)/clock2_dw3 \
+		$(MD68)/clock_60hz $(MD68)/clock2_dw \
 		$(MD68)/sysgo_dd
 
-BOOTFILE63_DW3	= $(MD63)/krnp2 $(MD63)/ioman $(MD63)/init \
+BOOTFILE63_DW	= $(MD63)/krnp2 $(MD63)/ioman $(MD63)/init \
 		$(MD63)/rbf.mn \
-		$(MD63)/rbdw3.dr $(MD63)/dw3.sb $(MD63)/ddx0.dd \
+		$(MD63)/rbdw.dr $(MD63)/dwio.sb $(MD63)/ddx0.dd \
 		$(MD68)/rb1773.dr $(MD68)/d0_40d.dd $(MD68)/d1_40d.dd \
 		$(MD63)/scf.mn $(MD63)/vtio.dr \
 		$(MD63)/keydrv_cc3.sb $(MD63)/joydrv_joy.sb $(MD63)/snddrv_cc3.sb \
 		$(MD63)/cowin.io $(MD63)/term_win40.dt \
 		$(MD63)/w.dw $(MD63)/w1.dw $(MD63)/w2.dw $(MD63)/w3.dw \
 		$(MD63)/w4.dw $(MD63)/w5.dw $(MD63)/w6.dw $(MD63)/w7.dw \
-		$(MD63)/clock_60hz $(MD63)/clock2_dw3 \
+		$(MD63)/clock_60hz $(MD63)/clock2_dw \
 		$(MD63)/sysgo_dd
 
-BOOTFILE63_DW3_BECKER	= $(MD63)/krnp2 $(MD63)/ioman $(MD63)/init \
+BOOTFILE63_DW_BECKER	= $(MD63)/krnp2 $(MD63)/ioman $(MD63)/init \
 		$(MD63)/rbf.mn \
-		$(MD63)/rbdw3.dr $(MD63)/dw3_becker.sb $(MD63)/ddx0.dd \
+		$(MD63)/rbdw.dr $(MD63)/dwio_becker.sb $(MD63)/ddx0.dd \
 		$(MD68)/rb1773.dr $(MD68)/d0_40d.dd $(MD68)/d1_40d.dd \
 		$(MD63)/scf.mn $(MD63)/vtio.dr \
 		$(MD63)/keydrv_cc3.sb $(MD63)/joydrv_joy.sb $(MD63)/snddrv_cc3.sb \
 		$(MD63)/cowin.io $(MD63)/term_win40.dt \
 		$(MD63)/w.dw $(MD63)/w1.dw $(MD63)/w2.dw $(MD63)/w3.dw \
 		$(MD63)/w4.dw $(MD63)/w5.dw $(MD63)/w6.dw $(MD63)/w7.dw \
-		$(MD63)/clock_60hz $(MD63)/clock2_dw3 \
+		$(MD63)/clock_60hz $(MD63)/clock2_dw \
 		$(MD63)/sysgo_dd
 
 # Make all components
@@ -171,11 +171,11 @@
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
-$(DSK68_DW3):
+$(DSK68_DW):
 	$(RM) $@
 	$(OS9FORMAT_SS80) $@ -q -n"Multi-Vue"
-	$(MERGE) $(BOOTFILE68_DW3)>os9boot
-	$(MERGE) $(KERNEL68_DW3)>kernel
+	$(MERGE) $(BOOTFILE68_DW)>os9boot
+	$(MERGE) $(KERNEL68_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -196,11 +196,11 @@
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
-$(DSK68_DW3_BECKER):
+$(DSK68_DW_BECKER):
 	$(RM) $@
 	$(OS9FORMAT_SS80) $@ -q -n"Multi-Vue"
-	$(MERGE) $(BOOTFILE68_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL68_DW3_BECKER)>kernel
+	$(MERGE) $(BOOTFILE68_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL68_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -221,11 +221,11 @@
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
-$(DSK63_DW3):
+$(DSK63_DW):
 	$(RM) $@
 	$(OS9FORMAT_SS80) $@ -q -n"Multi-Vue"
-	$(MERGE) $(BOOTFILE63_DW3)>os9boot
-	$(MERGE) $(KERNEL63_DW3)>kernel
+	$(MERGE) $(BOOTFILE63_DW)>os9boot
+	$(MERGE) $(KERNEL63_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -246,11 +246,11 @@
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
-$(DSK63_DW3_BECKER):
+$(DSK63_DW_BECKER):
 	$(RM) $@
 	$(OS9FORMAT_SS80) $@ -q -n"Multi-Vue"
-	$(MERGE) $(BOOTFILE63_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL63_DW3_BECKER)>kernel
+	$(MERGE) $(BOOTFILE63_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL63_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
--- a/3rdparty/packages/rof/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/rof/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -6,18 +6,18 @@
 DEPENDS		= ./makefile
 
 DSK_FLOPPY	= rof.dsk
-DSK_DW3		= rof_dw3.dsk
-DSK_DW3_BECKER	= rof_becker.dsk
+DSK_DW		= rof_dw.dsk
+DSK_DW_BECKER	= rof_becker.dsk
 
 CMDS		= rescue
 MD		= $(LEVEL2)/coco3/modules
 
-DSKS		= $(DSK_FLOPPY) $(DSK_DW3) $(DSK_DW3_BECKER)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)
 
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -27,21 +27,21 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 SUPPORTFILES	= body heads larms legs lips panel1 rofvar rship.c rtitle.c scores
 
@@ -71,12 +71,12 @@
 	$(CP) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
-$(DSK_DW3):
+$(DSK_DW):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_SS35) -q $@ -n"Rescue on Fractalus"
-	$(MERGE) $(BOOTFILE_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(MERGE) $(BOOTFILE_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -88,12 +88,12 @@
 	$(CP) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
-$(DSK_DW3_BECKER):
+$(DSK_DW_BECKER):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_SS35) -q $@ -n"Rescue on Fractalus"
-	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
--- a/3rdparty/packages/sierra/blackcauldron/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/sierra/blackcauldron/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -10,23 +10,23 @@
 DSK_1_40D	= blackcauldron_d1_40d.dsk
 DSK_2_40D	= blackcauldron_d2_40d.dsk
 DSK_80D		= blackcauldron_80d.dsk
-DSK_DW3		= blackcauldron_dw3.dsk
-DSK_DW3_BECKER	= blackcauldron_becker.dsk
+DSK_DW		= blackcauldron_dw.dsk
+DSK_DW_BECKER	= blackcauldron_becker.dsk
 
-DSKS		= $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D) $(DSK_DW3) $(DSK_DW3_BECKER)
+DSKS		= $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D) $(DSK_DW) $(DSK_DW_BECKER)
 
 DSK_1_40D_NAME = "The Black Cauldron Disk 1"
 DSK_2_40D_NAME = "The Black Cauldron Disk 2"
 DSK_80D_NAME   = "The Black Cauldron"
-DSK_DW3_NAME   = $(DSK_80D_NAME)
+DSK_DW_NAME   = $(DSK_80D_NAME)
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and KERNEL_FLOPPY track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 BOOTFILE_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -45,23 +45,23 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
@@ -133,54 +133,54 @@
 	tocgen $(DSK_80D),tOC.txt $(DSK_80D),tOC
 	$(MOVE) toctmp tocgen
 
-dsk_dw3:	all
-	$(RM) $(DSK_DW3)
+dsk_dw:	all
+	$(RM) $(DSK_DW)
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $(DSK_DW3) -n$(DSK_DW3_NAME)
-	$(MERGE) $(BOOTFILE_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
-	$(OS9GEN) $(DSK_DW3) -b=os9boot -t=kernel
+	$(OS9FORMAT_DW) -q $(DSK_DW) -n$(DSK_DW_NAME)
+	$(MERGE) $(BOOTFILE_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
+	$(OS9GEN) $(DSK_DW) -b=os9boot -t=kernel
 	$(RM) os9boot kernel
-	$(MAKDIR) $(DSK_DW3),CMDS
-	$(CP) $(CMDS) $(DSK_DW3),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW3),CMDS/$(file);)
+	$(MAKDIR) $(DSK_DW),CMDS
+	$(CP) $(CMDS) $(DSK_DW),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DSK_DW3),CMDS
+	$(CP) shell $(DSK_DW),CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DSK_DW3),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DSK_DW3),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DSK_DW3),.
-	$(OS9RENAME) $(DSK_DW3),tOC_40d.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $(DSK_DW3),.
+	$(OS9ATTR) $(DSK_DW),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DSK_DW),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $(DSK_DW),.
+	$(OS9RENAME) $(DSK_DW),tOC_40d.txt tOC.txt
+	$(CP) $(SUPPORTFILES) $(DSK_DW),.
 	$(MOVE) tocgen toctmp
-	tocgen $(DSK_DW3),tOC.txt $(DSK_DW3),tOC
+	tocgen $(DSK_DW),tOC.txt $(DSK_DW),tOC
 	$(MOVE) toctmp tocgen
 
-dsk_dw3_becker:	all
-	$(RM) $(DSK_DW3_BECKER)
+dsk_dw_becker:	all
+	$(RM) $(DSK_DW_BECKER)
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $(DSK_DW3_BECKER) -n$(DSK_DW3_NAME)
-	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
-	$(OS9GEN) $(DSK_DW3_BECKER) -b=os9boot -t=kernel
+	$(OS9FORMAT_DW) -q $(DSK_DW_BECKER) -n$(DSK_DW_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $(DSK_DW_BECKER) -b=os9boot -t=kernel
 	$(RM) os9boot kernel
-	$(MAKDIR) $(DSK_DW3_BECKER),CMDS
-	$(CP) $(CMDS) $(DSK_DW3_BECKER),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW3_BECKER),CMDS/$(file);)
+	$(MAKDIR) $(DSK_DW_BECKER),CMDS
+	$(CP) $(CMDS) $(DSK_DW_BECKER),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW_BECKER),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DSK_DW3_BECKER),CMDS
+	$(CP) shell $(DSK_DW_BECKER),CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DSK_DW3_BECKER),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DSK_DW3_BECKER),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DSK_DW3_BECKER),.
-	$(OS9RENAME) $(DSK_DW3_BECKER),tOC_40d.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $(DSK_DW3_BECKER),.
+	$(OS9ATTR) $(DSK_DW_BECKER),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DSK_DW_BECKER),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $(DSK_DW_BECKER),.
+	$(OS9RENAME) $(DSK_DW_BECKER),tOC_40d.txt tOC.txt
+	$(CP) $(SUPPORTFILES) $(DSK_DW_BECKER),.
 	$(MOVE) tocgen toctmp
-	tocgen $(DSK_DW3_BECKER),tOC.txt $(DSK_DW3_BECKER),tOC
+	tocgen $(DSK_DW_BECKER),tOC.txt $(DSK_DW_BECKER),tOC
 	$(MOVE) toctmp tocgen
 
 
-dsk:	dsk_40d dsk_80d dsk_dw3 dsk_dw3_becker
+dsk:	dsk_40d dsk_80d dsk_dw dsk_dw_becker
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/christmas86/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/sierra/christmas86/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -8,10 +8,10 @@
 DEPENDS		= ./makefile
 
 DSK_FLOPPY	= christmas86.dsk
-DSK_DW3		= christmas86_dw3.dsk
-DSK_DW3_BECKER	= christmas86_becker.dsk
+DSK_DW		= christmas86_dw.dsk
+DSK_DW_BECKER	= christmas86_becker.dsk
 
-DSKS		= $(DSK_FLOPPY) $(DSK_DW3) $(DSK_DW3_BECKER)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)
 
 DSK_NAME	= "Christmas 1986"
 
@@ -20,8 +20,8 @@
 
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -32,23 +32,23 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
@@ -89,12 +89,12 @@
 	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $@,.
 
-$(DSK_DW3):	all
+$(DSK_DW):	all
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DSK_NAME)
-	$(MERGE) $(BOOTFILE_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DSK_NAME)
+	$(MERGE) $(BOOTFILE_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -111,12 +111,12 @@
 	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $@,.
 
-$(DSK_DW3_BECKER):	all
+$(DSK_DW_BECKER):	all
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DSK_NAME)
-	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DSK_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
--- a/3rdparty/packages/sierra/goldrush/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/sierra/goldrush/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -7,26 +7,26 @@
 
 DEPENDS		= ./makefile
 
-DSKDW3		= goldrush_dw3.dsk
-DSKDW3BECKER	= goldrush_becker.dsk
+DSKDW		= goldrush_dw.dsk
+DSKDWBECKER	= goldrush_becker.dsk
 DISK_1_80D	= goldrush_d1_80d.dsk
 DISK_2_80D	= goldrush_d2_80d.dsk
 DISK_3_80D	= goldrush_d3_80d.dsk
 
-DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DSKDW3) $(DSKDW3BECKER)
+DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DSKDW) $(DSKDWBECKER)
 
 DISK_1_80D_NAME = "Gold Rush Disk 1"
 DISK_2_80D_NAME = "Gold Rush Disk 2"
 DISK_3_80D_NAME = "Gold Rush Disk 3"
-DSKDW3_NAME	= "Gold Rush"
+DSKDW_NAME	= "Gold Rush"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 BOOTFILE_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_80d.dd \
@@ -36,31 +36,31 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
 
 TEXTFILES_D1	= ../startup tOC_80d.txt
-TEXTFILES_DW3	= ../startup tOC_dw3.txt
-TEXTFILES_DW3_BECKER	= ../startup tOC_dw3_becker.txt
+TEXTFILES_DW	= ../startup tOC_dw.txt
+TEXTFILES_DW_BECKER	= ../startup tOC_dw_becker.txt
 
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.9 vol.10 vol.11 vol.12 words.tok
@@ -80,14 +80,14 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all $(DSKDW3) $(DSKDW3BECKER) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D)
+dsk:	all $(DSKDW) $(DSKDWBECKER) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D)
 
-$(DSKDW3):
+$(DSKDW):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DSKDW3_NAME)
-	$(MERGE) $(BOOTFILE_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DSKDW_NAME)
+	$(MERGE) $(BOOTFILE_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -98,19 +98,19 @@
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW3) $@,.
-	$(OS9RENAME) $@,tOC_dw3.txt tOC.txt
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
 	$(CP) $(SUPPORTFILES_ALL) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
-$(DSKDW3BECKER):
+$(DSKDWBECKER):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DSKDW3_NAME)
-	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DSKDW_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -121,8 +121,8 @@
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW3_BECKER) $@,.
-	$(OS9RENAME) $@,tOC_dw3_becker.txt tOC.txt
+	$(CPL) $(TEXTFILES_DW_BECKER) $@,.
+	$(OS9RENAME) $@,tOC_dw_becker.txt tOC.txt
 	$(CP) $(SUPPORTFILES_ALL) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
--- a/3rdparty/packages/sierra/kingsquest1/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/sierra/kingsquest1/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -8,21 +8,21 @@
 DEPENDS		= ./makefile
 
 DISK_40D	= kingsquest1_40d.dsk
-DSKDW3		= kingsquest1_dw3.dsk
-DSKDW3BECKER	= kingsquest1_becker.dsk
+DSKDW		= kingsquest1_dw.dsk
+DSKDWBECKER	= kingsquest1_becker.dsk
 
-DSKS		= $(DISK_40D) $(DSKDW3) $(DSKDW3BECKER)
+DSKS		= $(DISK_40D) $(DSKDW) $(DSKDWBECKER)
 
 DISK_40D_NAME	= "King's Quest I"
-DSKDW3_NAME	= $(DISK_40D_NAME)
+DSKDW_NAME	= $(DISK_40D_NAME)
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 BOOTFILE_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -33,23 +33,23 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
@@ -67,7 +67,7 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)
 
-dsk:	all $(DISK_40D) $(DSKDW3) $(DSKDW3BECKER)
+dsk:	all $(DISK_40D) $(DSKDW) $(DSKDWBECKER)
 
 $(DISK_40D):
 	$(RM) $@
@@ -92,12 +92,12 @@
 	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $@,.
 
-$(DSKDW3):
+$(DSKDW):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_40D_NAME)
-	$(MERGE) $(BOOTFILE_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_40D_NAME)
+	$(MERGE) $(BOOTFILE_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -115,12 +115,12 @@
 	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $@,.
 
-$(DSKDW3BECKER):
+$(DSKDWBECKER):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_40D_NAME)
-	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_40D_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
--- a/3rdparty/packages/sierra/kingsquest2/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/sierra/kingsquest2/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -10,23 +10,23 @@
 DSK_1_40D	= kingsquest2_d1_40d.dsk
 DSK_2_40D	= kingsquest2_d2_40d.dsk
 DSK_80D		= kingsquest2_80d.dsk
-DSK_DW3		= kingsquest2_dw3.dsk
-DSK_DW3_BECKER	= kingsquest2_becker.dsk
+DSK_DW		= kingsquest2_dw.dsk
+DSK_DW_BECKER	= kingsquest2_becker.dsk
 
-DSKS		= $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D) $(DSK_DW3) $(DSK_DW3_BECKER)
+DSKS		= $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D) $(DSK_DW) $(DSK_DW_BECKER)
 
 DSK_1_40D_NAME	= "King's Quest II Disk 1"
 DSK_2_40D_NAME	= "King's Quest II Disk 2"
 DSK_80D_NAME	= "King's Quest II"
-DSK_DW3_NAME	= "King's Quest II"
+DSK_DW_NAME	= "King's Quest II"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 BOOTFILE_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -46,23 +46,23 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
@@ -137,12 +137,12 @@
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
-$(DSK_DW3):
+$(DSK_DW):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DSK_DW3_NAME)
-	$(MERGE) $(BOOTFILE_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DSK_DW_NAME)
+	$(MERGE) $(BOOTFILE_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -160,12 +160,12 @@
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
-$(DSK_DW3_BECKER):
+$(DSK_DW_BECKER):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DSK_DW3_NAME)
-	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DSK_DW_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
--- a/3rdparty/packages/sierra/kingsquest3/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/sierra/kingsquest3/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -11,24 +11,24 @@
 DISK_2_40D	= kingquest3_d2_40d.dsk
 DISK_3_40D	= kingquest3_d3_40d.dsk
 DISK_80D	= kingquest3_80d.dsk
-DSK_DW3		= kingsquest3_dw3.dsk
-DSK_DW3_BECKER	= kingsquest3_becker.dsk
+DSK_DW		= kingsquest3_dw.dsk
+DSK_DW_BECKER	= kingsquest3_becker.dsk
 
-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D) $(DSK_DW3) $(DSK_DW3_BECKER)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D) $(DSK_DW) $(DSK_DW_BECKER)
 
 DISK_1_40D_NAME = "King's Quest III Disk 1"
 DISK_2_40D_NAME = "King's Quest III Disk 2"
 DISK_3_40D_NAME = "King's Quest III Disk 3"
 DISK_80D_NAME   = "King's Quest III"
-DSK_DW3_NAME	= "King's Quest III"
+DSK_DW_NAME	= "King's Quest III"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -48,23 +48,23 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
@@ -72,7 +72,7 @@
 
 TEXTFILES_D1	= ../startup tOC_40d.txt
 TEXTFILES	= ../startup tOC_80d.txt
-TEXTFILES_DW3 = ../startup tOC_dw3.txt
+TEXTFILES_DW = ../startup tOC_dw.txt
 
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.3 vol.4 vol.12 vol.14 words.tok
@@ -142,53 +142,53 @@
 	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
 	$(MOVE) toctmp tocgen
 
-dsk_dw3:	all
-	$(RM) $(DSK_DW3)
+dsk_dw:	all
+	$(RM) $(DSK_DW)
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $(DSK_DW3) -n$(DSK_DW3_NAME)
-	$(MERGE) $(BOOTFILE_DW3)>os9boot_dw3
-	$(MERGE) $(KERNEL_DW3)>kernel_dw3
-	$(OS9GEN) $(DSK_DW3) -b=os9boot_dw3 -t=kernel_dw3
-	$(RM) os9boot_dw3 kernel_dw3
-	$(MAKDIR) $(DSK_DW3),CMDS
-	$(CP) $(CMDS) $(DSK_DW3),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW3),CMDS/$(file);)
+	$(OS9FORMAT_DW) -q $(DSK_DW) -n$(DSK_DW_NAME)
+	$(MERGE) $(BOOTFILE_DW)>os9boot_dw
+	$(MERGE) $(KERNEL_DW)>kernel_dw
+	$(OS9GEN) $(DSK_DW) -b=os9boot_dw -t=kernel_dw
+	$(RM) os9boot_dw kernel_dw
+	$(MAKDIR) $(DSK_DW),CMDS
+	$(CP) $(CMDS) $(DSK_DW),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DSK_DW3),CMDS
+	$(CP) shell $(DSK_DW),CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DSK_DW3),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DSK_DW3),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW3) $(DSK_DW3),.
-	$(OS9RENAME) $(DSK_DW3),tOC_dw3.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $(DSK_DW3),.
+	$(OS9ATTR) $(DSK_DW),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DSK_DW),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW) $(DSK_DW),.
+	$(OS9RENAME) $(DSK_DW),tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES) $(DSK_DW),.
 	$(MOVE) tocgen toctmp
-	tocgen $(DSK_DW3),tOC.txt $(DSK_DW3),tOC
+	tocgen $(DSK_DW),tOC.txt $(DSK_DW),tOC
 	$(MOVE) toctmp tocgen
 
-dsk_dw3_becker:	all
-	$(RM) $(DSK_DW3_BECKER)
+dsk_dw_becker:	all
+	$(RM) $(DSK_DW_BECKER)
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $(DSK_DW3_BECKER) -n$(DSK_DW3_NAME)
-	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot_dw3
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel_dw3
-	$(OS9GEN) $(DSK_DW3_BECKER) -b=os9boot_dw3 -t=kernel_dw3
-	$(RM) os9boot_dw3 kernel_dw3
-	$(MAKDIR) $(DSK_DW3_BECKER),CMDS
-	$(CP) $(CMDS) $(DSK_DW3_BECKER),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW3_BECKER),CMDS/$(file);)
+	$(OS9FORMAT_DW) -q $(DSK_DW_BECKER) -n$(DSK_DW_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot_dw
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel_dw
+	$(OS9GEN) $(DSK_DW_BECKER) -b=os9boot_dw -t=kernel_dw
+	$(RM) os9boot_dw kernel_dw
+	$(MAKDIR) $(DSK_DW_BECKER),CMDS
+	$(CP) $(CMDS) $(DSK_DW_BECKER),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW_BECKER),CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DSK_DW3_BECKER),CMDS
+	$(CP) shell $(DSK_DW_BECKER),CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DSK_DW3_BECKER),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DSK_DW3_BECKER),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW3) $(DSK_DW3_BECKER),.
-	$(OS9RENAME) $(DSK_DW3_BECKER),tOC_dw3.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $(DSK_DW3_BECKER),.
+	$(OS9ATTR) $(DSK_DW_BECKER),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DSK_DW_BECKER),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW) $(DSK_DW_BECKER),.
+	$(OS9RENAME) $(DSK_DW_BECKER),tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES) $(DSK_DW_BECKER),.
 	$(MOVE) tocgen toctmp
-	tocgen $(DSK_DW3_BECKER),tOC.txt $(DSK_DW3_BECKER),tOC
+	tocgen $(DSK_DW_BECKER),tOC.txt $(DSK_DW_BECKER),tOC
 	$(MOVE) toctmp tocgen
 
-dsk:	dsk_40d dsk_80d dsk_dw3 dsk_dw3_becker
+dsk:	dsk_40d dsk_80d dsk_dw dsk_dw_becker
 
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/kingsquest4/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/sierra/kingsquest4/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -10,23 +10,23 @@
 DISK_1_80D	= kingsquest4_d1_80d.dsk
 DISK_2_80D	= kingsquest4_d2_80d.dsk
 DISK_3_80D	= kingsquest4_d3_80d.dsk
-DISK_DW3	= kingsquest4_dw3.dsk
-DISK_DW3_BECKER	= kingsquest4_becker.dsk
+DISK_DW	= kingsquest4_dw.dsk
+DISK_DW_BECKER	= kingsquest4_becker.dsk
 
-DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW3) $(DISK_DW3_BECKER)
+DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW) $(DISK_DW_BECKER)
 
 DISK_1_80D_NAME = "King's Quest IV Disk 1"
 DISK_2_80D_NAME = "King's Quest IV Disk 2"
 DISK_3_80D_NAME = "King's Quest IV Disk 3"
-DISK_DW3_NAME =	"King's Quest IV"
+DISK_DW_NAME =	"King's Quest IV"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 OS9BOOT_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -37,23 +37,23 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
@@ -61,7 +61,7 @@
 
 TEXTFILES_D1	= startup tOC_80d.txt
 TEXTFILES	= startup tOC_80d.txt
-TEXTFILES_DW3	= startup tOC_dw3.txt
+TEXTFILES_DW	= startup tOC_dw.txt
 
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.6 vol.9 vol.11 words.tok
@@ -70,7 +70,7 @@
 
 SUPPORTFILES_D3	= object vol.0 vol.4 vol.5 vol.10 vol.11
 
-SUPPORTFILES_DW3	= logDir object picDir sndDir viewDir vol.0 \
+SUPPORTFILES_DW	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.3 vol.4 vol.5 vol.6 vol.9 vol.10 \
 		vol.11 words.tok
 
@@ -116,11 +116,11 @@
 	$(OS9FORMAT_DS80) -q $@ -n$(DISK_3_80D_NAME)
 	$(CP) $(SUPPORTFILES_D3) $@,.
 
-$(DISK_DW3):
+$(DISK_DW):
 	$(RM) $@
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
-	$(MERGE) $(BOOTFILE_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(BOOTFILE_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -131,18 +131,18 @@
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW3) $@,.
-	$(OS9RENAME) $@,tOC_dw3.txt tOC.txt
-	$(CP) $(SUPPORTFILES_DW3) $@,.
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES_DW) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
-$(DISK_DW3_BECKER):
+$(DISK_DW_BECKER):
 	$(RM) $@
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
-	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -153,9 +153,9 @@
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW3) $@,.
-	$(OS9RENAME) $@,tOC_dw3.txt tOC.txt
-	$(CP) $(SUPPORTFILES_DW3) $@,.
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES_DW) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
--- a/3rdparty/packages/sierra/leisuresuitlarry/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/sierra/leisuresuitlarry/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -8,20 +8,20 @@
 DEPENDS		= ./makefile
 
 DSK_FLOPPY	= leisuresuitlarry.dsk
-DSK_DW3		= leisuresuitlarry_dw3.dsk
-DSK_DW3_BECKER	= leisuresuitlarry_becker.dsk
+DSK_DW		= leisuresuitlarry_dw.dsk
+DSK_DW_BECKER	= leisuresuitlarry_becker.dsk
 
 DSK_NAME	= "Leisure Suit Larry"
 
-DSKS		= $(DSK_FLOPPY) $(DSK_DW3) $(DSK_DW3_BECKER)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -32,23 +32,23 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 SUPPORTFILES	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.3 vol.4 words.tok
@@ -80,12 +80,12 @@
 	$(MOVE) toctmp tocgen
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
-$(DSK_DW3):
+$(DSK_DW):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DSK_NAME)
-	$(MERGE) $(BOOTFILE_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DSK_NAME)
+	$(MERGE) $(BOOTFILE_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -98,12 +98,12 @@
 	$(MOVE) toctmp tocgen
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
 
-$(DSK_DW3_BECKER):
+$(DSK_DW_BECKER):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DSK_NAME)
-	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DSK_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
--- a/3rdparty/packages/sierra/manhunter1/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/sierra/manhunter1/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -10,24 +10,24 @@
 DISK_1_80D	= manhunter1_d1_80d.dsk
 DISK_2_80D	= manhunter1_d2_80d.dsk
 DISK_3_80D	= manhunter1_d3_80d.dsk
-DISK_DW3	= manhunter1_dw3.dsk
-DISK_DW3_BECKER	= manhunter1_becker.dsk
+DISK_DW	= manhunter1_dw.dsk
+DISK_DW_BECKER	= manhunter1_becker.dsk
 
 DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) \
-		$(DISK_DW3) $(DISK_DW3_BECKER)
+		$(DISK_DW) $(DISK_DW_BECKER)
 
 DISK_1_80D_NAME = "Manhunter I Disk 1"
 DISK_2_80D_NAME = "Manhunter I Disk 2"
 DISK_3_80D_NAME = "Manhunter I Disk 3"
-DISK_DW3_NAME = "Manhunter I"
+DISK_DW_NAME = "Manhunter I"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 OS9BOOT_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -38,23 +38,23 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-OS9BOOT_DW3 = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-OS9BOOT_DW3_BECKER = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW_BECKER = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
@@ -62,7 +62,7 @@
 
 TEXTFILES_D1	= ../startup tOC_80d.txt
 TEXTFILES	= ../startup tOC_80d.txt
-TEXTFILES_DW3	= ../startup tOC_dw3.txt
+TEXTFILES_DW	= ../startup tOC_dw.txt
 
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.9 vol.10 vol.11 vol.12 words.tok
@@ -71,7 +71,7 @@
 
 SUPPORTFILES_D3	= object vol.0 vol.5 vol.9 vol.10 vol.11 vol.12
 
-SUPPORTFILES_DW3	= logDir object picDir sndDir viewDir vol.0 \
+SUPPORTFILES_DW	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.3 vol.4 vol.5 vol.9 vol.10 vol.11 vol.12 words.tok
 
 ALLOBJS		= $(CMDS)
@@ -106,11 +106,11 @@
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
-$(DISK_DW3):
+$(DISK_DW):
 	$(RM) $@
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
-	$(MERGE) $(KERNEL_DW3)>kernel
-	$(MERGE) $(OS9BOOT_DW3)>os9boot
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(KERNEL_DW)>kernel
+	$(MERGE) $(OS9BOOT_DW)>os9boot
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -121,18 +121,18 @@
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW3) $@,.
-	$(OS9RENAME) $@,tOC_dw3.txt tOC.txt
-	$(CP) $(SUPPORTFILES_DW3) $@,.
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES_DW) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
-$(DISK_DW3_BECKER):
+$(DISK_DW_BECKER):
 	$(RM) $@
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
-	$(MERGE) $(OS9BOOT_DW3_BECKER)>os9boot
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(MERGE) $(OS9BOOT_DW_BECKER)>os9boot
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -143,9 +143,9 @@
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW3) $@,.
-	$(OS9RENAME) $@,tOC_dw3.txt tOC.txt
-	$(CP) $(SUPPORTFILES_DW3) $@,.
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES_DW) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
--- a/3rdparty/packages/sierra/manhunter2/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/sierra/manhunter2/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -10,23 +10,23 @@
 DISK_1_80D	= manhunter2_d1_80d.dsk
 DISK_2_80D	= manhunter2_d2_80d.dsk
 DISK_3_80D	= manhunter2_d3_80d.dsk
-DISK_DW3	= manhunter2_dw3.dsk
-DISK_DW3_BECKER	= manhunter2_becker.dsk
+DISK_DW	= manhunter2_dw.dsk
+DISK_DW_BECKER	= manhunter2_becker.dsk
 
-DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW3) $(DISK_DW3_BECKER)
+DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW) $(DISK_DW_BECKER)
 
 DISK_1_80D_NAME = "Manhunter II Disk 1"
 DISK_2_80D_NAME = "Manhunter II Disk 2"
 DISK_3_80D_NAME = "Manhunter II Disk 3"
-DISK_DW3_NAME = "Manhunter II"
+DISK_DW_NAME = "Manhunter II"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 OS9BOOT_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_80d.dd \
@@ -36,23 +36,23 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-OS9BOOT_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-OS9BOOT_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
@@ -60,7 +60,7 @@
 
 TEXTFILES_D1	= ../startup tOC_80d.txt
 TEXTFILES	= ../startup tOC_80d.txt
-TEXTFILES_DW3	= ../startup tOC_dw3.txt
+TEXTFILES_DW	= ../startup tOC_dw.txt
 
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.9 vol.10 vol.11 words.tok
@@ -69,7 +69,7 @@
 
 SUPPORTFILES_D3	= object vol.0 vol.3 vol.9 vol.10 vol.11
 
-SUPPORTFILES_DW3	= logDir object picDir sndDir viewDir vol.0 \
+SUPPORTFILES_DW	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.3 vol.9 vol.10 vol.11 words.tok
 
 ALLOBJS		= $(CMDS)
@@ -114,11 +114,11 @@
 	$(OS9FORMAT_DS80) -q $@ -n$(DISK_3_80D_NAME)
 	$(CP) $(SUPPORTFILES_D3) $@,.
 
-$(DISK_DW3):
+$(DISK_DW):
 	$(RM) $@
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
-	$(MERGE) $(OS9BOOT_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -129,18 +129,18 @@
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW3) $@,.
-	$(OS9RENAME) $@,tOC_dw3.txt tOC.txt
-	$(CP) $(SUPPORTFILES_DW3) $@,.
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES_DW) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
-$(DISK_DW3_BECKER):
+$(DISK_DW_BECKER):
 	$(RM) $@
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
-	$(MERGE) $(OS9BOOT_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -151,9 +151,9 @@
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW3) $@,.
-	$(OS9RENAME) $@,tOC_dw3.txt tOC.txt
-	$(CP) $(SUPPORTFILES_DW3) $@,.
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES_DW) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
--- a/3rdparty/packages/sierra/policequest1/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/sierra/policequest1/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -10,23 +10,23 @@
 DISK_1_40D	= policequest1_d1_40d.dsk
 DISK_2_40D	= policequest1_d2_40d.dsk
 DISK_3_40D	= policequest1_d3_40d.dsk
-DISK_DW3	= policequest1_dw3.dsk
-DISK_DW3_BECKER	= policequest1_becker.dsk
+DISK_DW	= policequest1_dw.dsk
+DISK_DW_BECKER	= policequest1_becker.dsk
 
-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_DW3) $(DISK_DW3_BECKER)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_DW) $(DISK_DW_BECKER)
 
 DISK_1_40D_NAME = "Police Quest I Disk 1"
 DISK_2_40D_NAME = "Police Quest I Disk 2"
 DISK_3_40D_NAME = "Police Quest I Disk 3"
-DISK_DW3_NAME	= "Police Quest I Disk"
+DISK_DW_NAME	= "Police Quest I Disk"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -37,23 +37,23 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-OS9BOOT_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-OS9BOOT_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
@@ -61,7 +61,7 @@
 
 TEXTFILES_D1	= ../startup tOC_40d.txt
 TEXTFILES	= ../startup tOC_80d.txt
-TEXTFILES_DW3	= ../startup tOC_dw3.txt
+TEXTFILES_DW	= ../startup tOC_dw.txt
 
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 words.tok
@@ -115,12 +115,12 @@
 	$(OS9FORMAT_DS40) -q $@ -n$(DISK_3_40D_NAME)
 	$(CP) $(SUPPORTFILES_D3) $@,.
 
-$(DISK_DW3):
+$(DISK_DW):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
-	$(MERGE) $(OS9BOOT_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -131,19 +131,19 @@
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW3) $@,.
-	$(OS9RENAME) $@,tOC_dw3.txt tOC.txt
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
 	$(CP) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
-$(DISK_DW3_BECKER):
+$(DISK_DW_BECKER):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
-	$(MERGE) $(OS9BOOT_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -154,8 +154,8 @@
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW3) $@,.
-	$(OS9RENAME) $@,tOC_dw3.txt tOC.txt
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
 	$(CP) $(SUPPORTFILES) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
--- a/3rdparty/packages/sierra/spacequest0/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/sierra/spacequest0/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -12,25 +12,25 @@
 DISK_3_40D	= spacequest0_d3_40d.dsk
 DISK_1_80D	= spacequest0_d1_80d.dsk
 DISK_2_80D	= spacequest0_d2_80d.dsk
-DISK_DW3	= spacequest0_dw3.dsk
-DISK_DW3_BECKER	= spacequest0_becker.dsk
+DISK_DW	= spacequest0_dw.dsk
+DISK_DW_BECKER	= spacequest0_becker.dsk
 
-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_1_80D) $(DISK_2_80D) $(DISK_DW3) $(DISK_DW3_BECKER)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_1_80D) $(DISK_2_80D) $(DISK_DW) $(DISK_DW_BECKER)
 
 DISK_1_40D_NAME	= "Space Quest 0 Disk 1"
 DISK_2_40D_NAME	= "Space Quest 0 Disk 2"
 DISK_3_40D_NAME	= "Space Quest 0 Disk 3"
 DISK_1_80D_NAME	= "Space Quest 0 Disk 1"
 DISK_2_80D_NAME	= "Space Quest 0 Disk 2"
-DISK_DW3_NAME	= "Space Quest 0"
+DISK_DW_NAME	= "Space Quest 0"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -50,23 +50,23 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-OS9BOOT_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-OS9BOOT_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
@@ -74,7 +74,7 @@
 
 TEXTFILES_D1	= ../startup tOC_40d.txt
 TEXTFILES	= ../startup tOC_80d.txt
-TEXTFILES_DW3	= ../startup tOC_dw3.txt
+TEXTFILES_DW	= ../startup tOC_dw.txt
 
 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 words.tok
@@ -86,7 +86,7 @@
 SUPPORTFILES	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 words.tok
 
-SUPPORTFILES_DW3	= logDir object picDir sndDir viewDir vol.0 \
+SUPPORTFILES_DW	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.3 words.tok
 
 ALLOBJS		= $(CMDS)
@@ -157,12 +157,12 @@
 	$(OS9FORMAT_DS80) -q $@ -n$(DISK_2_80D_NAME)
 	$(CP) $(SUPPORTFILES_D3) $@,.
 
-$(DISK_DW3):
+$(DISK_DW):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
-	$(MERGE) $(OS9BOOT_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -173,19 +173,19 @@
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW3) $@,.
-	$(OS9RENAME) $@,tOC_dw3.txt tOC.txt
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $@,.
 
-$(DISK_DW3_BECKER):
+$(DISK_DW_BECKER):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
-	$(MERGE) $(OS9BOOT_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -196,8 +196,8 @@
 	$(RM) shell
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW3) $@,.
-	$(OS9RENAME) $@,tOC_dw3.txt tOC.txt
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
--- a/3rdparty/packages/sierra/spacequest1/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/sierra/spacequest1/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -10,23 +10,23 @@
 DISK_1_40D	= spacequest1_d1_40d.dsk
 DISK_2_40D	= spacequest1_d2_40d.dsk
 DISK_80D	= spacequest1_80d.dsk
-DISK_DW3	= spacequest1_dw3.dsk
-DISK_DW3_BECKER	= spacequest1_becker.dsk
+DISK_DW	= spacequest1_dw.dsk
+DISK_DW_BECKER	= spacequest1_becker.dsk
 
-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D) $(DISK_DW3) $(DISK_DW3_BECKER)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D) $(DISK_DW) $(DISK_DW_BECKER)
 
 DISK_1_40D_NAME	= "Space Quest I Disk 1"
 DISK_2_40D_NAME	= "Space Quest I Disk 2"
 DISK_80D_NAME	= "Space Quest I"
-DISK_DW3_NAME	= "Space Quest I"
+DISK_DW_NAME	= "Space Quest I"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -46,23 +46,23 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-OS9BOOT_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-OS9BOOT_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
@@ -137,12 +137,12 @@
 	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $@,.
 
-$(DISK_DW3):
+$(DISK_DW):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
-	$(MERGE) $(OS9BOOT_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -160,12 +160,12 @@
 	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $@,.
 
-$(DISK_DW3_BECKER):
+$(DISK_DW_BECKER):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
-	$(MERGE) $(OS9BOOT_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
--- a/3rdparty/packages/sierra/spacequest2/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/sierra/spacequest2/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -11,25 +11,25 @@
 DISK_2_40D	= spacequest2_d2_40d.dsk
 DISK_3_40D	= spacequest2_d3_40d.dsk
 DISK_80D	= spacequest2_80d.dsk
-DISK_DW3	= spacequest2_dw3.dsk
-DISK_DW3_BECKER	= spacequest2_becker.dsk
+DISK_DW	= spacequest2_dw.dsk
+DISK_DW_BECKER	= spacequest2_becker.dsk
 
 DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D) \
-		$(DISK_DW3) $(DISK_DW3_BECKER)
+		$(DISK_DW) $(DISK_DW_BECKER)
 
 DISK_1_40D_NAME = "Space Quest II Disk 1"
 DISK_2_40D_NAME = "Space Quest II Disk 2"
 DISK_3_40D_NAME = "Space Quest II Disk 3"
 DISK_80D_NAME   = "Space Quest II"
-DISK_DW3_NAME   = "Space Quest II"
+DISK_DW_NAME   = "Space Quest II"
 
 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
 
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -49,23 +49,23 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-OS9BOOT_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-OS9BOOT_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
@@ -147,12 +147,12 @@
 	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
 
-$(DISK_DW3):
+$(DISK_DW):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
-	$(MERGE) $(OS9BOOT_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
@@ -170,12 +170,12 @@
 	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $@,.
 
-$(DISK_DW3_BECKER):
+$(DISK_DW_BECKER):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW3) -q $@ -n$(DISK_DW3_NAME)
-	$(MERGE) $(OS9BOOT_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
--- a/3rdparty/packages/subsim/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/3rdparty/packages/subsim/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -6,18 +6,18 @@
 DEPENDS		= ./makefile
 
 DSK_FLOPPY	= subsim.dsk
-DSK_DW3		= subsim_dw3.dsk
-DSK_DW3_BECKER	= subsim_becker.dsk
+DSK_DW		= subsim_dw.dsk
+DSK_DW_BECKER	= subsim_becker.dsk
 
 CMDS		= presub sub sub1 sub2 sub3 sub4 sub5 sub6
 MD		= $(LEVEL2)/coco3/modules
 
-DSKS		= $(DSK_FLOPPY) $(DSK_DW3) $(DSK_DW3_BECKER)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)
 
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_32 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_DW3_BECKER	= $(MD)/rel_32 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -27,21 +27,21 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
 
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
-BOOTFILE_DW3_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 $(MD)/sysgo_dd
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
 
 SUPPORTFILES	= control1.cmp convoys.dat diesel.dat fonts.dat germap.cmp \
 		hiscore.dat mission.txt missions.dat radar.dat shipmap2.dat \
@@ -75,12 +75,12 @@
 	$(OS9ATTR_EXEC) $@,SUB/sub6
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,SUB/$(file);)
 
-$(DSK_DW3):
+$(DSK_DW):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_SS80) $@ -n"Sub Battle Simulator"
-	$(MERGE) $(BOOTFILE_DW3)>os9boot
-	$(MERGE) $(KERNEL_DW3)>kernel
+	$(MERGE) $(BOOTFILE_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS $@,SUB
@@ -94,12 +94,12 @@
 	$(OS9ATTR_EXEC) $@,SUB/sub6
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,SUB/$(file);)
 
-$(DSK_DW3_BECKER):
+$(DSK_DW_BECKER):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_SS80) $@ -n"Sub Battle Simulator"
-	$(MERGE) $(BOOTFILE_DW3_BECKER)>os9boot
-	$(MERGE) $(KERNEL_DW3_BECKER)>kernel
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
 	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS $@,SUB
--- a/level1/atari/bootfiles/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/level1/atari/bootfiles/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -13,12 +13,12 @@
 
 # IMPORTANT! KRN MUST BE THE LAST MODULE IN BOOTFILE_P1!!
 BOOTFILE_P1 = $(MD)/krnp2 $(MD)/init $(MD)/ioman $(MD)/sysgo \
-		$(MD)/dw3.sb \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 \
+		$(MD)/dwio.sb \
+		$(MD)/clock_60hz $(MD)/clock2_dw \
           $(MD)/krn
 
 BOOTFILE_P2 = $(MD)/scf.mn $(MD)/vtio.dr $(MD)/term.dt \
-		$(MD)/rbf.mn $(MD)/rbdw3.dr \
+		$(MD)/rbf.mn $(MD)/rbdw.dr \
 		$(MD)/ddx0.dd $(MD)/x1.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(CD)/shell_21
--- a/level1/atari/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/level1/atari/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -60,7 +60,7 @@
 #	$(OS9GEN) $@ -b=$(BOOTFILE)	
 $(DSK):
 	$(RM) $@
-	$(OS9FORMAT_DW3) -q $@ -n"NitrOS-9/$(CPU) Level 1"
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 1"
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
@@ -76,7 +76,7 @@
 
 $(DSK_DEMO):
 	$(RM) $@
-	$(OS9FORMAT_DW3) -q $@ -n"NitrOS-9 Atari Demo Disk"
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9 Atari Demo Disk"
 	$(MAKDIR) $@,CMDS
 	$(CD) cmds; $(CP) $(CMDS_DEMO) ../$@,CMDS
 	$(foreach file, $(CMDS_DEMO), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
--- a/level1/atari/modules/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/level1/atari/modules/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -16,9 +16,9 @@
 BOOTERS		= 
 KERNEL		= krn krnp2
 SYSMODS		= ioman init sysgo sysgo_rom
-CLOCKS      = clock_60hz clock_50hz clock2_soft clock2_dw3
+CLOCKS      = clock_60hz clock_50hz clock2_soft clock2_dw
 
-RBF		= rbf.mn rbdw3.dr dw3.sb ddx0.dd x0.dd x1.dd x2.dd x3.dd
+RBF		= rbf.mn rbdw.dr dwio.sb ddx0.dd x0.dd x1.dd x2.dd x3.dd
 
 SCF		= scf.mn \
 		vrn.dr vtio.dr \
--- a/level1/coco/bootfiles/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/level1/coco/bootfiles/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -14,14 +14,14 @@
 KERNEL_1773	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
 		$(MD)/boot_1773_6ms
 
-KERNEL_DW3_COCO1	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		$(MD)/boot_dw3_coco1
+KERNEL_DW_COCO1	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
+		$(MD)/boot_dw_coco1
 
-KERNEL_DW3_COCO2	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		$(MD)/boot_dw3
+KERNEL_DW_COCO2	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
+		$(MD)/boot_dw
 
 KERNEL_BECKER_COCO	= $(MD)/rel $(MD)/krn $(MD)/krnp2 $(MD)/init \
-		$(MD)/boot_dw3_becker
+		$(MD)/boot_dw_becker
 
 IDE		= $(3PD)/ide
 SCSI		= $(3PD)/scsisys
@@ -62,9 +62,9 @@
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILE_HEADLESS_DW3_COCO1	= $(MD)/ioman \
+BOOTFILE_HEADLESS_DW_COCO1	= $(MD)/ioman \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_coco1.sb \
+		$(MD)/rbdw.dr $(MD)/dw_coco1.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/scf.mn \
 		$(MD)/scdwn.dr \
@@ -79,13 +79,13 @@
 		$(MD)/z7_scdwn.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 \
+		$(MD)/clock_60hz $(MD)/clock2_dw \
 		$(MD)/sysgo_dd
 
-BOOTFILE_COVDG_DW3_COCO1	= $(MD)/ioman \
+BOOTFILE_COVDG_DW_COCO1	= $(MD)/ioman \
 		$(MD)/rbf.mn $(MD)/rb1773.dr \
 		$(MD)/d0_80d.dd $(MD)/d1_40d.dd $(MD)/d2_40d.dd \
-		$(MD)/rbdw3.dr $(MD)/dw3_coco1.sb \
+		$(MD)/rbdw.dr $(MD)/dw_coco1.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/scf.mn \
 		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
@@ -100,12 +100,12 @@
 		$(MD)/z7_scdwn.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 \
+		$(MD)/clock_60hz $(MD)/clock2_dw \
 		$(MD)/sysgo_dd
 		
-BOOTFILE_HEADLESS_DW3_COCO2	= $(MD)/ioman \
+BOOTFILE_HEADLESS_DW_COCO2	= $(MD)/ioman \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb \
+		$(MD)/rbdw.dr $(MD)/dwio.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/scf.mn \
 		$(MD)/scdwn.dr \
@@ -119,13 +119,13 @@
 		$(MD)/z4_scdwn.dd $(MD)/z5_scdwn.dd $(MD)/z6_scdwn.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 \
+		$(MD)/clock_60hz $(MD)/clock2_dw \
 		$(MD)/sysgo_dd
 
-BOOTFILE_COVDG_DW3_COCO2	= $(MD)/ioman \
+BOOTFILE_COVDG_DW_COCO2	= $(MD)/ioman \
 		$(MD)/rbf.mn $(MD)/rb1773.dr \
 		$(MD)/d0_80d.dd $(MD)/d1_40d.dd $(MD)/d2_40d.dd \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb \
+		$(MD)/rbdw.dr $(MD)/dwio.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/scf.mn \
 		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
@@ -140,13 +140,13 @@
 		$(MD)/z7_scdwn.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 \
+		$(MD)/clock_60hz $(MD)/clock2_dw \
 		$(MD)/sysgo_dd
 
 BOOTFILE_COVDG_BECKER_COCO	= $(MD)/ioman \
 		$(MD)/rbf.mn $(MD)/rb1773.dr \
 		$(MD)/d0_80d.dd $(MD)/d1_40d.dd $(MD)/d2_40d.dd \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/scf.mn \
 		$(MD)/vtio.dr $(MD)/covdg.io $(MD)/term32.dt \
@@ -161,7 +161,7 @@
 		$(MD)/z7_scdwn.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 \
+		$(MD)/clock_60hz $(MD)/clock2_dw \
 		$(MD)/sysgo_dd
 
 BOOTFILE_COVDG_DS80	= $(MD)/ioman \
@@ -176,10 +176,10 @@
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILE_COHR_DW3_COCO1	= $(MD)/ioman \
+BOOTFILE_COHR_DW_COCO1	= $(MD)/ioman \
 		$(MD)/rbf.mn $(MD)/rb1773.dr \
 		$(MD)/d0_80d.dd $(MD)/d1_40d.dd $(MD)/d2_40d.dd \
-		$(MD)/rbdw3.dr $(MD)/dw3_coco1.sb \
+		$(MD)/rbdw.dr $(MD)/dw_coco1.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/scf.mn \
 		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
@@ -191,13 +191,13 @@
 		$(MD)/n12_scdwn.dd $(MD)/n13_scdwn.dd $(MD)/midi_scdwn.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 \
+		$(MD)/clock_60hz $(MD)/clock2_dw \
 		$(MD)/sysgo_dd
 
-BOOTFILE_COHR_DW3_COCO2	= $(MD)/ioman \
+BOOTFILE_COHR_DW_COCO2	= $(MD)/ioman \
 		$(MD)/rbf.mn $(MD)/rb1773.dr \
 		$(MD)/d0_80d.dd $(MD)/d1_40d.dd $(MD)/d2_40d.dd \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb \
+		$(MD)/rbdw.dr $(MD)/dwio.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/scf.mn \
 		$(MD)/vtio.dr $(MD)/cohr.io $(MD)/term51.dt \
@@ -209,7 +209,7 @@
 		$(MD)/n12_scdwn.dd $(MD)/n13_scdwn.dd $(MD)/midi_scdwn.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3 \
+		$(MD)/clock_60hz $(MD)/clock2_dw \
 		$(MD)/sysgo_dd
 
 BOOTFILE_COHR_DS80	= $(MD)/ioman \
@@ -224,12 +224,12 @@
 		$(MD)/clock_60hz $(MD)/clock2_soft \
 		$(MD)/sysgo_dd
 
-BOOTFILES	= bootfile_covdg bootfile_cohr bootfile_covdg_dw3_coco1 \
-		bootfile_covdg_dw3_coco2 bootfile_headless_dw3_coco1 \
-		bootfile_headless_dw3_coco2 bootfile_cohr_dw3_coco1 \
-		bootfile_cohr_dw3_coco2 bootfile_covdg_ds80 \
+BOOTFILES	= bootfile_covdg bootfile_cohr bootfile_covdg_dw_coco1 \
+		bootfile_covdg_dw_coco2 bootfile_headless_dw_coco1 \
+		bootfile_headless_dw_coco2 bootfile_cohr_dw_coco1 \
+		bootfile_cohr_dw_coco2 bootfile_covdg_ds80 \
 		bootfile_cohr_ds80 bootfile_covdg_becker_coco
-KERNELS		= kernel_1773 kernel_dw3_coco1 kernel_dw3_coco2 kernel_becker_coco
+KERNELS		= kernel_1773 kernel_dw_coco1 kernel_dw_coco2 kernel_becker_coco
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
 
@@ -247,17 +247,17 @@
 bootfile_covdg_ds80: $(BOOTFILE_COVDG_DS80) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COVDG_DS80)>$@
 
-bootfile_headless_dw3_coco1: $(BOOTFILE_HEADLESS_DW3_COCO1) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_HEADLESS_DW3_COCO1)>$@
+bootfile_headless_dw_coco1: $(BOOTFILE_HEADLESS_DW_COCO1) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_HEADLESS_DW_COCO1)>$@
 
-bootfile_covdg_dw3_coco1: $(BOOTFILE_COVDG_DW3_COCO1) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG_DW3_COCO1)>$@
+bootfile_covdg_dw_coco1: $(BOOTFILE_COVDG_DW_COCO1) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COVDG_DW_COCO1)>$@
 
-bootfile_headless_dw3_coco2: $(BOOTFILE_HEADLESS_DW3_COCO2) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_HEADLESS_DW3_COCO2)>$@
+bootfile_headless_dw_coco2: $(BOOTFILE_HEADLESS_DW_COCO2) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_HEADLESS_DW_COCO2)>$@
 
-bootfile_covdg_dw3_coco2: $(BOOTFILE_COVDG_DW3_COCO2) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COVDG_DW3_COCO2)>$@
+bootfile_covdg_dw_coco2: $(BOOTFILE_COVDG_DW_COCO2) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COVDG_DW_COCO2)>$@
 
 bootfile_covdg_becker_coco: $(BOOTFILE_COVDG_BECKER_COCO) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COVDG_BECKER_COCO)>$@
@@ -265,11 +265,11 @@
 bootfile_cohr_ds80: $(BOOTFILE_COHR_DS80) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_COHR_DS80)>$@
 
-bootfile_cohr_dw3_coco1: $(BOOTFILE_COHR_DW3_COCO1) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COHR_DW3_COCO1)>$@
+bootfile_cohr_dw_coco1: $(BOOTFILE_COHR_DW_COCO1) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COHR_DW_COCO1)>$@
 
-bootfile_cohr_dw3_coco2: $(BOOTFILE_COHR_DW3_COCO2) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_COHR_DW3_COCO2)>$@
+bootfile_cohr_dw_coco2: $(BOOTFILE_COHR_DW_COCO2) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_COHR_DW_COCO2)>$@
 
 # WD1773 Kernel
 kernel_1773: $(KERNEL_1773) $(DEPENDS)
@@ -277,12 +277,12 @@
 	$(PADROM) 4608 $@
 
 # DriveWire 3 Kernel
-kernel_dw3_coco1: $(KERNEL_DW3_COCO1) $(DEPENDS)
-	$(MERGE) $(KERNEL_DW3_COCO1)>$@
+kernel_dw_coco1: $(KERNEL_DW_COCO1) $(DEPENDS)
+	$(MERGE) $(KERNEL_DW_COCO1)>$@
 	$(PADROM) 4608 $@
 
-kernel_dw3_coco2: $(KERNEL_DW3_COCO2) $(DEPENDS)
-	$(MERGE) $(KERNEL_DW3_COCO2)>$@
+kernel_dw_coco2: $(KERNEL_DW_COCO2) $(DEPENDS)
+	$(MERGE) $(KERNEL_DW_COCO2)>$@
 	$(PADROM) 4608 $@
 
 kernel_becker_coco: $(KERNEL_BECKER_COCO) $(DEPENDS)
--- a/level1/coco/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/level1/coco/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -17,17 +17,17 @@
 BOOTFILE_COVDG	= bootfiles/bootfile_covdg
 BOOTFILE_COHR	= bootfiles/bootfile_cohr
 BOOTFILE_COVDG_DS80	= bootfiles/bootfile_covdg_ds80
-BOOTFILE_HEADLESS_DW3_COCO1	= bootfiles/bootfile_headless_dw3_coco1
-BOOTFILE_HEADLESS_DW3_COCO2	= bootfiles/bootfile_headless_dw3_coco2
-BOOTFILE_COVDG_DW3_COCO1	= bootfiles/bootfile_covdg_dw3_coco1
-BOOTFILE_COVDG_DW3_COCO2	= bootfiles/bootfile_covdg_dw3_coco2
+BOOTFILE_HEADLESS_DW_COCO1	= bootfiles/bootfile_headless_dw_coco1
+BOOTFILE_HEADLESS_DW_COCO2	= bootfiles/bootfile_headless_dw_coco2
+BOOTFILE_COVDG_DW_COCO1	= bootfiles/bootfile_covdg_dw_coco1
+BOOTFILE_COVDG_DW_COCO2	= bootfiles/bootfile_covdg_dw_coco2
 BOOTFILE_COVDG_BECKER_COCO	= bootfiles/bootfile_covdg_becker_coco
 BOOTFILE_COHR_DS80	= bootfiles/bootfile_cohr_ds80
-BOOTFILE_COHR_DW3_COCO1	= bootfiles/bootfile_cohr_dw3_coco1
-BOOTFILE_COHR_DW3_COCO2	= bootfiles/bootfile_cohr_dw3_coco2
+BOOTFILE_COHR_DW_COCO1	= bootfiles/bootfile_cohr_dw_coco1
+BOOTFILE_COHR_DW_COCO2	= bootfiles/bootfile_cohr_dw_coco2
 KERNELFILE	= bootfiles/kernel_1773
-KERNELFILE_DW3_COCO1	= bootfiles/kernel_dw3_coco1
-KERNELFILE_DW3_COCO2	= bootfiles/kernel_dw3_coco2
+KERNELFILE_DW_COCO1	= bootfiles/kernel_dw_coco1
+KERNELFILE_DW_COCO2	= bootfiles/kernel_dw_coco2
 KERNELFILE_BECKER_COCO	= bootfiles/kernel_becker_coco
 DIRS		= cmds modules defs sys bootfiles
 
@@ -50,12 +50,12 @@
 STARTUP_DW	= startup.dw
 
 PACKAGENAME	= $(DISTROVER).zip
-DSKDW3COCO1     = $(DISTROVER)1_dw3.dsk
-LDSKDW3COCO1    = $(DISTRONAME)coco1_dw3.dsk
-DSKDW3COCO2     = $(DISTROVER)2_dw3.dsk
-LDSKDW3COCO2    = $(DISTRONAME)coco2_dw3.dsk
-DSKDW3COCOBECK  = $(DISTROVER)_becker.dsk
-LDSKDW3COCOBECK = $(DISTRONAME)coco_becker.dsk
+DSKDWCOCO1     = $(DISTROVER)1_dw.dsk
+LDSKDWCOCO1    = $(DISTRONAME)coco1_dw.dsk
+DSKDWCOCO2     = $(DISTROVER)2_dw.dsk
+LDSKDWCOCO2    = $(DISTRONAME)coco2_dw.dsk
+DSKDWCOCOBECK  = $(DISTROVER)_becker.dsk
+LDSKDWCOCOBECK = $(DISTRONAME)coco_becker.dsk
 DSK360K_1       = $(DISTROVER)_40d_1.dsk
 LDSK360K_1      = $(DISTRONAME)_40d_1.dsk
 DSK360K_2       = $(DISTROVER)_40d_2.dsk
@@ -64,8 +64,8 @@
 LDSK720K        = $(DISTRONAME)_80d.dsk
 
 
-DSKS		= $(DSKDW3COCO1) $(DSKDW3COCO2) $(DSKDW3COCOBECK) $(DSK360K_1) $(DSK360K_2) $(DSK720K)
-LDSKS		= $(LDSKDW3COCO1) $(LDSKDW3COCO2) $(LDSKDW3COCOBECK) $(LDSK360K_1) $(LDSK360K_2) $(LDSK720K)
+DSKS		= $(DSKDWCOCO1) $(DSKDWCOCO2) $(DSKDWCOCOBECK) $(DSK360K_1) $(DSK360K_2) $(DSK720K)
+LDSKS		= $(LDSKDWCOCO1) $(LDSKDWCOCO2) $(LDSKDWCOCOBECK) $(LDSK360K_1) $(LDSK360K_2) $(LDSK720K)
 
 # Make all components
 all:
@@ -94,9 +94,9 @@
 $(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog
 	$(ARCHIVE) $@ $^
 
-$(DSKDW3COCOBECK):
+$(DSKDWCOCOBECK):
 	$(RM) $@
-	$(OS9FORMAT_DW3) -q $@ -n"NitrOS-9/$(CPU) Level 1"
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 1"
 	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG_BECKER_COCO) -t=$(KERNELFILE_BECKER_COCO)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
@@ -144,14 +144,14 @@
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
 	$(MAKDIR) $@,NITROS9/6809L1/SCRIPTS
 	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/6809L1/SCRIPTS
-	$(RM) $(LDSKDW3COCOBECK)
-	$(SOFTLINK) $@ $(LDSKDW3COCOBECK)
+	$(RM) $(LDSKDWCOCOBECK)
+	$(SOFTLINK) $@ $(LDSKDWCOCOBECK)
 
 
-$(DSKDW3COCO1):
+$(DSKDWCOCO1):
 	$(RM) $@
-	$(OS9FORMAT_DW3) -q $@ -n"NitrOS-9/$(CPU) Level 1"
-	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG_DW3_COCO1) -t=$(KERNELFILE_DW3_COCO1)
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 1"
+	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG_DW_COCO1) -t=$(KERNELFILE_DW_COCO1)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
@@ -198,13 +198,13 @@
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
 	$(MAKDIR) $@,NITROS9/6809L1/SCRIPTS
 	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/6809L1/SCRIPTS
-	$(RM) $(LDSKDW3COCO1)
-	$(SOFTLINK) $@ $(LDSKDW3COCO1)
+	$(RM) $(LDSKDWCOCO1)
+	$(SOFTLINK) $@ $(LDSKDWCOCO1)
 
-$(DSKDW3COCO2):
+$(DSKDWCOCO2):
 	$(RM) $@
-	$(OS9FORMAT_DW3) -q $@ -n"NitrOS-9/6809 Level 1"
-	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG_DW3_COCO2) -t=$(KERNELFILE_DW3_COCO2)
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/6809 Level 1"
+	$(OS9GEN) $@ -b=$(BOOTFILE_COVDG_DW_COCO2) -t=$(KERNELFILE_DW_COCO2)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
@@ -251,8 +251,8 @@
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/6809L1/BOOTLISTS
 	$(MAKDIR) $@,NITROS9/6809L1/SCRIPTS
 	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/6809L1/SCRIPTS
-	$(RM) $(LDSKDW3COCO2)
-	$(SOFTLINK) $@ $(LDSKDW3COCO2)
+	$(RM) $(LDSKDWCOCO2)
+	$(SOFTLINK) $@ $(LDSKDWCOCO2)
 
 $(DSK360K_1):
 	$(RM) $@
--- a/level1/coco/modules/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/level1/coco/modules/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -25,18 +25,18 @@
 TPB		= $(3RDPARTY)/booters
 
 BOOTERS		= boot_1773_6ms boot_1773_30ms \
-		boot_burke boot_rampak boot_wd1002 boot_dw3 boot_dw3_coco1 \
-		boot_tc3 boot_ide boot_rom boot_dw3_becker
+		boot_burke boot_rampak boot_wd1002 boot_dw boot_dw_coco1 \
+		boot_tc3 boot_ide boot_rom boot_dw_becker
 BOOTTRACK	= rel $(BOOTERS)
 KERNEL		= krn krnp2 wbug
 SYSMODS		= ioman init sysgo_dd sysgo_h0 rominfo vectors
 CLOCKS          = clock_60hz clock_50hz \
 		clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \
                 clock2_smart clock2_harris clock2_cloud9 clock2_soft \
-		clock2_messemu clock2_jvemu clock2_dw3
+		clock2_messemu clock2_jvemu clock2_dw
 
 RBF		= rbf.mn \
-		rbdw3.dr dw3.sb dw3_coco1.sb dw3_becker.sb \
+		rbdw.dr dwio.sb dw_coco1.sb dwio_becker.sb \
 		rb1773.dr rb1773_scii_ff74.dr rb1773_scii_ff58.dr \
 		ddd0_35s.dd d0_35s.dd d1_35s.dd d2_35s.dd d3_35s.dd \
 		ddd0_40d.dd d0_40d.dd d1_40d.dd d2_40d.dd \
@@ -87,16 +87,16 @@
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS)
 
 # DriveWire 3
-boot_dw3_coco1: boot_dw3.asm
+boot_dw_coco1: boot_dw.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aBAUD38400=1
 
-boot_dw3_becker: boot_dw3.asm
+boot_dw_becker: boot_dw.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aBECKER=1
 
-dw3_coco1.sb: dw3.asm
+dw_coco1.sb: dw.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aBAUD38400=1
 
-dw3_becker.sb: dw3.asm
+dwio_becker.sb: dw.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aBECKER=1
 
 boot_1773_6ms:	boot_1773.asm
--- a/level2/coco3/bootfiles/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/level2/coco3/bootfiles/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -12,14 +12,14 @@
 
 KERNEL_1773	= $(MD)/rel_80 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_1773_50HZ	= $(MD)/rel_80_50hz $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_80 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_BECKER	= $(MD)/rel_80 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_80 $(MD)/boot_dw $(MD)/krn
+KERNEL_BECKER	= $(MD)/rel_80 $(MD)/boot_dw_becker $(MD)/krn
 
 # NitrOS-9 disk bootfile to allow booting from DriveWire server
 # on a DE1 or Xilinx using Gary Becker's CoCo 3 FGPA
 BOOTFILE_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/d2_40d.dd $(MD)/ddd0_40d.dd \
@@ -40,12 +40,12 @@
 		$(MD)/z7_scdwn.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3_becker
+		$(MD)/clock_60hz $(MD)/clock2_dw_becker
 
 # NitrOS-9 disk bootfile to allow booting from DriveWire 3 server
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb \
+		$(MD)/rbdw.dr $(MD)/dwio.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_80d.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -65,13 +65,13 @@
 		$(MD)/z7_scdwn.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3
+		$(MD)/clock_60hz $(MD)/clock2_dw
 
 # NitrOS-9 disk bootfile to allow booting from DriveWire 3 server
 # Headless mode
-BOOTFILE_DW3_HEADLESS	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_HEADLESS	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb \
+		$(MD)/rbdw.dr $(MD)/dwio.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/d2_40d.dd $(MD)/ddd0_40d.dd \
@@ -88,7 +88,7 @@
 		$(MD)/z4_scdwn.dd $(MD)/z5_scdwn.dd $(MD)/z6_scdwn.dd \
 		$(MD)/z7_scdwn.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3
+		$(MD)/clock_60hz $(MD)/clock2_dw
 
 # NitrOS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
@@ -143,8 +143,8 @@
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_50hz $(MD)/clock2_soft
 
-BOOTFILES	= bootfile_40d bootfile_40d_50hz bootfile_80d bootfile_80d_50hz bootfile_dw3 bootfile_dw3_headless bootfile_becker
-KERNELS		= kernel_1773 kernel_1773_50hz kernel_dw3 kernel_becker
+BOOTFILES	= bootfile_40d bootfile_40d_50hz bootfile_80d bootfile_80d_50hz bootfile_dw bootfile_dw_headless bootfile_becker
+KERNELS		= kernel_1773 kernel_1773_50hz kernel_dw kernel_becker
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
 
@@ -166,11 +166,11 @@
 bootfile_80d_50hz: $(BOOTFILE_80D_50HZ) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_80D_50HZ)>$@
 
-bootfile_dw3: $(BOOTFILE_DW3) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_DW3)>$@
+bootfile_dw: $(BOOTFILE_DW) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_DW)>$@
 
-bootfile_dw3_headless: $(BOOTFILE_DW3_HEADLESS) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_DW3_HEADLESS)>$@
+bootfile_dw_headless: $(BOOTFILE_DW_HEADLESS) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_DW_HEADLESS)>$@
 
 # Kernels
 kernel_becker: $(KERNEL_BECKER) $(DEPENDS)
@@ -182,8 +182,8 @@
 kernel_1773_50hz: $(KERNEL_1773_50HZ) $(DEPENDS)
 	$(MERGE) $(KERNEL_1773_50HZ)>$@
 
-kernel_dw3: $(KERNEL_DW3) $(DEPENDS)
-	$(MERGE) $(KERNEL_DW3)>$@
+kernel_dw: $(KERNEL_DW) $(DEPENDS)
+	$(MERGE) $(KERNEL_DW)>$@
 
 clean:
 	$(RM) $(ALLOBJS)
--- a/level2/coco3/modules/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/level2/coco3/modules/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -25,7 +25,7 @@
 TPB		= $(3RDPARTY)/booters
 
 BOOTERS		= boot_1773_6ms boot_1773_30ms \
-		 boot_burke boot_rampak boot_wd1002 boot_dw3 boot_dw3_becker \
+		 boot_burke boot_rampak boot_wd1002 boot_dw boot_dw_becker \
 		boot_tc3 boot_ide boot_rom
 BOOTTRACK	= rel_32 rel_40 rel_80 rel_32_50hz rel_40_50hz rel_80_50hz $(BOOTERS) krn
 KERNEL		= krnp2 krnp3_perr krnp4_regdump
@@ -33,10 +33,10 @@
 CLOCKS          = clock_60hz clock_50hz \
 		clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \
 		clock2_smart clock2_harris clock2_cloud9 clock2_soft \
-		clock2_jvemu clock2_messemu clock2_dw3 clock2_dw3_becker
+		clock2_jvemu clock2_messemu clock2_dw clock2_dw_becker
 
 RBF		= rbf.mn \
-		rbdw3.dr dw3.sb dw3_becker.sb \
+		rbdw.dr dwio.sb dwio_becker.sb \
 		rb1773.dr rb1773_scii_ff74.dr rb1773_scii_ff58.dr \
 		d0_35s.dd d1_35s.dd d2_35s.dd d3_35s.dd \
 		d0_40d.dd d1_40d.dd d2_40d.dd d0_80d.dd \
@@ -115,11 +115,11 @@
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS)
 
 # DriveWire 3 Becker Booter
-boot_dw3_becker: boot_dw3.asm
+boot_dw_becker: boot_dw.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aBECKER=1
 
 # DriveWire 3 Becker Submodule
-dw3_becker.sb: dw3.asm
+dwio_becker.sb: dw.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aBECKER=1
 
 # CoGrf/CoVDG Modules
@@ -414,7 +414,7 @@
 clock2_bnb: clock2_ds1315.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aBNB=1
 
-clock2_dw3_becker: clock2_dw3.asm
+clock2_dw_becker: clock2_dw.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aBECKER=1
 
 clean:
--- a/level2/coco3_6309/bootfiles/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/level2/coco3_6309/bootfiles/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -12,14 +12,14 @@
 
 KERNEL_1773	= $(MD)/rel_80 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_1773_50HZ	= $(MD)/rel_80_50hz $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_80 $(MD)/boot_dw3 $(MD)/krn
-KERNEL_BECKER	= $(MD)/rel_80 $(MD)/boot_dw3_becker $(MD)/krn
+KERNEL_DW	= $(MD)/rel_80 $(MD)/boot_dw $(MD)/krn
+KERNEL_BECKER	= $(MD)/rel_80 $(MD)/boot_dw_becker $(MD)/krn
 
 # NitrOS-9 disk bootfile to allow booting from DriveWire server
 # on a DE1 or Xilinx using Gary Becker's CoCo 3 FGPA
 BOOTFILE_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3_becker.sb \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/d2_40d.dd $(MD)/ddd0_40d.dd \
@@ -37,12 +37,12 @@
 		$(MD)/n12_scdwn.dd $(MD)/n13_scdwn.dd $(MD)/midi_scdwn.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3_becker
+		$(MD)/clock_60hz $(MD)/clock2_dw_becker
 
 # NitrOS-9 disk bootfile to allow booting from DriveWire 3 server
-BOOTFILE_DW3	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb \
+		$(MD)/rbdw.dr $(MD)/dwio.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -62,13 +62,13 @@
 		$(MD)/z7_scdwn.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3
+		$(MD)/clock_60hz $(MD)/clock2_dw
 
 # NitrOS-9 disk bootfile to allow booting from DriveWire 3 server
 # Headless mode
-BOOTFILE_DW3_HEADLESS	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW_HEADLESS	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb \
+		$(MD)/rbdw.dr $(MD)/dwio.sb \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/d2_40d.dd $(MD)/ddd0_40d.dd \
@@ -85,7 +85,7 @@
 		$(MD)/z4_scdwn.dd $(MD)/z5_scdwn.dd $(MD)/z6_scdwn.dd \
 		$(MD)/z7_scdwn.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
-		$(MD)/clock_60hz $(MD)/clock2_dw3
+		$(MD)/clock_60hz $(MD)/clock2_dw
 
 # NitrOS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
@@ -140,8 +140,8 @@
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_50hz $(MD)/clock2_soft
 
-BOOTFILES	= bootfile_40d bootfile_40d_50hz bootfile_80d bootfile_80d_50hz bootfile_dw3 bootfile_dw3_headless bootfile_becker
-KERNELS		= kernel_1773 kernel_1773_50hz kernel_dw3 kernel_becker
+BOOTFILES	= bootfile_40d bootfile_40d_50hz bootfile_80d bootfile_80d_50hz bootfile_dw bootfile_dw_headless bootfile_becker
+KERNELS		= kernel_1773 kernel_1773_50hz kernel_dw kernel_becker
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
 
@@ -163,11 +163,11 @@
 bootfile_80d_50hz: $(BOOTFILE_80D_50HZ) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_80D_50HZ)>$@
 
-bootfile_dw3: $(BOOTFILE_DW3) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_DW3)>$@
+bootfile_dw: $(BOOTFILE_DW) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_DW)>$@
 
-bootfile_dw3_headless: $(BOOTFILE_DW3_HEADLESS) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_DW3_HEADLESS)>$@
+bootfile_dw_headless: $(BOOTFILE_DW_HEADLESS) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_DW_HEADLESS)>$@
 
 # Kernels
 kernel_becker: $(KERNEL_BECKER) $(DEPENDS)
@@ -179,8 +179,8 @@
 kernel_1773_50hz: $(KERNEL_1773_50HZ) $(DEPENDS)
 	$(MERGE) $(KERNEL_1773_50HZ)>$@
 
-kernel_dw3: $(KERNEL_DW3) $(DEPENDS)
-	$(MERGE) $(KERNEL_DW3)>$@
+kernel_dw: $(KERNEL_DW) $(DEPENDS)
+	$(MERGE) $(KERNEL_DW)>$@
 
 clean:
 	$(RM) $(ALLOBJS)
--- a/level3/coco3/bootfiles/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/level3/coco3/bootfiles/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -12,7 +12,7 @@
 
 KERNEL_1773	= $(MD)/rel_80 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_1773_50HZ	= $(MD)/rel_80_50hz $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW3	= $(MD)/rel_80 $(MD)/boot_dw3 $(MD)/krn
+KERNEL_DW	= $(MD)/rel_80 $(MD)/boot_dw $(MD)/krn
 
 # NitrOS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_40D	= $(MD)/scf.mn \
@@ -79,8 +79,8 @@
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_50hz $(MD)/clock2_soft
 
-BOOTFILES	= bootfile_40d bootfile_40d_50hz bootfile_80d bootfile_80d_50hz bootfile_dw3
-KERNELS		= kernel_1773 kernel_1773_50hz kernel_dw3
+BOOTFILES	= bootfile_40d bootfile_40d_50hz bootfile_80d bootfile_80d_50hz bootfile_dw
+KERNELS		= kernel_1773 kernel_1773_50hz kernel_dw
 
 ALLOBJS		= $(BOOTFILES) $(KERNELS)
 
@@ -99,8 +99,8 @@
 bootfile_80d_50hz: $(BOOTFILE_80D_50HZ) $(DEPENDS)
 	$(MERGE) $(BOOTFILE_80D_50HZ)>$@
 
-bootfile_dw3: $(BOOTFILE_DW3) $(DEPENDS)
-	$(MERGE) $(BOOTFILE_DW3)>$@
+bootfile_dw: $(BOOTFILE_DW) $(DEPENDS)
+	$(MERGE) $(BOOTFILE_DW)>$@
 
 # Kernels
 kernel_1773: $(KERNEL_1773) $(DEPENDS)
@@ -109,8 +109,8 @@
 kernel_1773_50hz: $(KERNEL_1773_50HZ) $(DEPENDS)
 	$(MERGE) $(KERNEL_1773_50HZ)>$@
 
-kernel_dw3: $(KERNEL_DW3) $(DEPENDS)
-	$(MERGE) $(KERNEL_DW3)>$@
+kernel_dw: $(KERNEL_DW) $(DEPENDS)
+	$(MERGE) $(KERNEL_DW)>$@
 
 clean:
 	$(RM) $(ALLOBJS)
--- a/level3/coco3/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/level3/coco3/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -10,14 +10,14 @@
 DISTRO		= $(CPU)L$(LEVEL)
 DISTRONAME	= nos9$(CPU)l$(LEVEL)
 DISTROVER	= $(DISTRONAME)$(NITROS9VER)$(PORT)
-BOOTFILE_DW3	= bootfiles/bootfile_dw3
+BOOTFILE_DW	= bootfiles/bootfile_dw
 BOOTFILE_40D	= bootfiles/bootfile_40d
 BOOTFILE_80D	= bootfiles/bootfile_80d
 BOOTFILE_40D_50HZ	= bootfiles/bootfile_40d_50hz
 BOOTFILE_80D_50HZ	= bootfiles/bootfile_80d_50hz
 KERNELFILE	= bootfiles/kernel_1773
 KERNELFILE_50HZ	= bootfiles/kernel_1773_50hz
-KERNELFILE_DW3	= bootfiles/kernel_dw3
+KERNELFILE_DW	= bootfiles/kernel_dw
 DIRS		= cmds modules defs sys bootfiles
 
 CMDS		= $(shell $(CD) cmds; make showobjs)
@@ -38,8 +38,8 @@
 SYSGO		= sysgo_dd
 
 PACKAGENAME	= $(DISTROVER).zip
-DSKDW3		= $(DISTROVER)_dw3.dsk
-LDSKDW3		= $(DISTRONAME)_dw3.dsk
+DSKDW		= $(DISTROVER)_dw.dsk
+LDSKDW		= $(DISTRONAME)_dw.dsk
 DSK360K_1	= $(DISTROVER)_40d_1.dsk
 LDSK360K_1	= $(DISTRONAME)_40d_1.dsk
 DSK360K_1_50HZ	= $(DISTROVER)_40d_1_50hz.dsk
@@ -52,8 +52,8 @@
 LDSK720K_50HZ	= $(DISTRONAME)_80d_50hz.dsk
 TESTDSK		= test.dsk
 
-DSKS		= $(DSKDW3) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ)
-LDSKS		= $(LDSKDW3) $(LDSK360K_1) $(LDSK360K_1_50HZ) $(LDSK360K_2) $(LDSK720K) $(LDSK720K_50HZ)
+DSKS		= $(DSKDW) $(DSK360K_1) $(DSK360K_1_50HZ) $(DSK360K_2) $(DSK720K) $(DSK720K_50HZ)
+LDSKS		= $(LDSKDW) $(LDSK360K_1) $(LDSK360K_1_50HZ) $(LDSK360K_2) $(LDSK720K) $(LDSK720K_50HZ)
 
 # Make all components
 all:
@@ -82,10 +82,10 @@
 $(PACKAGENAME): $(DSKS) ../../ReadMe ../../ChangeLog
 	$(ARCHIVE) $@ $^
 
-$(DSKDW3):
+$(DSKDW):
 	-$(RM) $@
-	$(OS9FORMAT_DW3) -q $@ -n"NitrOS-9/$(CPU) Level 2"
-	$(OS9GEN) $@ -b=$(BOOTFILE_DW3) -t=$(KERNELFILE_DW3)
+	$(OS9FORMAT_DW) -q $@ -n"NitrOS-9/$(CPU) Level 2"
+	$(OS9GEN) $@ -b=$(BOOTFILE_DW) -t=$(KERNELFILE_DW)
 	$(MAKDIR) $@,CMDS
 	$(MAKDIR) $@,SYS
 	$(MAKDIR) $@,DEFS
@@ -132,8 +132,8 @@
 	$(CD) bootlists; $(CPL) *.bl ../$@,NITROS9/$(DISTRO)/BOOTLISTS
 	$(MAKDIR) $@,NITROS9/$(DISTRO)/SCRIPTS
 	$(CD) scripts; $(CPL) mb* ../$@,NITROS9/$(DISTRO)/SCRIPTS
-	$(RM) $(LDSKDW3)
-	$(SOFTLINK) $@ $(LDSKDW3)
+	$(RM) $(LDSKDW)
+	$(SOFTLINK) $@ $(LDSKDW)
 
 $(DSK360K_1):
 	-$(RM) $@
--- a/level3/coco3/modules/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/level3/coco3/modules/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -23,17 +23,17 @@
 TPB		= ../../3rdparty/booters
 
 BOOTERS		= boot_1773_6ms boot_1773_30ms \
-		 boot_burke boot_rampak boot_wd1002 boot_dw3
+		 boot_burke boot_rampak boot_wd1002 boot_dw
 BOOTTRACK	= rel_32 rel_40 rel_80 rel_32_50hz rel_40_50hz rel_80_50hz $(BOOTERS) krn
 KERNEL		= krnp2 krnp3_perr krnp4_regdump
 SYSMODS		= ioman init sysgo_h0 sysgo_dd nitro end
 CLOCKS          = clock_60hz clock_50hz \
 		clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \
 		clock2_smart clock2_harris clock2_cloud9 clock2_soft \
-		clock2_jvemu clock2_messemu clock2_dw3
+		clock2_jvemu clock2_messemu clock2_dw
 
 RBF		= rbf.mn \
-		rbdw3.dr dw3.sb \
+		rbdw.dr dwio.sb \
 		rb1773.dr rb1773_scii_ff74.dr rb1773_scii_ff58.dr \
 		d0_35s.dd d1_35s.dd d2_35s.dd d3_35s.dd \
 		d0_40d.dd d1_40d.dd d2_40d.dd d0_80d.dd \
--- a/level3/coco3_6309/modules/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/level3/coco3_6309/modules/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -23,17 +23,17 @@
 TPB		= ../../3rdparty/booters
 
 BOOTERS		= boot_1773_6ms boot_1773_30ms \
-		 boot_burke boot_rampak boot_wd1002 boot_dw3
+		 boot_burke boot_rampak boot_wd1002 boot_dw
 BOOTTRACK	= rel_32 rel_40 rel_80 rel_32_50hz rel_40_50hz rel_80_50hz $(BOOTERS) krn
 KERNEL		= krnp2 krnp3_perr krnp4_regdump
 SYSMODS		= ioman init sysgo_h0 sysgo_dd nitro end
 CLOCKS          = clock_60hz clock_50hz \
 		clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \
 		clock2_smart clock2_harris clock2_cloud9 clock2_soft \
-		clock2_jvemu clock2_messemu clock2_dw3
+		clock2_jvemu clock2_messemu clock2_dw
 
 RBF		= rbf.mn \
-		rbdw3.dr dw3.sb \
+		rbdw.dr dwio.sb \
 		rb1773.dr rb1773_scii_ff74.dr rb1773_scii_ff58.dr \
 		d0_35s.dd d1_35s.dd d2_35s.dd d3_35s.dd \
 		d0_40d.dd d1_40d.dd d2_40d.dd d0_80d.dd \
--- a/makefile	Sun Nov 24 10:56:31 2013 +0100
+++ b/makefile	Sun Nov 24 11:13:40 2013 +0100
@@ -42,11 +42,11 @@
 	$(foreach dir, $(dirs), ($(CD) $(dir); make dskclean);)
 
 # DriveWire 3 DSK images
-dw3dsk = $(LEVEL1)/coco/nos96809l1coco1_dw3.dsk $(LEVEL1)/coco/nos96809l1coco2_dw3.dsk \
-	$(LEVEL2)/coco3/nos96809l2_dw3.dsk $(LEVEL2)/coco3_6309/nos96309l2_dw3.dsk
+dwdsk = $(LEVEL1)/coco/nos96809l1coco1_dw.dsk $(LEVEL1)/coco/nos96809l1coco2_dw.dsk \
+	$(LEVEL2)/coco3/nos96809l2_dw.dsk $(LEVEL2)/coco3_6309/nos96309l2_dw.dsk
 
-dw3:	dsk
-	$(ARCHIVE) nitros9_drivewire3.zip $(dw3dsk)
+dw:	dsk
+	$(ARCHIVE) nitros9_drivewire3.zip $(dwdsk)
 
 # DriveWire 3 Becker DSK Images
 beckerdsk	= $(LEVEL1)/coco/nos96809l1coco_becker.dsk \