diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
index 52c1c2ec6aa..20eecd50f9c 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowUtil.qll
@@ -740,7 +740,7 @@ class InitialGlobalValue extends Node, TInitialGlobalValue {
 /**
  * A data-flow node used to model flow summaries. That is, a dataflow node
  * that is synthesized to represent a parameter, return value, or other part
- * of a models-as-data modelled function.
+ * of a models-as-data modeled function.
  */
 class FlowSummaryNode extends Node, TFlowSummaryNode {
   FlowSummaryImpl::Private::SummaryNode getSummaryNode() { this = TFlowSummaryNode(result) }
@@ -1972,7 +1972,7 @@ private module Cached {
     simpleLocalFlowStep(nodeFrom, nodeTo)
     or
     // models-as-data summarized flow for local data flow (i.e. special case for flow
-    // through calls to modelled functions, without relying on global dataflow to join
+    // through calls to modeled functions, without relying on global dataflow to join
     // the dots).
     FlowSummaryImpl::Private::Steps::summaryThroughStepValue(nodeFrom, nodeTo, _)
  }
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll
index 3bf052bd6cb..04b4246fbfb 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/TaintTrackingUtil.qll
@@ -23,7 +23,7 @@ predicate localTaintStep(DataFlow::Node nodeFrom, DataFlow::Node nodeTo) {
   localAdditionalTaintStep(nodeFrom, nodeTo)
   or
   // models-as-data summarized flow for local data flow (i.e. special case for flow
-  // through calls to modelled functions, without relying on global dataflow to join
+  // through calls to modeled functions, without relying on global dataflow to join
   // the dots).
   FlowSummaryImpl::Private::Steps::summaryThroughStepTaint(nodeFrom, nodeTo, _)
 }
diff --git a/cpp/ql/lib/semmle/code/cpp/models/implementations/ZMQ.qll b/cpp/ql/lib/semmle/code/cpp/models/implementations/ZMQ.qll
index 9bd98f855b7..37a995b5efe 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/ZMQ.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/ZMQ.qll
@@ -7,7 +7,7 @@ import semmle.code.cpp.models.interfaces.FlowSource
 /**
  * Remote flow sources.
  */
-private class ZMQSource extends SourceModelCsv {
+private class ZmqSource extends SourceModelCsv {
   override predicate row(string row) {
     row =
       [
@@ -21,7 +21,7 @@ private class ZMQSource extends SourceModelCsv {
 /**
  * Remote flow sinks.
  */
-private class ZMQSinks extends SinkModelCsv {
+private class ZmqSinks extends SinkModelCsv {
   override predicate row(string row) {
     row =
       [
diff --git a/cpp/ql/lib/semmle/code/cpp/security/FlowSources.qll b/cpp/ql/lib/semmle/code/cpp/security/FlowSources.qll
index f610f662923..2aef5e6e7df 100644
--- a/cpp/ql/lib/semmle/code/cpp/security/FlowSources.qll
+++ b/cpp/ql/lib/semmle/code/cpp/security/FlowSources.qll
@@ -113,8 +113,8 @@ private class RemoteParameterSink extends RemoteFlowSink {
 /**
  * A remote flow sink defined in a CSV model.
  */
-private class RemoteFlowFromCSVSink extends RemoteFlowSink {
-  RemoteFlowFromCSVSink() { sinkNode(this, "remote-sink") }
+private class RemoteFlowFromCsvSink extends RemoteFlowSink {
+  RemoteFlowFromCsvSink() { sinkNode(this, "remote-sink") }
 
   override string getSinkType() { result = "remote flow sink" }
 }
diff --git a/cpp/ql/src/Security/CWE/CWE-497/ExposedSystemData.ql b/cpp/ql/src/Security/CWE/CWE-497/ExposedSystemData.ql
index 557c631279a..16b1dc31489 100644
--- a/cpp/ql/src/Security/CWE/CWE-497/ExposedSystemData.ql
+++ b/cpp/ql/src/Security/CWE/CWE-497/ExposedSystemData.ql
@@ -27,7 +27,7 @@ module ExposedSystemDataConfig implements DataFlow::ConfigSig {
     sink instanceof RemoteFlowSink
     or
     // workaround for cases where the sink contains the tainted thing as a child; this could
-    // probably be handled better with taint inheriting content or similar modelling.
+    // probably be handled better with taint inheriting content or similar modeling.
     exists(RemoteFlowSink sinkNode |
       sinkNode.asIndirectExpr().getAChild*() = sink.asIndirectExpr()
     )