02 Sensor Connector Question
 

Are the two different O2 Sensor connector types interchangeable with each other?

I need to make some O2 extensions and the only part numbers for connectors I can find are the oval style.

Bosch 1928403736 and Bosch 192840340.

I have a 98, so mine are the square style plugs with red safety latches. Want to verify the above will work before ordering. Thanks guys!