Remove Options suffix from all the generated enums, less smurfing and clearer public API