Renaming notification pages to match naming scheme and fixed up a little bit of consistency with notifications.