Renamed NotificationBase => Notification