Changed CNX to OSCNX - Do Not Merge

This needs to wait on OSC code being released.