Some more renames.