added name in Situation and in Template