Renamed "beverage" as "drink" everywhere