Rewrite existing notification creation calls