fix namespaces and groupid