Fix name collision issue
Merge pull request #813 from twitter/rename-option

Fix name collision issue