Refactored all renaming enumerations to conform with lowercase+ whitspace delimited convention
Refactored all renaming enumerations to conform with lowercase+ whitspace delimited convention