Update changes from SVN r1712
Modified variable to only allow renaming of vars with same field name (allows separation)