diff --git a/disks/pcx86/compiled/library.xml b/disks/pcx86/compiled/library.xml
index 4e4624a02..ca16d4650 100644
--- a/disks/pcx86/compiled/library.xml
+++ b/disks/pcx86/compiled/library.xml
@@ -26,7 +26,7 @@
 		<disk path="/disks/pcx86/dos/ibm/3.20/PCDOS320-DISK2.json">PC-DOS 3.20 (Disk 2)</disk>
 		<disk path="/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1.json">PC-DOS 3.30 (Disk 1)</disk>
 		<disk path="/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK2.json">PC-DOS 3.30 (Disk 2)</disk>
-		<disk path="/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1-720K.json">PC-DOS 3.30 (720K Disk)</disk>
+		<disk path="/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1-720K.json">PC-DOS 3.30 (720K)</disk>
 		<disk path="/disks/pcx86/dos/ibm/4.00/PCDOS400-DISK1.json">PC-DOS 4.00 (Disk 1)</disk>
 		<disk path="/disks/pcx86/dos/ibm/4.00/PCDOS400-DISK2.json">PC-DOS 4.00 (Disk 2)</disk>
 		<disk path="/disks/pcx86/dos/ibm/4.00/PCDOS400-DISK3.json">PC-DOS 4.00 (Disk 3)</disk>
@@ -134,15 +134,15 @@
 		<disk path="/disks/pcx86/os2/ibm/1.1/OS211-DISK04.json">IBM OS/2 1.1 (1.44M Disk 4)</disk>
 		<disk path="/disks/pcx86/os2/ibm/1.1/OS211-DEVICES.json">IBM OS/2 1.1 (1.44M Devices)</disk>
 		<disk path="/disks/pcx86/os2/ibm/1.1/OS211-PRINTERS.json">IBM OS/2 1.1 (1.44M Printers)</disk>
-		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK01.json">IBM OS/2 1.3 (1.44M Disk 1)</disk>
-		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK02.json">IBM OS/2 1.3 (1.44M Disk 2)</disk>
-		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK03.json">IBM OS/2 1.3 (1.44M Disk 3)</disk>
-		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK04.json">IBM OS/2 1.3 (1.44M Disk 4)</disk>
-		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK05.json">IBM OS/2 1.3 (1.44M Disk 5)</disk>
-		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK06.json">IBM OS/2 1.3 (1.44M Disk 6)</disk>
-		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK07.json">IBM OS/2 1.3 (1.44M Disk 7)</disk>
-		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK08.json">IBM OS/2 1.3 (1.44M Disk 8)</disk>
-		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK09.json">IBM OS/2 1.3 (1.44M Disk 9)</disk>
+		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK01.json">IBM OS/2 1.3 (1.44M Disk 01)</disk>
+		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK02.json">IBM OS/2 1.3 (1.44M Disk 02)</disk>
+		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK03.json">IBM OS/2 1.3 (1.44M Disk 03)</disk>
+		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK04.json">IBM OS/2 1.3 (1.44M Disk 04)</disk>
+		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK05.json">IBM OS/2 1.3 (1.44M Disk 05)</disk>
+		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK06.json">IBM OS/2 1.3 (1.44M Disk 06)</disk>
+		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK07.json">IBM OS/2 1.3 (1.44M Disk 07)</disk>
+		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK08.json">IBM OS/2 1.3 (1.44M Disk 08)</disk>
+		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK09.json">IBM OS/2 1.3 (1.44M Disk 09)</disk>
 		<disk path="/disks/pcx86/os2/ibm/1.3/OS213-DISK10.json">IBM OS/2 1.3 (1.44M Disk 10)</disk>
 		<disk path="/disks/pcx86/os2/microsoft/1.0/MSOS210-INSTALL.json">MS OS/2 1.0 (1.2M Install)</disk>
 		<disk path="/disks/pcx86/os2/microsoft/1.0/MSOS210-PROGRAM.json">MS OS/2 1.0 (1.2M Program)</disk>
