Fix some weird file names. This will need cleaning up