Fix some forgotten renames.