Avoid naming clashes in option values