diff --git a/hash/ibm5170.xml b/hash/ibm5170.xml
index 914f3fd78da..44012f80418 100644
--- a/hash/ibm5170.xml
+++ b/hash/ibm5170.xml
@@ -695,61 +695,61 @@ license:CC0
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Installer"/>
 			<dataarea name="flop" size="1228800">
-				<rom name="x86BOOT.img" size="1228800" crc="9f37531a" sha1="b7e6864befbcff2c431a5ea0ab5dc6078582dba4"/>
+				<rom name="x86BOOT_120.img" size="1228800" crc="9f37531a" sha1="b7e6864befbcff2c431a5ea0ab5dc6078582dba4"/>
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
 			<dataarea name="flop" size="1228800">
-				<rom name="x86DSK01.img" size="1228800" crc="b3345585" sha1="6e47f0bf4339a83efdddd698a2578eef5a429943"/>
+				<rom name="x86DSK01_120.img" size="1228800" crc="b3345585" sha1="6e47f0bf4339a83efdddd698a2578eef5a429943"/>
 			</dataarea>
 		</part>
 		<part name="flop3" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 2"/>
 			<dataarea name="flop" size="1228800">
-				<rom name="x86DSK02.img" size="1228800" crc="133dea45" sha1="3a5a15304ec83ee36a47ca6008ec6111086a771f"/>
+				<rom name="x86DSK02_120.img" size="1228800" crc="133dea45" sha1="3a5a15304ec83ee36a47ca6008ec6111086a771f"/>
 			</dataarea>
 		</part>
 		<part name="flop4" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 3"/>
 			<dataarea name="flop" size="1228800">
-				<rom name="x86DSK03.img" size="1228800" crc="9b3cf022" sha1="30fcffe0ec0307102ba4b4931b1a90aacd3f956f"/>
+				<rom name="x86DSK03_120.img" size="1228800" crc="9b3cf022" sha1="30fcffe0ec0307102ba4b4931b1a90aacd3f956f"/>
 			</dataarea>
 		</part>
 		<part name="flop5" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 4"/>
 			<dataarea name="flop" size="1228800">
-				<rom name="x86DSK04.img" size="1228800" crc="139f3f88" sha1="d66de4753d85b6bedbb8e713fc35e3ba631d4ea5"/>
+				<rom name="x86DSK04_120.img" size="1228800" crc="139f3f88" sha1="d66de4753d85b6bedbb8e713fc35e3ba631d4ea5"/>
 			</dataarea>
 		</part>
 		<part name="flop6" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 5"/>
 			<dataarea name="flop" size="1228800">
-				<rom name="x86DSK05.img" size="1228800" crc="edc2f2fb" sha1="7f066b2bf098df7b367cbaed718559a1956d79e1"/>
+				<rom name="x86DSK05_120.img" size="1228800" crc="edc2f2fb" sha1="7f066b2bf098df7b367cbaed718559a1956d79e1"/>
 			</dataarea>
 		</part>
 		<part name="flop7" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 6"/>
 			<dataarea name="flop" size="1228800">
-				<rom name="x86DSK06.img" size="1228800" crc="22b6d765" sha1="161a89842efd5b513a66efa8408b68c94d824dc3"/>
+				<rom name="x86DSK06_120.img" size="1228800" crc="22b6d765" sha1="161a89842efd5b513a66efa8408b68c94d824dc3"/>
 			</dataarea>
 		</part>
 		<part name="flop8" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 7"/>
 			<dataarea name="flop" size="1228800">
-				<rom name="x86DSK07.img" size="1228800" crc="76e6cb54" sha1="2f10e13eb87fbcc919ecae58f3f4de5c5423560d"/>
+				<rom name="x86DSK07_120.img" size="1228800" crc="76e6cb54" sha1="2f10e13eb87fbcc919ecae58f3f4de5c5423560d"/>
 			</dataarea>
 		</part>
 		<part name="flop9" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 8"/>
 			<dataarea name="flop" size="1228800">
