Hot water heater is not really a pleonasm. There can be heaters that heat other things than water. And heaters that heat water but do not produce hot water. Heat tape, e.g., is a water heater but all it does to the water is keep it from freezing.