WA Variable Name Lookup Updates