use a convention for renamed variables to allow better reporting of the names of undefined variables. fixes #5692