Fixed use of word separators in Notification

    ensured fields are consistently using underscores

Fixes: Bug 1218006
Change-Id: I8c505b59b44984190ae7ba5c3fa562fc0cc9a05e
Merge "Fixed use of word separators in Notification"