(MESS) added some more disks to fm7_disk.xml and fixed a bunch of
naming inconsistencies. nw.