Refactoring
- Method name change
- Enum refactored