Avoid naming clashes
Fix typo
Avoid naming clashes in option values