Shaft & guide pin
Shift shaft & guide pin.
Note the guide pin slides up INSIDE the shift shaft, PAST the roll pin holes.
Ya gotta be careful not to drive the roll pins in too far, or else the guide pin won't fit. And if you get the second roll pin in too far, ya can't drive it out again! You'd either have to drill it out, or drive it out from the opposite side using the first drive pin! (then start all over again)