@@ -246,29 +246,29 @@
 		<disk path="/disks/pcx86/windows/3.11/WFW311_DISK6.json">Windows 3.11 (Disk 6)</disk>
 		<disk path="/disks/pcx86/windows/3.11/WFW311_DISK7.json">Windows 3.11 (Disk 7)</disk>
 		<disk path="/disks/pcx86/windows/3.11/WFW311_DISK8.json">Windows 3.11 (Disk 8)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK01.json">Windows 95 (Build 499 Disk 1)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK02.json">Windows 95 (Build 499 Disk 2)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK03.json">Windows 95 (Build 499 Disk 3)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK04.json">Windows 95 (Build 499 Disk 4)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK05.json">Windows 95 (Build 499 Disk 5)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK06.json">Windows 95 (Build 499 Disk 6)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK07.json">Windows 95 (Build 499 Disk 7)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK08.json">Windows 95 (Build 499 Disk 8)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK09.json">Windows 95 (Build 499 Disk 9)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK01.json">Windows 95 (Build 499 Disk 01)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK02.json">Windows 95 (Build 499 Disk 02)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK03.json">Windows 95 (Build 499 Disk 03)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK04.json">Windows 95 (Build 499 Disk 04)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK05.json">Windows 95 (Build 499 Disk 05)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK06.json">Windows 95 (Build 499 Disk 06)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK07.json">Windows 95 (Build 499 Disk 07)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK08.json">Windows 95 (Build 499 Disk 08)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK09.json">Windows 95 (Build 499 Disk 09)</disk>
 		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK10.json">Windows 95 (Build 499 Disk 10)</disk>
 		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK11.json">Windows 95 (Build 499 Disk 11)</disk>
 		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK12.json">Windows 95 (Build 499 Disk 12)</disk>
 		<disk path="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK13.json">Windows 95 (Build 499 Disk 13)</disk>
 		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-BOOT.json">Windows 95 (Boot)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK01.json">Windows 95 (Disk 1)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK02.json">Windows 95 (Disk 2)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK03.json">Windows 95 (Disk 3)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK04.json">Windows 95 (Disk 4)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK05.json">Windows 95 (Disk 5)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK06.json">Windows 95 (Disk 6)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK07.json">Windows 95 (Disk 7)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK08.json">Windows 95 (Disk 8)</disk>
-		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK09.json">Windows 95 (Disk 9)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK01.json">Windows 95 (Disk 01)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK02.json">Windows 95 (Disk 02)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK03.json">Windows 95 (Disk 03)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK04.json">Windows 95 (Disk 04)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK05.json">Windows 95 (Disk 05)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK06.json">Windows 95 (Disk 06)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK07.json">Windows 95 (Disk 07)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK08.json">Windows 95 (Disk 08)</disk>
+		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK09.json">Windows 95 (Disk 09)</disk>
 		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK10.json">Windows 95 (Disk 10)</disk>
 		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK11.json">Windows 95 (Disk 11)</disk>
 		<disk path="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK12.json">Windows 95 (Disk 12)</disk>
@@ -387,10 +387,10 @@
 		<disk path="/disks/pcx86/tools/borland/pascal/3.01a/TURBO-PASCAL-301A.json">Borland Turbo Pascal 3.01A</disk>
 		<disk path="/disks/pcx86/tools/ibm/bascom/1.00/BASCOM100-DISK1.json">IBM BASIC Compiler 1.00 (Disk 1)</disk>
 		<disk path="/disks/pcx86/tools/ibm/bascom/1.00/BASCOM100-DISK2.json">IBM BASIC Compiler 1.00 (Disk 2)</disk>
-		<disk path="/disks/pcx86/tools/logitech/modula2/1.10/LOGITECH-MODULA2-DISK1-SYSTEM.json">Modula-2/86 1.10 System (Disk 1)</disk>
-		<disk path="/disks/pcx86/tools/logitech/modula2/1.10/LOGITECH-MODULA2-DISK2-COMPILER.json">Modula-2/86 1.10 Compiler (Disk 2)</disk>
-		<disk path="/disks/pcx86/tools/logitech/modula2/1.10/LOGITECH-MODULA2-DISK3-LINKER.json">Modula-2/86 1.10 Linker (Disk 3)</disk>
-		<disk path="/disks/pcx86/tools/logitech/modula2/1.10/LOGITECH-MODULA2-DISK4-DEBUGGER.json">Modula-2/86 1.10 Debugger (Disk 4)</disk>
+		<disk path="/disks/pcx86/tools/logitech/modula2/1.10/LOGITECH-MODULA2-DISK1-SYSTEM.json">Modula-2/86 1.10 (Disk 1 System)</disk>
+		<disk path="/disks/pcx86/tools/logitech/modula2/1.10/LOGITECH-MODULA2-DISK2-COMPILER.json">Modula-2/86 1.10 (Disk 2 Compiler)</disk>
+		<disk path="/disks/pcx86/tools/logitech/modula2/1.10/LOGITECH-MODULA2-DISK3-LINKER.json">Modula-2/86 1.10 (Disk 3 Linker)</disk>
+		<disk path="/disks/pcx86/tools/logitech/modula2/1.10/LOGITECH-MODULA2-DISK4-DEBUGGER.json">Modula-2/86 1.10 (Disk 4 Debugger)</disk>
 		<disk path="/disks/pcx86/tools/microsoft/basic/BASCOM536.json">MS BASIC (Compiler v5.36)</disk>
 		<disk path="/disks/pcx86/tools/microsoft/basic/QUICKBASIC-DISK1.json">MS BASIC (QuickBASIC v2.0)</disk>
 		<disk path="/disks/pcx86/tools/microsoft/c/2.03/MSC203-INSTALLED.json">MS C 2.03 (Installed)</disk>
