Fix canonical namespace names