Cosmetic changes to the terminology in the UI: