Additional renames.