@@ -499,15 +499,15 @@
 		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/2.03/WINSDK203-DISK1-DEV.json">Windows SDK 2.03 (1200K Disk 1)</disk>
 		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/2.03/WINSDK203-DISK2-UTILS.json">Windows SDK 2.03 (1200K Disk 2)</disk>
 		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/2.03/WINSDK203-DISK3-SAMPLES.json">Windows SDK 2.03 (1200K Disk 3)</disk>
-		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK01.json">Windows SDK 3.00 (720K Disk 1)</disk>
-		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK02.json">Windows SDK 3.00 (720K Disk 2)</disk>
-		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK03.json">Windows SDK 3.00 (720K Disk 3)</disk>
-		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK04.json">Windows SDK 3.00 (720K Disk 4)</disk>
-		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK05.json">Windows SDK 3.00 (720K Disk 5)</disk>
-		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK06.json">Windows SDK 3.00 (720K Disk 6)</disk>
-		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK07.json">Windows SDK 3.00 (720K Disk 7)</disk>
-		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK08.json">Windows SDK 3.00 (720K Disk 8)</disk>
-		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK09.json">Windows SDK 3.00 (720K Disk 9)</disk>
+		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK01.json">Windows SDK 3.00 (720K Disk 01)</disk>
+		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK02.json">Windows SDK 3.00 (720K Disk 02)</disk>
+		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK03.json">Windows SDK 3.00 (720K Disk 03)</disk>
+		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK04.json">Windows SDK 3.00 (720K Disk 04)</disk>
+		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK05.json">Windows SDK 3.00 (720K Disk 05)</disk>
+		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK06.json">Windows SDK 3.00 (720K Disk 06)</disk>
+		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK07.json">Windows SDK 3.00 (720K Disk 07)</disk>
+		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK08.json">Windows SDK 3.00 (720K Disk 08)</disk>
+		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK09.json">Windows SDK 3.00 (720K Disk 09)</disk>
 		<disk path="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK10.json">Windows SDK 3.00 (720K Disk 10)</disk>
 		<disk path="/disks/pcx86/tools/misc/enhdebug/ENHDEBUG.json">Enhanced DEBUG 1.32a</disk>
 		<disk path="/disks/pcx86/games/id/wolf3d/1WOLF14.json">Wolfenstein 3D 1.4</disk>
diff --git a/disks/pcx86/dos/ibm/3.30/manifest.xml b/disks/pcx86/dos/ibm/3.30/manifest.xml
index aacd5348c..e7ebeb7c4 100644
--- a/disks/pcx86/dos/ibm/3.30/manifest.xml
+++ b/disks/pcx86/dos/ibm/3.30/manifest.xml
@@ -14,6 +14,6 @@
 		<name>PC-DOS 3.30 (Disk 2)</name>
 	</disk>
 	<disk id="disk03" size="737280" chs="80:2:9" img="archive/PCDOS330-DISK1-720K.img" href="/disks/pcx86/dos/ibm/3.30/PCDOS330-DISK1-720K.json" md5="497c26a4a8316806902f3a51a6ceb2be" md5json="0995b031d5b9e1bf5bf82fb9540440e1">
-		<name>PC-DOS 3.30 (720K Disk)</name>
+		<name>PC-DOS 3.30 (720K)</name>
 	</disk>
 </manifest>
