While we're at it, fix some file names