Are all the shafts on coffee machine pumps the same?

No they are not all the same. The most common is the square shaft, this is used with most espresso machine brands. But when you have a espresso machine of Gruppo Cimbali you will find various models. The most common ones are the D shape and the small square shaft.