Minor UI and naming updates