diff --git a/disks/pcx86/os2/ibm/1.3/manifest.xml b/disks/pcx86/os2/ibm/1.3/manifest.xml
index 875b3d81d..6d183215d 100644
--- a/disks/pcx86/os2/ibm/1.3/manifest.xml
+++ b/disks/pcx86/os2/ibm/1.3/manifest.xml
@@ -3,31 +3,31 @@
 <manifest type="software">
 	<title>IBM OS/2 1.3</title>
 	<disk id="disk01" size="1474560" chs="80:2:18" img="archive/OS213-DISK01.img" href="/disks/pcx86/os2/ibm/1.3/OS213-DISK01.json" md5="b393291dc9d96255b7ea9d9d614ecf23" md5json="a3af9c440d774c4084862a4caa5e17e2">
-		<name>IBM OS/2 1.3 (1.44M Disk 1)</name>
+		<name>IBM OS/2 1.3 (1.44M Disk 01)</name>
 	</disk>
 	<disk id="disk02" size="1474560" chs="80:2:18" img="archive/OS213-DISK02.img" href="/disks/pcx86/os2/ibm/1.3/OS213-DISK02.json" md5="6b3bf3f03c914c9718a9fe603a4a62b2" md5json="65322381b4ffbd62266c28c2ec0c027f">
-		<name>IBM OS/2 1.3 (1.44M Disk 2)</name>
+		<name>IBM OS/2 1.3 (1.44M Disk 02)</name>
 	</disk>
 	<disk id="disk03" size="1474560" chs="80:2:18" img="archive/OS213-DISK03.img" href="/disks/pcx86/os2/ibm/1.3/OS213-DISK03.json" md5="207c6196d09dc1ef11a16e34e731c7d9" md5json="dea620df5b4f6a41deec101bd6dc3ef8">
-		<name>IBM OS/2 1.3 (1.44M Disk 3)</name>
+		<name>IBM OS/2 1.3 (1.44M Disk 03)</name>
 	</disk>
 	<disk id="disk04" size="1474560" chs="80:2:18" img="archive/OS213-DISK04.img" href="/disks/pcx86/os2/ibm/1.3/OS213-DISK04.json" md5="8175fa3257fc60b3b281fbf25b50adcc" md5json="5d7aaf6609dd58b614554b5f26600a2b">
-		<name>IBM OS/2 1.3 (1.44M Disk 4)</name>
+		<name>IBM OS/2 1.3 (1.44M Disk 04)</name>
 	</disk>
 	<disk id="disk05" size="1474560" chs="80:2:18" img="archive/OS213-DISK05.img" href="/disks/pcx86/os2/ibm/1.3/OS213-DISK05.json" md5="8175fa3257fc60b3b281fbf25b50adcc" md5json="5d7aaf6609dd58b614554b5f26600a2b">
-		<name>IBM OS/2 1.3 (1.44M Disk 5)</name>
+		<name>IBM OS/2 1.3 (1.44M Disk 05)</name>
 	</disk>
 	<disk id="disk06" size="1474560" chs="80:2:18" img="archive/OS213-DISK06.img" href="/disks/pcx86/os2/ibm/1.3/OS213-DISK06.json" md5="3f61008d56453a40c4444a397260b39c" md5json="a25d13bd6beacb002acfd4b6cacdbea3">
-		<name>IBM OS/2 1.3 (1.44M Disk 6)</name>
+		<name>IBM OS/2 1.3 (1.44M Disk 06)</name>
 	</disk>
 	<disk id="disk07" size="1474560" chs="80:2:18" img="archive/OS213-DISK07.img" href="/disks/pcx86/os2/ibm/1.3/OS213-DISK07.json" md5="0de3327c227f1fe00e211b558ea2e23a" md5json="d33aaa2d626b5f3c42b354a21d4bfe67">
-		<name>IBM OS/2 1.3 (1.44M Disk 7)</name>
+		<name>IBM OS/2 1.3 (1.44M Disk 07)</name>
 	</disk>
 	<disk id="disk08" size="1474560" chs="80:2:18" img="archive/OS213-DISK08.img" href="/disks/pcx86/os2/ibm/1.3/OS213-DISK08.json" md5="821a6873437610f77167e8884c4bd977" md5json="93bb507a019409004716c48f5c002a5d">
-		<name>IBM OS/2 1.3 (1.44M Disk 8)</name>
+		<name>IBM OS/2 1.3 (1.44M Disk 08)</name>
 	</disk>
 	<disk id="disk09" size="1474560" chs="80:2:18" img="archive/OS213-DISK09.img" href="/disks/pcx86/os2/ibm/1.3/OS213-DISK09.json" md5="fce2113a6d1a286afa1653bdc77214e0" md5json="3282cd0642a19f97a1c8758f3a4debdc">
