Merge pull request #9860 from MrPetovan/task/9640-rename-notification-classes