LPS-44384 Make all notification methods more consistent