Some renames and other non-important stuff
Corrected events

Fixed enums
Other stuff