[en] two new rules: "counsel general -> consul general", "diffuse tension -> defuse tension"