further work on correcting namespaces