-		<name>IBM OS/2 1.3 (1.44M Disk 9)</name>
+		<name>IBM OS/2 1.3 (1.44M Disk 09)</name>
 	</disk>
 	<disk id="disk10" size="1474560" chs="80:2:18" img="archive/OS213-DISK10.img" href="/disks/pcx86/os2/ibm/1.3/OS213-DISK10.json" md5="58e1156eba5600bc600d17be93f5e8e0" md5json="e8567c55839410508911dc96b260ee57">
 		<name>IBM OS/2 1.3 (1.44M Disk 10)</name>
diff --git a/disks/pcx86/tools/logitech/modula2/1.10/manifest.xml b/disks/pcx86/tools/logitech/modula2/1.10/manifest.xml
index 413abcf5c..c8447ac0b 100644
--- a/disks/pcx86/tools/logitech/modula2/1.10/manifest.xml
+++ b/disks/pcx86/tools/logitech/modula2/1.10/manifest.xml
@@ -8,15 +8,15 @@
 	<author>Logitech</author>
 	<releaseDate>December 10, 1984</releaseDate>
 	<disk id="disk01" size="368640" chs="40:2:9" img="archive/LOGITECH-MODULA2-DISK1-SYSTEM.img" href="/disks/pcx86/tools/logitech/modula2/1.10/LOGITECH-MODULA2-DISK1-SYSTEM.json" md5="53bd4195a261c73e82681d2e2a23dc8a" md5json="6f3e72ec1e951398eafcdd4e28ff89d7">
-		<name>Modula-2/86 1.10 System (Disk 1)</name>
+		<name>Modula-2/86 1.10 (Disk 1 System)</name>
 	</disk>
 	<disk id="disk02" size="368640" chs="40:2:9" img="archive/LOGITECH-MODULA2-DISK2-COMPILER.img" href="/disks/pcx86/tools/logitech/modula2/1.10/LOGITECH-MODULA2-DISK2-COMPILER.json" md5="24988fcfa378ca8bb0e57cf39ed2f134" md5json="e7386c5d85a857e88bac20ab5e5baa2b">
-		<name>Modula-2/86 1.10 Compiler (Disk 2)</name>
+		<name>Modula-2/86 1.10 (Disk 2 Compiler)</name>
 	</disk>
 	<disk id="disk03" size="368640" chs="40:2:9" img="archive/LOGITECH-MODULA2-DISK3-LINKER.img" href="/disks/pcx86/tools/logitech/modula2/1.10/LOGITECH-MODULA2-DISK3-LINKER.json" md5="08b42645e093196448b4a0b54f08092a" md5json="adbfe6d1707091df5c37740a2d730be0">
-		<name>Modula-2/86 1.10 Linker (Disk 3)</name>
+		<name>Modula-2/86 1.10 (Disk 3 Linker)</name>
 	</disk>
 	<disk id="disk04" size="368640" chs="40:2:9" img="archive/LOGITECH-MODULA2-DISK4-DEBUGGER.img" href="/disks/pcx86/tools/logitech/modula2/1.10/LOGITECH-MODULA2-DISK4-DEBUGGER.json" md5="ece369d133dc9060d9708a2392edd1f9" md5json="417d650ebfca3cd758ad32a99a7b950c">
-		<name>Modula-2/86 1.10 Debugger (Disk 4)</name>
+		<name>Modula-2/86 1.10 (Disk 4 Debugger)</name>
 	</disk>
 </manifest>
diff --git a/disks/pcx86/tools/microsoft/windows/sdk/3.00/manifest.xml b/disks/pcx86/tools/microsoft/windows/sdk/3.00/manifest.xml
index a51031a9f..708494ea4 100644
--- a/disks/pcx86/tools/microsoft/windows/sdk/3.00/manifest.xml
+++ b/disks/pcx86/tools/microsoft/windows/sdk/3.00/manifest.xml
@@ -3,39 +3,39 @@
 <manifest type="software">
 	<title>Windows SDK 3.00</title>
 	<disk id="disk01" size="737280" chs="80:2:9" img="archive/WIN30SDK_DISK01.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK01.json" md5="3eb1f6df549dd454b65fb869a606e010" md5json="6a85939ac71c91d76b9fe39407464de2">
