Further adjust namespaces