Merge "Add converted namespace names as aliases to avoid confusion."