Hygiene: Make notification code more readable

Use different variable names to avoid confusion in what is used for
the label.

Change-Id: I09ffbed3bcb4031301fd5c388e46c1dcc51227a6