Rename more fixtures with Windows issues