rename enum and remove unnecessary helper function