Yes, Good advise, definitely change both tensioner & water pump when replacing Timing belt.

Dragon Bob