Convert all notify/subscribe calls to the new style syntax