The '96-'03 ZX7r has a few poor designs, ranging from headlights to the electrical harness and routing. We aim to fix what we can.
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.