Enumerator Conventions

A PR for the issue I had earlier added on enumerator conventions.

#20