rename values to usages