I won't argue the terminology, but I will say that I favor the shot pulled into the water rather then the other way around.

Besides the taste aspect and being able to see some of the crema retained, it's a practical matter as I have no separate hot water tap or steam want handy on my La Peppina, so I'll pull a few shots of plain hot water into the cup after cleaning the group head followed by the shot. Once you pull the shot, you've got a dirty group so it doesn't work without cleaning before adding the water.