Improve Sort enum names