Update of variable name lookup for WI