diff --git a/_posts/2015-12-27-revisiting-os2.md b/_posts/2015-12-27-revisiting-os2.md
index b064f0ece..a51f6d5a3 100644
--- a/_posts/2015-12-27-revisiting-os2.md
+++ b/_posts/2015-12-27-revisiting-os2.md
@@ -8,7 +8,9 @@ machines:
   - type: pc
     id: ibm5170
     debugger: true
-    config: /disks/pc/os2/ibm/1.0/machine.xml
+    config: /devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml
+    drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pc/fixed/20mb/IBMOS210.json"}]'
+    automount: ''
 ---
 
 Just for fun (because I have a warped sense of fun), I decided to revisit some of the old OS/2 software I wrote
diff --git a/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml
index 292b903e7..1330a2b2d 100644
--- a/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/2048kb/rev3/debugger/machine.xml
@@ -8,7 +8,7 @@
 	<ram id="ramExt" addr="0x100000" size="0x160000" comment=""/>
 	<rom id="romBIOS" addr="0xf0000" size="0x10000" alias="0xff0000" file="/devices/pc/rom/5170/bios/1985-11-15/ATBIOS-REV3.json"/>
 	<video ref="/devices/pc/video/ibm/ega/1984-09-13/128kb-lockfs.xml"/>
-	<fdc ref="/disks/pc/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pc/dos/ibm/3.30/PCDOS300-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pc/dos/ibm/3.30/PCDOS300-DISK2.json"}}'/>
+	<fdc ref="/disks/pc/compiled/library.xml" automount='{A:{name:"PC-DOS 3.30 (Disk 1)",path:"/disks/pc/dos/ibm/3.30/PCDOS330-DISK1.json"}, B:{name:"PC-DOS 3.30 (Disk 2)",path:"/disks/pc/dos/ibm/3.30/PCDOS330-DISK2.json"}}'/>
 	<keyboard ref="/devices/pc/keyboard/us84-buttons-arrows.xml"/>
 	<debugger id="debugger" messages="fault" commands=""/>
 	<panel ref="/devices/pc/panel/wide.xml"/>
diff --git a/disks/pc/fixed/10mb/pcdos200-win101.json b/disks/pc/fixed/10mb/PCDOS200WIN101.json
similarity index 100%
rename from disks/pc/fixed/10mb/pcdos200-win101.json
rename to disks/pc/fixed/10mb/PCDOS200WIN101.json
diff --git a/disks/pc/fixed/10mb/pcdos200-win101-ega.json b/disks/pc/fixed/10mb/PCDOS200WIN101EGA.json
similarity index 100%
rename from disks/pc/fixed/10mb/pcdos200-win101-ega.json
rename to disks/pc/fixed/10mb/PCDOS200WIN101EGA.json
diff --git a/disks/pc/fixed/10mb/pcdos200-win101-ega.xml b/disks/pc/fixed/10mb/pcdos200-win101-ega.xml
index 687590eaa..45be7a579 100644
--- a/disks/pc/fixed/10mb/pcdos200-win101-ega.xml
+++ b/disks/pc/fixed/10mb/pcdos200-win101-ega.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",path:"/disks/pc/fixed/10mb/pcdos200-win101-ega.json",type:3}]'/>
+<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",path:"/disks/pc/fixed/10mb/PCDOS200-WIN101-EGA.json",type:3}]'/>
diff --git a/disks/pc/fixed/10mb/pcdos200-win101.xml b/disks/pc/fixed/10mb/pcdos200-win101.xml
index c1d5e9ae5..38f8f4774 100644
--- a/disks/pc/fixed/10mb/pcdos200-win101.xml
+++ b/disks/pc/fixed/10mb/pcdos200-win101.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",path:"/disks/pc/fixed/10mb/pcdos200-win101.json",type:3}]'/>
+<hdc id="hdcXT" drives='[{name:"10Mb Hard Disk",path:"/disks/pc/fixed/10mb/PCDOS200-WIN101.json",type:3}]'/>
diff --git a/disks/pc/fixed/20mb/pcdos320-win300.json b/disks/pc/fixed/20mb/PCDOS320WIN300.json
similarity index 100%
rename from disks/pc/fixed/20mb/pcdos320-win300.json
rename to disks/pc/fixed/20mb/PCDOS320WIN300.json
diff --git a/disks/pc/fixed/20mb/pcdos330-empty.json b/disks/pc/fixed/20mb/PCDOS330EMPTY.json
similarity index 100%
rename from disks/pc/fixed/20mb/pcdos330-empty.json
rename to disks/pc/fixed/20mb/PCDOS330EMPTY.json
diff --git a/disks/pc/fixed/20mb/pcdos330-win310.json b/disks/pc/fixed/20mb/PCDOS330WIN310.json
similarity index 100%
rename from disks/pc/fixed/20mb/pcdos330-win310.json
rename to disks/pc/fixed/20mb/PCDOS330WIN310.json
diff --git a/disks/pc/os2/ibm/1.0/manifest.xml b/disks/pc/os2/ibm/1.0/manifest.xml
index 3f1c23765..abbff1a96 100644
--- a/disks/pc/os2/ibm/1.0/manifest.xml
+++ b/disks/pc/os2/ibm/1.0/manifest.xml
@@ -2,7 +2,6 @@
 <?xml-stylesheet type="text/xsl" href="/versions/pcjs/1.21.1/manifest.xsl"?>
 <manifest type="software">
 	<title>IBM OS/2 1.0</title>
-	<machine href="/disks/pc/os2/ibm/1.0/machine.xml"/>
 	<disk id="disk00" size="1474560" chs="80:2:18" img="archive/OS210-INSTALL.img" href="/disks/pc/os2/ibm/1.0/OS210-INSTALL.json" md5="b0410a7cd0d8bf188028729d1634bf75" md5json="4e690e5d55de300077c442762c7b7f97">
 		<name>IBM OS/2 1.0 (1.44M Install)</name>
 	</disk>