Renamed some USER_ setting names