Changed the scopes to namespaces