Ensure scenarios have unique names, close #944