More cleaning up.

Renames notification classes.
Fixes a stupid bug related to the cursor notifier.