Slight modifications to notifications for consistency purposes.

Change-Id: I225322fcc505aa8b15629868516eecda32305233