Identify some fields in ui, adjust names for consistency