Update GA and WA variable name lookups
Merge pull request #105 from adamvi/master

Update GA and WA variable name lookups