actually fix namespaces