Some minor renames