Updated to store files using names that Windows can cope with