-		<name>Windows SDK 3.00 (720K Disk 1)</name>
+		<name>Windows SDK 3.00 (720K Disk 01)</name>
 		<desc>Development Tools 1 (For DOS Systems) Version 3.0</desc>
 	</disk>
 	<disk id="disk02" size="737280" chs="80:2:9" img="archive/WIN30SDK_DISK02.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK02.json" md5="022e5517696403d7b3186bc7820178ad" md5json="f7ae92fbc95bfe2ac2e636b5bb0ce560">
-		<name>Windows SDK 3.00 (720K Disk 2)</name>
+		<name>Windows SDK 3.00 (720K Disk 02)</name>
 		<desc>Development Tools 2/Debug Tools 1</desc>
 	</disk>
 	<disk id="disk03" size="737280" chs="80:2:9" img="archive/WIN30SDK_DISK03.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK03.json" md5="3eb2998642caf9130ec3892bdc3d4352" md5json="86b2cd50f0d3c667b98121280685a846">
-		<name>Windows SDK 3.00 (720K Disk 3)</name>
+		<name>Windows SDK 3.00 (720K Disk 03)</name>
 		<desc>Debug Tools 2/Debug Files 1</desc>
 	</disk>
 	<disk id="disk04" size="737280" chs="80:2:9" img="archive/WIN30SDK_DISK04.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK04.json" md5="c78b913d3efb2a5c5772b4fba9887b4b" md5json="9a4387825e90e44a91a06cf78eb8363a">
-		<name>Windows SDK 3.00 (720K Disk 4)</name>
+		<name>Windows SDK 3.00 (720K Disk 04)</name>
 		<desc>Debug Files 2</desc>
 	</disk>
 	<disk id="disk05" size="737280" chs="80:2:9" img="archive/WIN30SDK_DISK05.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK05.json" md5="d517a1a44a430c8810ed2288df4ba632" md5json="a2fdbe2095c9d5ba231d20e390a1430c">
-		<name>Windows SDK 3.00 (720K Disk 5)</name>
+		<name>Windows SDK 3.00 (720K Disk 05)</name>
 		<desc>Link Libraries 1</desc>
 	</disk>
 	<disk id="disk06" size="737280" chs="80:2:9" img="archive/WIN30SDK_DISK06.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK06.json" md5="8b87da4b4a7fe1a622c76674f31c040a" md5json="effb20a06c0ab1430e75d2dd4926a34f">
-		<name>Windows SDK 3.00 (720K Disk 6)</name>
+		<name>Windows SDK 3.00 (720K Disk 06)</name>
 		<desc>Link Libraries 2</desc>
 	</disk>
 	<disk id="disk07" size="737280" chs="80:2:9" img="archive/WIN30SDK_DISK07.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK07.json" md5="74f81df9020939a4b3e37608515112e0" md5json="79bcb8864e7dfc7abb4f216534a782fc">
-		<name>Windows SDK 3.00 (720K Disk 7)</name>
+		<name>Windows SDK 3.00 (720K Disk 07)</name>
 		<desc>Include Files/Sample Source Code 1</desc>
 	</disk>
 	<disk id="disk08" size="737280" chs="80:2:9" img="archive/WIN30SDK_DISK08.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK08.json" md5="77d391c5e2462e446ad6780cf86a7b82" md5json="c89d7af1e40471dbfe6b795869696bd2">
-		<name>Windows SDK 3.00 (720K Disk 8)</name>
+		<name>Windows SDK 3.00 (720K Disk 08)</name>
 		<desc>Sample Source Code 2</desc>
 	</disk>
 	<disk id="disk09" size="737280" chs="80:2:9" img="archive/WIN30SDK_DISK09.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK09.json" md5="945af52c2a962ea4b6c7b3a5487975be" md5json="89012754bdbb154d73050ff320828803">
-		<name>Windows SDK 3.00 (720K Disk 9)</name>
+		<name>Windows SDK 3.00 (720K Disk 09)</name>
 		<desc>Online Reference (Advisor Format)</desc>
 	</disk>
 	<disk id="disk10" size="737280" chs="80:2:9" img="archive/WIN30SDK_DISK10.img" href="/disks/pcx86/tools/microsoft/windows/sdk/3.00/WIN30SDK_DISK10.json" md5="3782fc9ba62e8c438bc51177403ec5f4" md5json="5e77eed658cc6032d0d01377d280921c">
