added class names to namespaces