Change method names for Notification management