diff --git a/disks/pcx86/windows/win95/4.00.499/manifest.xml b/disks/pcx86/windows/win95/4.00.499/manifest.xml
index 31d62aa49..ccaba48b8 100644
--- a/disks/pcx86/windows/win95/4.00.499/manifest.xml
+++ b/disks/pcx86/windows/win95/4.00.499/manifest.xml
@@ -3,31 +3,31 @@
 <manifest type="software">
 	<title>Windows 95 (Build 499)</title>
 	<disk id="disk01" size="1474560" chs="80:2:18" img="archive/WIN95-DISK01.img" href="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK01.json" md5="732d1cb011be22d1beda31f4dcd8ea56" md5json="6fa3bc43a08502be56bcf765c2470c35">
-		<name>Windows 95 (Build 499 Disk 1)</name>
+		<name>Windows 95 (Build 499 Disk 01)</name>
 	</disk>
 	<disk id="disk02" size="1720320" chs="80:2:21" img="archive/WIN95-DISK02.img" href="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK02.json" md5="3c4ff0741307c736fd956447b82db041" md5json="5688fde3e3f978e4d31127b118383f79">
-		<name>Windows 95 (Build 499 Disk 2)</name>
+		<name>Windows 95 (Build 499 Disk 02)</name>
 	</disk>
 	<disk id="disk03" size="1720320" chs="80:2:21" img="archive/WIN95-DISK03.img" href="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK03.json" md5="7c635a4d309ecc182db99dd3e6642bac" md5json="939be24d14aff97578200c8429ca4a05">
-		<name>Windows 95 (Build 499 Disk 3)</name>
+		<name>Windows 95 (Build 499 Disk 03)</name>
 	</disk>
 	<disk id="disk04" size="1720320" chs="80:2:21" img="archive/WIN95-DISK04.img" href="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK04.json" md5="59e781f887857883108d3e0a4ea338bc" md5json="4f62253c0731ac0d87d6cdbdc218a921">
-		<name>Windows 95 (Build 499 Disk 4)</name>
+		<name>Windows 95 (Build 499 Disk 04)</name>
 	</disk>
 	<disk id="disk05" size="1720320" chs="80:2:21" img="archive/WIN95-DISK05.img" href="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK05.json" md5="4866930efb5198e6e9c9ea6958989547" md5json="e9b2b53575ee7ca1546be36f9c36d143">
-		<name>Windows 95 (Build 499 Disk 5)</name>
+		<name>Windows 95 (Build 499 Disk 05)</name>
 	</disk>
 	<disk id="disk06" size="1720320" chs="80:2:21" img="archive/WIN95-DISK06.img" href="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK06.json" md5="99d60c50db21206908d569db0d859f5d" md5json="48aa2717c9cbcc46639cef839eed5378">
-		<name>Windows 95 (Build 499 Disk 6)</name>
+		<name>Windows 95 (Build 499 Disk 06)</name>
 	</disk>
 	<disk id="disk07" size="1720320" chs="80:2:21" img="archive/WIN95-DISK07.img" href="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK07.json" md5="c4eb6a910b5310427e3099c079c62261" md5json="75f2d3b963e81c1b37c725f350971562">
-		<name>Windows 95 (Build 499 Disk 7)</name>
+		<name>Windows 95 (Build 499 Disk 07)</name>
 	</disk>
 	<disk id="disk08" size="1720320" chs="80:2:21" img="archive/WIN95-DISK08.img" href="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK08.json" md5="d6ba0299f3f02851ac2cc44ed54dbcc3" md5json="2b89cfd0f05934bdc4cca15064f0d7d4">
-		<name>Windows 95 (Build 499 Disk 8)</name>
+		<name>Windows 95 (Build 499 Disk 08)</name>
 	</disk>
 	<disk id="disk09" size="1720320" chs="80:2:21" img="archive/WIN95-DISK09.img" href="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK09.json" md5="308387d3c51e837fd7869a7b0b44a3cb" md5json="4a86ce9737eb664450c351fb274f940c">
-		<name>Windows 95 (Build 499 Disk 9)</name>
+		<name>Windows 95 (Build 499 Disk 09)</name>
 	</disk>
 	<disk id="disk10" size="1720320" chs="80:2:21" img="archive/WIN95-DISK10.img" href="/disks/pcx86/windows/win95/4.00.499/WIN95-DISK10.json" md5="1cc5e299dfb83dd555227ad9546393fe" md5json="dbee2d4261d25c235f01278fded36a0b">
 		<name>Windows 95 (Build 499 Disk 10)</name>
