@@ -9,9 +9,9 @@ import semmle.code.cpp.ir.dataflow.DataFlow
 /**
  * A flow state representing a possible configuration of an XML object.
  */
-abstract class XXEFlowState extends DataFlow::FlowState {
+abstract class XxeFlowState extends DataFlow::FlowState {
   bindingset[this]
-  XXEFlowState() { any() } // required characteristic predicate
+  XxeFlowState() { any() } // required characteristic predicate
 }
 
 /**
@@ -36,9 +36,9 @@ abstract class XmlLibrary extends string {
 
 /**
  * An `Expr` that changes the configuration of an XML object, transforming the
- * `XXEFlowState` that flows through it.
+ * `XxeFlowState` that flows through it.
  */
-abstract class XXEFlowStateTransformer extends Expr {
+abstract class XxeFlowStateTransformer extends Expr {
   /**
    * Gets the flow state that `flowstate` is transformed into.
    *
@@ -48,5 +48,5 @@ abstract class XXEFlowStateTransformer extends Expr {
    * transform(tranform(x)) = tranform(x)
    * ```
    */
-  abstract XXEFlowState transform(XXEFlowState flowstate);
+  abstract XxeFlowState transform(XxeFlowState flowstate);
 }
@@ -35,15 +35,15 @@ class XXEConfiguration extends DataFlow::Configuration {
   override predicate isAdditionalFlowStep(
     DataFlow::Node node1, string state1, DataFlow::Node node2, string state2
   ) {
-    // create additional flow steps for `XXEFlowStateTransformer`s
-    state2 = node2.asConvertedExpr().(XXEFlowStateTransformer).transform(state1) and
+    // create additional flow steps for `XxeFlowStateTransformer`s
+    state2 = node2.asConvertedExpr().(XxeFlowStateTransformer).transform(state1) and
     DataFlow::simpleLocalFlowStep(node1, node2)
   }
 
   override predicate isBarrier(DataFlow::Node node, string flowstate) {
     // when the flowstate is transformed at a call node, block the original
     // flowstate value.
-    node.asConvertedExpr().(XXEFlowStateTransformer).transform(flowstate) != flowstate
+    node.asConvertedExpr().(XxeFlowStateTransformer).transform(flowstate) != flowstate
   }
 }
 
 
@@ -38,22 +38,22 @@ predicate encodeXercesFlowState(
  * A flow state representing the configuration of an `AbstractDOMParser` or
  * `SAXParser` object.
  */
-class XercesFlowState extends XXEFlowState {
+class XercesFlowState extends XxeFlowState {
   XercesFlowState() { encodeXercesFlowState(this, _, _) }
 }
 
 /**
  * The `AbstractDOMParser` class.
  */
-class AbstractDOMParserClass extends Class {
-  AbstractDOMParserClass() { this.hasName("AbstractDOMParser") }
+class AbstractDomParserClass extends Class {
+  AbstractDomParserClass() { this.hasName("AbstractDOMParser") }
 }
 
 /**
  * The `XercesDOMParser` class.
  */
-class XercesDOMParserClass extends Class {
-  XercesDOMParserClass() { this.hasName("XercesDOMParser") }
+class XercesDomParserClass extends Class {
+  XercesDomParserClass() { this.hasName("XercesDOMParser") }
 }
 
 /**
@@ -66,7 +66,7 @@ class XercesDomParserLibrary extends XmlLibrary {
     // source is the write on `this` of a call to the `XercesDOMParser`
     // constructor.
     exists(CallInstruction call |
-      call.getStaticCallTarget() = any(XercesDOMParserClass c).getAConstructor() and
+      call.getStaticCallTarget() = any(XercesDomParserClass c).getAConstructor() and
       node.asInstruction().(WriteSideEffectInstruction).getDestinationAddress() =
         call.getThisArgument() and
       encodeXercesFlowState(flowstate, 0, 1) // default configuration
@@ -76,7 +76,7 @@ class XercesDomParserLibrary extends XmlLibrary {
   override predicate configurationSink(DataFlow::Node node, string flowstate) {
     // sink is the read of the qualifier of a call to `AbstractDOMParser.parse`.
     exists(Call call |
-      call.getTarget().getClassAndName("parse") instanceof AbstractDOMParserClass and
+      call.getTarget().getClassAndName("parse") instanceof AbstractDomParserClass and
       call.getQualifier() = node.asConvertedExpr()
     ) and
     flowstate instanceof XercesFlowState and
@@ -213,14 +213,14 @@ class Sax2XmlReaderLibrary extends XmlLibrary {
  * `SAXParser.setDisableDefaultEntityResolution`. Transforms the flow
  * state through the qualifier according to the setting in the parameter.
  */
-class DisableDefaultEntityResolutionTransformer extends XXEFlowStateTransformer {
+class DisableDefaultEntityResolutionTransformer extends XxeFlowStateTransformer {
   Expr newValue;
 
   DisableDefaultEntityResolutionTransformer() {
     exists(Call call, Function f |
       call.getTarget() = f and
       (
-        f.getDeclaringType() instanceof AbstractDOMParserClass or
+        f.getDeclaringType() instanceof AbstractDomParserClass or
         f.getDeclaringType() instanceof SaxParserClass
       ) and
       f.hasName("setDisableDefaultEntityResolution") and
@@ -229,7 +229,7 @@ class DisableDefaultEntityResolutionTransformer extends XXEFlowStateTransformer
     )
   }
 
-  final override XXEFlowState transform(XXEFlowState flowstate) {
+  final override XxeFlowState transform(XxeFlowState flowstate) {
     exists(int createEntityReferenceNodes |
       encodeXercesFlowState(flowstate, _, createEntityReferenceNodes) and
       (
@@ -248,19 +248,19 @@ class DisableDefaultEntityResolutionTransformer extends XXEFlowStateTransformer
  * `AbstractDOMParser.setCreateEntityReferenceNodes`. Transforms the flow
  * state through the qualifier according to the setting in the parameter.
  */
-class CreateEntityReferenceNodesTransformer extends XXEFlowStateTransformer {
+class CreateEntityReferenceNodesTransformer extends XxeFlowStateTransformer {
   Expr newValue;
 
   CreateEntityReferenceNodesTransformer() {
     exists(Call call, Function f |
       call.getTarget() = f and
-      f.getClassAndName("setCreateEntityReferenceNodes") instanceof AbstractDOMParserClass and
+      f.getClassAndName("setCreateEntityReferenceNodes") instanceof AbstractDomParserClass and
       this = call.getQualifier() and
       newValue = call.getArgument(0)
     )
   }
 
-  final override XXEFlowState transform(XXEFlowState flowstate) {
+  final override XxeFlowState transform(XxeFlowState flowstate) {
     exists(int disabledDefaultEntityResolution |
       encodeXercesFlowState(flowstate, disabledDefaultEntityResolution, _) and
       (
@@ -289,7 +289,7 @@ class FeatureDisableDefaultEntityResolution extends Variable {
  * specifying the feature `XMLUni::fgXercesDisableDefaultEntityResolution`.
  * Transforms the flow state through the qualifier according to this setting.
  */
-class SetFeatureTransformer extends XXEFlowStateTransformer {
+class SetFeatureTransformer extends XxeFlowStateTransformer {
   Expr newValue;
 
   SetFeatureTransformer() {
@@ -303,7 +303,7 @@ class SetFeatureTransformer extends XXEFlowStateTransformer {
     )
   }
 
-  final override XXEFlowState transform(XXEFlowState flowstate) {
+  final override XxeFlowState transform(XxeFlowState flowstate) {
     exists(int createEntityReferenceNodes |
       encodeXercesFlowState(flowstate, _, createEntityReferenceNodes) and
       (
@@ -340,7 +340,7 @@ class DomConfigurationSetParameter extends Function {
  * `DOMConfiguration` pointer returned by `DOMLSParser.getDomConfig` - and it
  * is *that* qualifier we want to transform the flow state of.
  */
-class DomConfigurationSetParameterTransformer extends XXEFlowStateTransformer {
+class DomConfigurationSetParameterTransformer extends XxeFlowStateTransformer {
   Expr newValue;
 
   DomConfigurationSetParameterTransformer() {
@@ -361,7 +361,7 @@ class DomConfigurationSetParameterTransformer extends XXEFlowStateTransformer {
     )
   }
 
-  final override XXEFlowState transform(XXEFlowState flowstate) {
+  final override XxeFlowState transform(XxeFlowState flowstate) {
     exists(int createEntityReferenceNodes |
       encodeXercesFlowState(flowstate, _, createEntityReferenceNodes) and
       (
Original file line number	Diff line number	Diff line change
`@@ -35,15 +35,15 @@ class XXEConfiguration extends DataFlow::Configuration {`
`35`	`35`	`override predicate isAdditionalFlowStep(`
`36`	`36`	`DataFlow::Node node1, string state1, DataFlow::Node node2, string state2`
`37`	`37`	`) {`
`38`		- // create additional flow steps for `XXEFlowStateTransformer`s
`39`		`- state2 = node2.asConvertedExpr().(XXEFlowStateTransformer).transform(state1) and`
	`38`	+ // create additional flow steps for `XxeFlowStateTransformer`s
	`39`	`+ state2 = node2.asConvertedExpr().(XxeFlowStateTransformer).transform(state1) and`
`40`	`40`	`DataFlow::simpleLocalFlowStep(node1, node2)`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`override predicate isBarrier(DataFlow::Node node, string flowstate) {`
`44`	`44`	`// when the flowstate is transformed at a call node, block the original`
`45`	`45`	`// flowstate value.`
`46`		`- node.asConvertedExpr().(XXEFlowStateTransformer).transform(flowstate) != flowstate`
	`46`	`+ node.asConvertedExpr().(XxeFlowStateTransformer).transform(flowstate) != flowstate`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`