Alternate approach for variable name mapping (#4441)