Rename Notifier
Small fixes