Fixing up namespaces and paths