-				<rom name="x86DSK08.img" size="1228800" crc="1f40035c" sha1="2f77a9ce2327661bd2382754ee14c336cb0a090c"/>
+				<rom name="x86DSK08_120.img" size="1228800" crc="1f40035c" sha1="2f77a9ce2327661bd2382754ee14c336cb0a090c"/>
 			</dataarea>
 		</part>
 		<part name="flop10" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 9"/>
 			<dataarea name="flop" size="1228800">
-				<rom name="x86DSK09.img" size="1228800" crc="8fca3748" sha1="191fa86c65107602f033cb3678abc4ba330b926f"/>
+				<rom name="x86DSK09_120.img" size="1228800" crc="8fca3748" sha1="191fa86c65107602f033cb3678abc4ba330b926f"/>
 			</dataarea>
 		</part>
 	</software>
@@ -762,49 +762,49 @@ license:CC0
 		<part name="flop1" interface="floppy_3_5">
 			<feature name="part_id" value="Installer"/>
 			<dataarea name="flop" size="1474560">
-				<rom name="x86BOOT.img" size="1474560" crc="54c36ad6" sha1="01965a591db9f23ac6e5f65a265f6d0f54283617"/>
+				<rom name="x86BOOT_144.img" size="1474560" crc="54c36ad6" sha1="01965a591db9f23ac6e5f65a265f6d0f54283617"/>
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_3_5">
 			<feature name="part_id" value="Disk 1"/>
 			<dataarea name="flop" size="1474560">
-				<rom name="x86DSK01.img" size="1474560" crc="5e215709" sha1="7c352c6ce1701001c8c77a9344734f25dc5c4b4d"/>
+				<rom name="x86DSK01_144.img" size="1474560" crc="5e215709" sha1="7c352c6ce1701001c8c77a9344734f25dc5c4b4d"/>
 			</dataarea>
 		</part>
 		<part name="flop3" interface="floppy_3_5">
 			<feature name="part_id" value="Disk 2"/>
 			<dataarea name="flop" size="1474560">
-				<rom name="x86DSK02.img" size="1474560" crc="0bfc28be" sha1="6d6d838014c79727e067713d11dbb28a0a61bf79"/>
+				<rom name="x86DSK02_144.img" size="1474560" crc="0bfc28be" sha1="6d6d838014c79727e067713d11dbb28a0a61bf79"/>
 			</dataarea>
 		</part>
 		<part name="flop4" interface="floppy_3_5">
 			<feature name="part_id" value="Disk 3"/>
 			<dataarea name="flop" size="1474560">
-				<rom name="x86DSK03.img" size="1474560" crc="7ebae211" sha1="a2c2f4e36d08ecad6e52b9966654ada53737324a"/>
+				<rom name="x86DSK03_144.img" size="1474560" crc="7ebae211" sha1="a2c2f4e36d08ecad6e52b9966654ada53737324a"/>
 			</dataarea>
 		</part>
 		<part name="flop5" interface="floppy_3_5">
 			<feature name="part_id" value="Disk 4"/>
 			<dataarea name="flop" size="1474560">
-				<rom name="x86DSK04.img" size="1474560" crc="737c3b1c" sha1="0a3dc842584b4ba72d2e17e98f48f55aa1f6716e"/>
+				<rom name="x86DSK04_144.img" size="1474560" crc="737c3b1c" sha1="0a3dc842584b4ba72d2e17e98f48f55aa1f6716e"/>
 			</dataarea>
 		</part>
 		<part name="flop6" interface="floppy_3_5">
 			<feature name="part_id" value="Disk 5"/>
 			<dataarea name="flop" size="1474560">
-				<rom name="x86DSK05.img" size="1474560" crc="ab83a0ac" sha1="2e53e28cd8f631881ad3f780d3104c4cb2d17d84"/>
+				<rom name="x86DSK05_144.img" size="1474560" crc="ab83a0ac" sha1="2e53e28cd8f631881ad3f780d3104c4cb2d17d84"/>
 			</dataarea>
 		</part>
 		<part name="flop7" interface="floppy_3_5">
 			<feature name="part_id" value="Disk 6"/>
 			<dataarea name="flop" size="1474560">
