Fix forgotten file renames