review fixes. change notification files names, and remove redundant
things