Consistent file naming (to make way for actual notification objects), and remove obsolete warning in userNotification template