yeah, sort of. it's all interchangeable but with the change over the waterpump outlet moved along with the timing marks on the timing and the lower radiator outlet. so if you run the wrong combo of parts you either can't see the timing marks or you have to jog the lower radiator hose from one side to the other directly under the fan.
time to break the cycle amigo!