Updates to WA Variable Name Lookup