Fixed enum types names