Basic renaming of enum members;
Basic StyleCop cosmetics;