Fix namespaces

Already forked so why not just make it work?