Move from gap to paired in name #2667

This will cause a bunch of internal tests to break.  Should I disable them temporarily?