Updating for enum name space changes
Merge pull request #1 from juxiliary/master

Updating for enum name space changes