Refactor enums
Prefixing kOPF