Axle shaft splines on EA81's

First off I'm not talking about the spline the hub goes on or the spline on the gearbox I am talking about the splines the CV race slots onto the shaft itself.

I've seen different size and number count splines on the inner "DOJs" from 2WS to 4WD to Aftermarket shafts. But is this the same case with the outer CV joint? I need to replace a joint and a new shaft is too expensive. But just a joint is much cheaper and it is no worries for me to do the work. Problem is I don't want to buy the joint then find out it won't fit to either of my two shafts I have to play with. One of the shafts looks original, the other is quite obviously aftermarket (and very new looking). They are both the 4WD thickness.