Rename variables for clarity, no functional change.
Pull in the remaining Notification information.
Add .hardReset() and .softReset().