Refactoring notifier names for clarity