Add some alternate forms in enums

Should fix issue #920
Merge pull request #934 from turbedi/patch-1

Add some alternate forms in enums