Renamed VariableScope and NamedVariableScope to Scope and NamedScope.