Keeping naming convention consistent.

Also adding a unit test for the observer registration shortcut.