So I think you can fix this with nested namespaces. I.e. put everything in one namespace, then your two sub parts in namespace.one and namespace.two