yes that is the tool. I think the motorcraft are still two piece but I'm not sure. I think I remember reading that the champions are the only one piece you can get