Graphite’s advice on the bolts is really important but even better when you remove a bolt slip it into the corresponding hole in the new pump, when the old pump is off swap the bolts to the old pump and install the new. Better chance of keeping the bolts in the proper positions.
This sounds like a preferred method for keeping the bolts properly located in the water pump.