Fix for rust commit 3dcd2157403163789aaf21a9ab3c4d30a7c6494d 'Switch to ...

...purely namespaced enums'
Could we take the opportunity to rename the variants, instead?