Namespace renaming and more work