Rename functions to be in sync with OneAPI
Cleanup
Refine sub/unsub delivery notifications