Unity: fix namespaces