Rename Measure to Quantity
Simplify KitchenUnitSystem