Resolved all name/scope resolution errors