Determine if you really need to rework your electrical system. I have had this problem on all of my ZX7r motorcycles, and have repaired them all. The main problem is the machine not starting because these connections supply power to the rest of the motorcycle.
Pull apart the existing ignition connectors and remove terminals from their housing if possible. Otherwise, clip wires as close to the housing as possible.
Strip wires and crimp on new terminals.
Assemble new connector housings making sure the correct wires mate with each other. The wiring order generally doesn't matter but the electrical connections need to be the same as before.
Test all connections and verify your repair.