o Better naming of constants, so that it is clear if they are for PnP
  or dispensing.