Merge "Notification method renames." into oc-dev