The name is still water cooler (1) (2) (3) if the object still dispenses water at room or chilled temperatures, although you may prefer the somewhat less confusing water dispenser or the somewhat more explicit water cooler/heater.

If the object only heats water, it is more normally called a water boiler.

The term water cooler is still valid (1) (2) (3) if the object still dispenses water at room or chilled temperatures, although you may prefer the somewhat less confusing water dispenser or the more explicit term water cooler/heater.

If the object only heats water, it is more normally called a water boiler.

Although I've never heard the term drinking machine, I would usually associate a drinks machine with a vending machine that dispenses drinks (often for a fee), such as the following:

http://artreflection.co.uk/VendLast/wp-content/gallery/can-machines/mistralb.jpg