Fix enum variant/type name clashes
Merge pull request #54 from ebfe/fix-build-master

Fix enum variant/type name clashes