Renaming more UI classes