Resolve namespace mistakes