Rename some bits to avoid confusion with nsIObserver-related stuff