Merge "Notification method renaming." into oc-dev