Updated ui element nomenclature to have relevant naming.