[TASK] Cleanup and naming adjustments
[TASK] Switch to simple client notifier