Fix top-level namespaces