Update to namespaced enum variants.
Merge pull request #31 from vberger/master

Update to namespaced enum variants.