Use unscoped name for enums
Merge pull request #1744 from wmtan/UseUnscopedNameForEnums

Use unscoped name for enums