Renaming and tidy up: Generic notification is now custom notification.