Namespaces now match assembly names to avoid class name conflicts