clean up namespaces

classname=namespace is a pain