WIP de-shuffle choice names for logging