[Apache] Revert enum names to original form