Factory terminals to re-pin connectors?

Okay. I do have a de-pinning tool for Deutsche connectors I believe that can probably do the same function. Essentially just a narrow flat head screwdriver.
If your de-pinning tool will not work you can make one. I use the flat steel reinforcement inserts from old wiper blades, particularly from Honda wiper blades. You can grind the end to any width to fit the connector you are working on.