rename AccidentalRole and AccidentalType to Role and Type