Rename the notification attributes.

Fixes #5906