Update of variable name lookup for GUA