Name and value renumbering