WIP: Initial fix for OOP architecture.

Changed all enums to capital letters.