Changes : Refine SendNotificationMethodAdvisor, rename annotations and
other little changes.