Refactor several names.