Fix NotificationService NameError for new issue