Preserving Kconfig choice when option is renamed

What would be the correct way to preserve a Kconfig setting for a choice field when one of its options has been renamed?

The specific case here is the ARCH_ORION -> ARCH_ORION5X rename in arch/arm/Kconfig (commit: 9dd0b194bf68).

I've tried a number of things but keep getting the general default (ARCH_VERSATILE), which means various previously selected modules get unselected.

Cheers,
FJP