Rename oneof to elements