Fixed enum values to match Java naming conventions