-				<rom name="x86DSK06.img" size="1474560" crc="eb7bbfcf" sha1="ad30e015e1c487b9dc437b5b3d50f1c1730d6fd6"/>
+				<rom name="x86DSK06_144.img" size="1474560" crc="eb7bbfcf" sha1="ad30e015e1c487b9dc437b5b3d50f1c1730d6fd6"/>
 			</dataarea>
 		</part>
 		<part name="flop8" interface="floppy_3_5">
 			<feature name="part_id" value="Disk 7"/>
 			<dataarea name="flop" size="1474560">
-				<rom name="x86DSK07.img" size="1474560" crc="a212caf9" sha1="a355c89e82c524a40f5b7ab561e82af1a3a0fcdd"/>
+				<rom name="x86DSK07_144.img" size="1474560" crc="a212caf9" sha1="a355c89e82c524a40f5b7ab561e82af1a3a0fcdd"/>
 			</dataarea>
 		</part>
 	</software>
@@ -1354,58 +1354,58 @@ license:CC0
 		</part>
 	</software>
 
-	<software name="odos701_720">
+	<software name="odos701_720" cloneof="odos701">
 		<description>Caldera OpenDOS 7.01 (3.5" 720KB)</description>
 		<year>1997</year>
 		<publisher>Caldera</publisher>
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="disk01.img" size="737280" crc="612f5f1c" sha1="ec78863520e391f27135cbdbfd859c9b9360bc91"/>
+				<rom name="disk01_720.img" size="737280" crc="612f5f1c" sha1="ec78863520e391f27135cbdbfd859c9b9360bc91"/>
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="disk02.img" size="737280" crc="2d8b8211" sha1="c98e07433e1911306faa15bc56ee32e4280631aa"/>
+				<rom name="disk02_720.img" size="737280" crc="2d8b8211" sha1="c98e07433e1911306faa15bc56ee32e4280631aa"/>
 			</dataarea>
 		</part>
 		<part name="flop3" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="disk03.img" size="737280" crc="70d5ec20" sha1="c93c5097e891c7590578fe0fb0cd19f6953b1fc6"/>
+				<rom name="disk03_720.img" size="737280" crc="70d5ec20" sha1="c93c5097e891c7590578fe0fb0cd19f6953b1fc6"/>
 			</dataarea>
 		</part>
 		<part name="flop4" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="disk04.img" size="737280" crc="8d0cffc5" sha1="36f3fd76c0052e456258fd38ef503c04cea0d53b"/>
+				<rom name="disk04_720.img" size="737280" crc="8d0cffc5" sha1="36f3fd76c0052e456258fd38ef503c04cea0d53b"/>
 			</dataarea>
 		</part>
 		<part name="flop5" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="disk05.img" size="737280" crc="238fa095" sha1="6f4d487d80b96732f654841180123c25e63cd9af"/>
+				<rom name="disk05_720.img" size="737280" crc="238fa095" sha1="6f4d487d80b96732f654841180123c25e63cd9af"/>
 			</dataarea>
 		</part>
 		<part name="flop6" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="disk06.img" size="737280" crc="36420325" sha1="19282f977890c62d03cc3e663718776a0e5e5a3a"/>
+				<rom name="disk06_720.img" size="737280" crc="36420325" sha1="19282f977890c62d03cc3e663718776a0e5e5a3a"/>
 			</dataarea>
 		</part>
 		<part name="flop7" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="disk07.img" size="737280" crc="e426b12d" sha1="b55e2c94b0c7e5aa1cad076c86d6f5d9bbc84317"/>
+				<rom name="disk07_720.img" size="737280" crc="e426b12d" sha1="b55e2c94b0c7e5aa1cad076c86d6f5d9bbc84317"/>
 			</dataarea>
 		</part>
 		<part name="flop8" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="disk08.img" size="737280" crc="b11b130b" sha1="deeae78d393c71f6ed6ea150adfc8bf8935577b2"/>
+				<rom name="disk08_720.img" size="737280" crc="b11b130b" sha1="deeae78d393c71f6ed6ea150adfc8bf8935577b2"/>
 			</dataarea>
 		</part>
 		<part name="flop9" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="disk09.img" size="737280" crc="a4f1dc1c" sha1="b2a72ae4db223f3fc4df46bf3ee725f8e07b951f"/>
+				<rom name="disk09_720.img" size="737280" crc="a4f1dc1c" sha1="b2a72ae4db223f3fc4df46bf3ee725f8e07b951f"/>
 			</dataarea>
 		</part>
 		<part name="flop10" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="disk10.img" size="737280" crc="76a0e038" sha1="fe67e67fb97b4d5b43e0d08470da10bbc43b312c"/>
+				<rom name="disk10_720.img" size="737280" crc="76a0e038" sha1="fe67e67fb97b4d5b43e0d08470da10bbc43b312c"/>
 			</dataarea>
 		</part>
 	</software>
@@ -1416,32 +1416,32 @@ license:CC0
 		<publisher>Caldera</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="1228800">
-				<rom name="disk01.img" size="1228800" crc="2e839344" sha1="5b8b1018ad99d366c327803c8f68868173774070"/>
+				<rom name="disk01_1200.img" size="1228800" crc="2e839344" sha1="5b8b1018ad99d366c327803c8f68868173774070"/>
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
 			<dataarea name="flop" size="1228800">
-				<rom name="disk02.img" size="1228800" crc="4c96a59a" sha1="b57b13af41d9382a92f6b65e76058b5d2892a887"/>
+				<rom name="disk02_1200.img" size="1228800" crc="4c96a59a" sha1="b57b13af41d9382a92f6b65e76058b5d2892a887"/>
 			</dataarea>
 		</part>
 		<part name="flop3" interface="floppy_5_25">
 			<dataarea name="flop" size="1228800">
-				<rom name="disk03.img" size="1228800" crc="00895d9a" sha1="1a46b7dc66effd6fee9ed7743bd8486b9778c4f0"/>
+				<rom name="disk03_1200.img" size="1228800" crc="00895d9a" sha1="1a46b7dc66effd6fee9ed7743bd8486b9778c4f0"/>
 			</dataarea>
 		</part>
 		<part name="flop4" interface="floppy_5_25">
 			<dataarea name="flop" size="1228800">
-				<rom name="disk04.img" size="1228800" crc="65ff3a7b" sha1="f10ddd5ac862dec5942b139ed649652a4c5094e5"/>
+				<rom name="disk04_1200.img" size="1228800" crc="65ff3a7b" sha1="f10ddd5ac862dec5942b139ed649652a4c5094e5"/>
 			</dataarea>
 		</part>
 		<part name="flop5" interface="floppy_5_25">
 			<dataarea name="flop" size="1228800">
-				<rom name="disk05.img" size="1228800" crc="57f40a97" sha1="3c507e3122706ab2d55926c84dfa546dba44c287"/>
+				<rom name="disk05_1200.img" size="1228800" crc="57f40a97" sha1="3c507e3122706ab2d55926c84dfa546dba44c287"/>
 			</dataarea>
 		</part>
 		<part name="flop6" interface="floppy_5_25">
 			<dataarea name="flop" size="1228800">
-				<rom name="disk06.img" size="1228800" crc="17b97bf3" sha1="39a0b0838ea63f06bd44c455fd15c9af5ab739a5"/>
+				<rom name="disk06_1200.img" size="1228800" crc="17b97bf3" sha1="39a0b0838ea63f06bd44c455fd15c9af5ab739a5"/>
 			</dataarea>
 		</part>
 	</software>
@@ -1476,32 +1476,32 @@ license:CC0
 		<publisher>Caldera</publisher>
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="ldisk01.img" size="737280" crc="0f3bee99" sha1="6dd09e60b162d514062b60e1d20504fe5749d5ba"/>
+				<rom name="ldisk01_720.img" size="737280" crc="0f3bee99" sha1="6dd09e60b162d514062b60e1d20504fe5749d5ba"/>
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="ldisk02.img" size="737280" crc="5ceeb565" sha1="88a039616ebed45a06c3a43debc731c474da0b63"/>
+				<rom name="ldisk02_720.img" size="737280" crc="5ceeb565" sha1="88a039616ebed45a06c3a43debc731c474da0b63"/>
 			</dataarea>
 		</part>
 		<part name="flop3" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="ldisk03.img" size="737280" crc="6ece946a" sha1="d1d3728ccd6bfb894642a46113b93f434464f7c9"/>
+				<rom name="ldisk03_720.img" size="737280" crc="6ece946a" sha1="d1d3728ccd6bfb894642a46113b93f434464f7c9"/>
 			</dataarea>
 		</part>
 		<part name="flop4" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="ldisk04.img" size="737280" crc="ed6ac5c1" sha1="ca09193163d40c3805655fc45472ae84b0877a74"/>
+				<rom name="ldisk04_720.img" size="737280" crc="ed6ac5c1" sha1="ca09193163d40c3805655fc45472ae84b0877a74"/>
 			</dataarea>
 		</part>
 		<part name="flop5" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="ldisk05.img" size="737280" crc="a2ed2a9d" sha1="6e1b0574ef44efb7db38a243421eae0135ba2ac3"/>
+				<rom name="ldisk05_720.img" size="737280" crc="a2ed2a9d" sha1="6e1b0574ef44efb7db38a243421eae0135ba2ac3"/>
 			</dataarea>
 		</part>
 		<part name="flop6" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
-				<rom name="ldisk06.img" size="737280" crc="510ff98b" sha1="eb308eca8cca237839302e93eb3afd76e6338559"/>
+				<rom name="ldisk06_720.img" size="737280" crc="510ff98b" sha1="eb308eca8cca237839302e93eb3afd76e6338559"/>
 			</dataarea>
 		</part>
 	</software>
@@ -1512,22 +1512,22 @@ license:CC0
 		<publisher>Caldera</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="1228800">
-				<rom name="ldisk01.img" size="1228800" crc="1927ce8f" sha1="a783b11cf0fadbaf71605194189f72b2d92a1fa9"/>
+				<rom name="ldisk01_1200.img" size="1228800" crc="1927ce8f" sha1="a783b11cf0fadbaf71605194189f72b2d92a1fa9"/>
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
 			<dataarea name="flop" size="1228800">
-				<rom name="ldisk02.img" size="1228800" crc="b0ab559e" sha1="3b2ce8cb194ef204e1f3c182ea594f68735480cb"/>
+				<rom name="ldisk02_1200.img" size="1228800" crc="b0ab559e" sha1="3b2ce8cb194ef204e1f3c182ea594f68735480cb"/>
 			</dataarea>
 		</part>
 		<part name="flop3" interface="floppy_5_25">
 			<dataarea name="flop" size="1228800">
-				<rom name="ldisk03.img" size="1228800" crc="50ac8f88" sha1="87f7999282c9fe858a37b594c707d7208ec9011e"/>
+				<rom name="ldisk03_1200.img" size="1228800" crc="50ac8f88" sha1="87f7999282c9fe858a37b594c707d7208ec9011e"/>
 			</dataarea>
 		</part>
 		<part name="flop4" interface="floppy_5_25">
 			<dataarea name="flop" size="1228800">
-				<rom name="ldisk04.img" size="1228800" crc="cf2c678b" sha1="24ced4abe0a0807a7a58b938629eb034d0b4ffa8"/>
+				<rom name="ldisk04_1200.img" size="1228800" crc="cf2c678b" sha1="24ced4abe0a0807a7a58b938629eb034d0b4ffa8"/>
 			</dataarea>
 		</part>
 	</software>
diff --git a/hash/ibm5170_cdrom.xml b/hash/ibm5170_cdrom.xml
index 2d87210c0da..8106567894f 100644
--- a/hash/ibm5170_cdrom.xml
+++ b/hash/ibm5170_cdrom.xml
@@ -3214,7 +3214,7 @@ license:CC0
 			<!-- Missing -->
 			<feature name="part_id" value="BonusPak for OS/2 version 3"/>
 			<diskarea name="cdrom">
-				<disk name="bonuspak" status="nodump"/>
+				<disk name="bonus_pak" status="nodump"/>
 			</diskarea>
 		</part>
 	</software>