more work on the namespace patching mess