ui update, naming update