Rename classes
Rename some enums to better names