update variable names, and add node references