The enum sets are no longer final constants. Thus we should use camel case instead.