UI Update and Naming Changes Primarily