Update GA and WA variable name lookups