If the hole is drilled properly, the remaining threads should be able to be removed easily with a Thread Pick. This will ensure minimal damage to the existing threads in the bolt holes.
Tap thread (size & pitch) should match up with the bolt to be replaced in the hole. The tap should only be cleaning up the threads to make sure that the bolt threads in properly.
