more renames and groupings