diff --git a/disks/pcx86/windows/win95/4.00.950/manifest.xml b/disks/pcx86/windows/win95/4.00.950/manifest.xml
index a5cc22a8a..87a101b50 100644
--- a/disks/pcx86/windows/win95/4.00.950/manifest.xml
+++ b/disks/pcx86/windows/win95/4.00.950/manifest.xml
@@ -11,31 +11,31 @@
 		<name>Windows 95 (Boot)</name>
 	</disk>
 	<disk id="disk01" size="1474560" chs="80:2:18" img="archive/WIN95-DISK01.img" href="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK01.json" md5="fd17fcf71afc246afbdf7b95ef1952ca" md5json="e1960eb29c99ebc5fb706d81b3510fca">
-		<name>Windows 95 (Disk 1)</name>
+		<name>Windows 95 (Disk 01)</name>
 	</disk>
 	<disk id="disk02" size="1720320" chs="80:2:21" img="archive/WIN95-DISK02.img" href="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK02.json" md5="5157c8e1859abd72bf79b1177da83831" md5json="49154d57bd7ed3f9db49e83314732521">
-		<name>Windows 95 (Disk 2)</name>
+		<name>Windows 95 (Disk 02)</name>
 	</disk>
 	<disk id="disk03" size="1720320" chs="80:2:21" img="archive/WIN95-DISK03.img" href="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK03.json" md5="c2a49d114e118ff0daa3e196c9da3968" md5json="24b72db4c4bd1b90744f6b4d43097ea2">
-		<name>Windows 95 (Disk 3)</name>
+		<name>Windows 95 (Disk 03)</name>
 	</disk>
 	<disk id="disk04" size="1720320" chs="80:2:21" img="archive/WIN95-DISK04.img" href="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK04.json" md5="1129e79622d038fd7aea4fff483d284b" md5json="48ab9a2f12c7a388b4f14445245b2f46">
-		<name>Windows 95 (Disk 4)</name>
+		<name>Windows 95 (Disk 04)</name>
 	</disk>
 	<disk id="disk05" size="1720320" chs="80:2:21" img="archive/WIN95-DISK05.img" href="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK05.json" md5="dcebc4e3a30ea48de3ac2a7599677383" md5json="95099bb2c07076e3225f5f124d528486">
-		<name>Windows 95 (Disk 5)</name>
+		<name>Windows 95 (Disk 05)</name>
 	</disk>
 	<disk id="disk06" size="1720320" chs="80:2:21" img="archive/WIN95-DISK06.img" href="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK06.json" md5="fe7a56694b9a5f58188e1b4eabe6f0c0" md5json="5f1f3477680bf2700973f4ba2e0616ce">
-		<name>Windows 95 (Disk 6)</name>
+		<name>Windows 95 (Disk 06)</name>
 	</disk>
 	<disk id="disk07" size="1720320" chs="80:2:21" img="archive/WIN95-DISK07.img" href="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK07.json" md5="54711b87d067a2181136f12c6df00e97" md5json="041a7419b80db60742b22429af7e9d5b">
-		<name>Windows 95 (Disk 7)</name>
+		<name>Windows 95 (Disk 07)</name>
 	</disk>
 	<disk id="disk08" size="1720320" chs="80:2:21" img="archive/WIN95-DISK08.img" href="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK08.json" md5="87c79d75131162e5e77daf0978e8c8c5" md5json="397f30c00ce17a180a49af8b45872ed3">
-		<name>Windows 95 (Disk 8)</name>
+		<name>Windows 95 (Disk 08)</name>
 	</disk>
 	<disk id="disk09" size="1720320" chs="80:2:21" img="archive/WIN95-DISK09.img" href="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK09.json" md5="3dae8277921b8847648b7aec249809ef" md5json="21f16a83e98bd9277866c3f46b101235">
-		<name>Windows 95 (Disk 9)</name>
+		<name>Windows 95 (Disk 09)</name>
 	</disk>
 	<disk id="disk10" size="1720320" chs="80:2:21" img="archive/WIN95-DISK10.img" href="/disks/pcx86/windows/win95/4.00.950/WIN95-DISK10.json" md5="bb8f2d758a827adce0dcd02fb786fd46" md5json="cdf052957fd841a06813ad97712a7e7e">
 		<name>Windows 95 (Disk 10)</name>