Changed naming system in notifications