Rename enums refired

Lots here... we'll review jointly.