Changed CNX to OSCNX - Do Not Merge

This needs to wait until after the OSC code is released.