Rename enum
Remove more warnings
Fix spelling
A little more spelling