Check scopes
Fix Var/Name issue