diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index af8560fc44..0000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "codeql"]
-	path = codeql_modules/codeql
-	url = https://github.com/github/codeql.git
diff --git a/c/cert/src/codeql-pack.lock.yml b/c/cert/src/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/c/cert/src/codeql-pack.lock.yml
+++ b/c/cert/src/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/c/cert/src/qlpack.yml b/c/cert/src/qlpack.yml
index 9c7700e4f5..f3bb6dfc31 100644
--- a/c/cert/src/qlpack.yml
+++ b/c/cert/src/qlpack.yml
@@ -5,4 +5,4 @@ suites: codeql-suites
 license: MIT
 dependencies:
   codeql/common-c-coding-standards: '*'
-  codeql/cpp-all: 0.2.3
+  codeql/cpp-all: 0.3.5
diff --git a/c/cert/test/codeql-pack.lock.yml b/c/cert/test/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/c/cert/test/codeql-pack.lock.yml
+++ b/c/cert/test/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/c/common/src/codeql-pack.lock.yml b/c/common/src/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/c/common/src/codeql-pack.lock.yml
+++ b/c/common/src/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/c/common/src/qlpack.yml b/c/common/src/qlpack.yml
index 7cf79493f6..02a2a58665 100644
--- a/c/common/src/qlpack.yml
+++ b/c/common/src/qlpack.yml
@@ -3,4 +3,4 @@ version: 2.15.0-dev
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
-  codeql/cpp-all: 0.2.3
+  codeql/cpp-all: 0.3.5
diff --git a/c/common/test/codeql-pack.lock.yml b/c/common/test/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/c/common/test/codeql-pack.lock.yml
+++ b/c/common/test/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/c/misra/src/codeql-pack.lock.yml b/c/misra/src/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/c/misra/src/codeql-pack.lock.yml
+++ b/c/misra/src/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/c/misra/src/qlpack.yml b/c/misra/src/qlpack.yml
index b5dac3b39a..c3386475fe 100644
--- a/c/misra/src/qlpack.yml
+++ b/c/misra/src/qlpack.yml
@@ -5,4 +5,4 @@ suites: codeql-suites
 license: MIT
 dependencies:
   codeql/common-c-coding-standards: '*'
-  codeql/cpp-all: 0.2.3
+  codeql/cpp-all: 0.3.5
diff --git a/c/misra/src/rules/RULE-8-4/CompatibleDeclarationObjectDefined.ql b/c/misra/src/rules/RULE-8-4/CompatibleDeclarationObjectDefined.ql
index 7b0e194afb..433597cf4a 100644
--- a/c/misra/src/rules/RULE-8-4/CompatibleDeclarationObjectDefined.ql
+++ b/c/misra/src/rules/RULE-8-4/CompatibleDeclarationObjectDefined.ql
@@ -23,16 +23,10 @@ where
   not isExcluded(decl1, Declarations4Package::compatibleDeclarationObjectDefinedQuery()) and
   decl1.isDefinition() and
   decl1.getDeclaration() instanceof ExternalIdentifiers and
-  (
-    //no declaration matches exactly
-    not exists(VariableDeclarationEntry decl2 |
-      not decl2.isDefinition() and decl2.getDeclaration() = decl1.getDeclaration()
-    ) and
-    //and none is close enough
-    not exists(VariableDeclarationEntry decl2 |
-      not decl2.isDefinition() and
-      decl1.getVariable().getQualifiedName() = decl2.getVariable().getQualifiedName() and
-      typesCompatible(decl1.getType(), decl2.getType())
-    )
+  // no declaration matches
+  not exists(VariableDeclarationEntry decl2 |
+    not decl2.isDefinition() and
+    decl1.getDeclaration() = decl2.getDeclaration() and
+    typesCompatible(decl1.getType(), decl2.getType())
   )
 select decl1, "No separate compatible declaration found for this definition."
diff --git a/c/misra/test/codeql-pack.lock.yml b/c/misra/test/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/c/misra/test/codeql-pack.lock.yml
+++ b/c/misra/test/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/c/misra/test/rules/RULE-8-4/object1.c b/c/misra/test/rules/RULE-8-4/object1.c
index 3de20eabcc..7504bb9327 100644
--- a/c/misra/test/rules/RULE-8-4/object1.c
+++ b/c/misra/test/rules/RULE-8-4/object1.c
@@ -1,10 +1,10 @@
 extern int i;
-i = 0; // COMPLIANT
+int i = 0; // COMPLIANT
 
 extern int i1 = 0; // NON_COMPLIANT
 
 int i2 = 0; // NON_COMPLIANT
 
-extern int i3; // NON_COMPLIANT
+extern int i3;
 
-extern int i4; // COMPLIANT
\ No newline at end of file
+extern int i4;
diff --git a/c/misra/test/rules/RULE-8-4/object2.c b/c/misra/test/rules/RULE-8-4/object2.c
index 78c5bee421..e432fcb29b 100644
--- a/c/misra/test/rules/RULE-8-4/object2.c
+++ b/c/misra/test/rules/RULE-8-4/object2.c
@@ -1,3 +1,3 @@
 short i3 = 0; // NON_COMPLIANT
 
-signed int i4 = 0; // COMPLIANT
\ No newline at end of file
+signed int i4 = 0; // COMPLIANT
diff --git a/c/misra/test/rules/RULE-8-4/test.c b/c/misra/test/rules/RULE-8-4/test.c
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/change_notes/2022-03-08-update-to-CodeQL-2.10.5.md b/change_notes/2022-03-08-update-to-CodeQL-2.10.5.md
new file mode 100644
index 0000000000..7b08c18c41
--- /dev/null
+++ b/change_notes/2022-03-08-update-to-CodeQL-2.10.5.md
@@ -0,0 +1,3 @@
+- `RULE-8-4` - `CompatibleDeclarationObjectDefined.ql`
+  - Update rule implementation based on changes in the CodeQL libraries.
+- Updated the CodeQL version to `2.10.5`.
\ No newline at end of file
diff --git a/change_notes/2022-06-28-detect-static-namespace-members.md b/change_notes/2022-06-28-detect-static-namespace-members.md
new file mode 100644
index 0000000000..05af4deb79
--- /dev/null
+++ b/change_notes/2022-06-28-detect-static-namespace-members.md
@@ -0,0 +1,6 @@
+- `A2-10-4` - `IdentifierNameOfStaticFunctionReusedInNamespace.ql`:
+  - Reuse of an identifier name of a static function in a namespace is now detected.
+- `A2-10-4` - `IdentifierNameOfStaticNonMemberObjectReusedInNamespace.ql`:
+  - Reuse of an identifier name of a static non-member object in a namespace is now detected.
+- `A2-10-5` - `IdentifierNameOfStaticNonMemberObjectWithExternalOrInternalLinkageIsReused.ql`:
+  - Reuse of an identifier name of a static non-member object with internal linkage in a namespace is now detected.
diff --git a/codeql_modules/codeql b/codeql_modules/codeql
deleted file mode 160000
index 28fe7a7660..0000000000
--- a/codeql_modules/codeql
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 28fe7a76603ab7ef884ca35115b63104ecb699a7
diff --git a/cpp/autosar/src/codeql-pack.lock.yml b/cpp/autosar/src/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/cpp/autosar/src/codeql-pack.lock.yml
+++ b/cpp/autosar/src/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/cpp/autosar/src/qlpack.yml b/cpp/autosar/src/qlpack.yml
index 7709cf5c64..bf80ed2cf2 100644
--- a/cpp/autosar/src/qlpack.yml
+++ b/cpp/autosar/src/qlpack.yml
@@ -5,4 +5,4 @@ suites: codeql-suites
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
-  codeql/cpp-all: 0.2.3
+  codeql/cpp-all: 0.3.5
diff --git a/cpp/autosar/test/codeql-pack.lock.yml b/cpp/autosar/test/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/cpp/autosar/test/codeql-pack.lock.yml
+++ b/cpp/autosar/test/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/cpp/autosar/test/rules/A2-10-4/IdentifierNameOfStaticFunctionReusedInNamespace.expected b/cpp/autosar/test/rules/A2-10-4/IdentifierNameOfStaticFunctionReusedInNamespace.expected
index e69de29bb2..180e52c6f1 100644
--- a/cpp/autosar/test/rules/A2-10-4/IdentifierNameOfStaticFunctionReusedInNamespace.expected
+++ b/cpp/autosar/test/rules/A2-10-4/IdentifierNameOfStaticFunctionReusedInNamespace.expected
@@ -0,0 +1,2 @@
+| test1a.cpp:13:13:13:14 | f1 | Static function $@ reuses identifier of $@ | test1a.cpp:13:13:13:14 | f1 | f1 | test1b.cpp:6:13:6:14 | f1 | f1 |
+| test1b.cpp:6:13:6:14 | f1 | Static function $@ reuses identifier of $@ | test1b.cpp:6:13:6:14 | f1 | f1 | test1a.cpp:13:13:13:14 | f1 | f1 |
diff --git a/cpp/autosar/test/rules/A2-10-4/IdentifierNameOfStaticNonMemberObjectReusedInNamespace.expected b/cpp/autosar/test/rules/A2-10-4/IdentifierNameOfStaticNonMemberObjectReusedInNamespace.expected
index e69de29bb2..9eef8da1b5 100644
--- a/cpp/autosar/test/rules/A2-10-4/IdentifierNameOfStaticNonMemberObjectReusedInNamespace.expected
+++ b/cpp/autosar/test/rules/A2-10-4/IdentifierNameOfStaticNonMemberObjectReusedInNamespace.expected
@@ -0,0 +1,2 @@
+| test1a.cpp:2:12:2:13 | v1 | Non-member static object $@ reuses identifier name of non-member static object $@ | test1a.cpp:2:12:2:13 | v1 | v1 | test1b.cpp:2:12:2:13 | v1 | v1 |
+| test1b.cpp:2:12:2:13 | v1 | Non-member static object $@ reuses identifier name of non-member static object $@ | test1b.cpp:2:12:2:13 | v1 | v1 | test1a.cpp:2:12:2:13 | v1 | v1 |
diff --git a/cpp/autosar/test/rules/A2-10-4/test1b.cpp b/cpp/autosar/test/rules/A2-10-4/test1b.cpp
index 49a01226c3..c8a0e8a4b5 100644
--- a/cpp/autosar/test/rules/A2-10-4/test1b.cpp
+++ b/cpp/autosar/test/rules/A2-10-4/test1b.cpp
@@ -3,7 +3,6 @@ static int v1 = 3; // NON_COMPLIANT
 } // namespace ns1
 
 namespace ns3 {
-static void f1() {} // NON_COMPLIANT - Not accepted by Clang linker and
-                    // therefore not alerted upon.
+static void f1() {} // NON_COMPLIANT - Not accepted by Clang linker
 void f2() {}        // COMPLIANT - Not accepted by Clang linker
-} // namespace ns3
\ No newline at end of file
+} // namespace ns3
diff --git a/cpp/autosar/test/rules/A2-10-5/IdentifierNameOfANonMemberObjectWithExternalOrInternalLinkageIsReused.expected b/cpp/autosar/test/rules/A2-10-5/IdentifierNameOfANonMemberObjectWithExternalOrInternalLinkageIsReused.expected
index d06e645044..66d2b38c57 100644
--- a/cpp/autosar/test/rules/A2-10-5/IdentifierNameOfANonMemberObjectWithExternalOrInternalLinkageIsReused.expected
+++ b/cpp/autosar/test/rules/A2-10-5/IdentifierNameOfANonMemberObjectWithExternalOrInternalLinkageIsReused.expected
@@ -1,4 +1,6 @@
-| test1a.cpp:6:12:6:13 | g3 | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1a.cpp:6:12:6:13 | g3 | g3 | test1b.cpp:7:12:7:13 | g3 | g3 |
-| test1a.cpp:17:43:17:43 | number_two | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1a.cpp:17:43:17:43 | number_two | number_two | test1b.cpp:12:43:12:43 | number_two | number_two |
-| test1b.cpp:7:12:7:13 | g3 | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1b.cpp:7:12:7:13 | g3 | g3 | test1a.cpp:6:12:6:13 | g3 | g3 |
-| test1b.cpp:12:43:12:43 | number_two | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1b.cpp:12:43:12:43 | number_two | number_two | test1a.cpp:17:43:17:43 | number_two | number_two |
+| test1a.cpp:2:12:2:13 | g1 | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1a.cpp:2:12:2:13 | g1 | g1 | test1b.cpp:2:12:2:13 | g1 | g1 |
+| test1a.cpp:6:12:6:13 | g3 | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1a.cpp:6:12:6:13 | g3 | g3 | test1b.cpp:6:12:6:13 | g3 | g3 |
+| test1a.cpp:17:43:17:43 | number_two | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1a.cpp:17:43:17:43 | number_two | number_two | test1b.cpp:11:43:11:43 | number_two | number_two |
+| test1b.cpp:2:12:2:13 | g1 | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1b.cpp:2:12:2:13 | g1 | g1 | test1a.cpp:2:12:2:13 | g1 | g1 |
+| test1b.cpp:6:12:6:13 | g3 | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1b.cpp:6:12:6:13 | g3 | g3 | test1a.cpp:6:12:6:13 | g3 | g3 |
+| test1b.cpp:11:43:11:43 | number_two | Identifier name of non-member object $@ reuses the identifier name of non-member object $@. | test1b.cpp:11:43:11:43 | number_two | number_two | test1a.cpp:17:43:17:43 | number_two | number_two |
diff --git a/cpp/autosar/test/rules/A2-10-5/IdentifierNameOfAStaticFunctionIsReused.expected b/cpp/autosar/test/rules/A2-10-5/IdentifierNameOfAStaticFunctionIsReused.expected
index d84cdee2b0..c9eea3450b 100644
--- a/cpp/autosar/test/rules/A2-10-5/IdentifierNameOfAStaticFunctionIsReused.expected
+++ b/cpp/autosar/test/rules/A2-10-5/IdentifierNameOfAStaticFunctionIsReused.expected
@@ -1,2 +1,2 @@
-| test1a.cpp:7:13:7:14 | f1 | Identifier name of static function $@ reuses identifier name of static function $@ | test1a.cpp:7:13:7:14 | f1 | f1 | test1b.cpp:10:13:10:14 | f1 | f1 |
-| test1b.cpp:10:13:10:14 | f1 | Identifier name of static function $@ reuses identifier name of static function $@ | test1b.cpp:10:13:10:14 | f1 | f1 | test1a.cpp:7:13:7:14 | f1 | f1 |
+| test1a.cpp:7:13:7:14 | f1 | Identifier name of static function $@ reuses identifier name of static function $@ | test1a.cpp:7:13:7:14 | f1 | f1 | test1b.cpp:9:13:9:14 | f1 | f1 |
+| test1b.cpp:9:13:9:14 | f1 | Identifier name of static function $@ reuses identifier name of static function $@ | test1b.cpp:9:13:9:14 | f1 | f1 | test1a.cpp:7:13:7:14 | f1 | f1 |
diff --git a/cpp/autosar/test/rules/A2-10-5/test1a.cpp b/cpp/autosar/test/rules/A2-10-5/test1a.cpp
index d8e6634da7..80f63c3c69 100644
--- a/cpp/autosar/test/rules/A2-10-5/test1a.cpp
+++ b/cpp/autosar/test/rules/A2-10-5/test1a.cpp
@@ -1,5 +1,5 @@
 namespace n1 {
-static int g1 = 0;
+static int g1 = 0; // NON_COMPLIANT
 }
 
 static int g2;      // COMPLIANT
diff --git a/cpp/autosar/test/rules/A2-10-5/test1b.cpp b/cpp/autosar/test/rules/A2-10-5/test1b.cpp
index f292164478..132588d5dd 100644
--- a/cpp/autosar/test/rules/A2-10-5/test1b.cpp
+++ b/cpp/autosar/test/rules/A2-10-5/test1b.cpp
@@ -1,6 +1,5 @@
 namespace n1 {
-static int g1 = 1; // NON_COMPLIANT[FALSE_NEGATIVE], considered the same as
-                   // n1::g1 in test1a.cpp.
+static int g1 = 1; // NON_COMPLIANT
 }
 
 namespace n2 {
diff --git a/cpp/cert/src/codeql-pack.lock.yml b/cpp/cert/src/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/cpp/cert/src/codeql-pack.lock.yml
+++ b/cpp/cert/src/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/cpp/cert/src/qlpack.yml b/cpp/cert/src/qlpack.yml
index 82fa50fdc9..56fd0b103d 100644
--- a/cpp/cert/src/qlpack.yml
+++ b/cpp/cert/src/qlpack.yml
@@ -4,5 +4,5 @@ description: CERT C++ 2016
 suites: codeql-suites
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.2.3
+  codeql/cpp-all: 0.3.5
   codeql/common-cpp-coding-standards: '*'
diff --git a/cpp/cert/test/codeql-pack.lock.yml b/cpp/cert/test/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/cpp/cert/test/codeql-pack.lock.yml
+++ b/cpp/cert/test/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/cpp/common/src/codeql-pack.lock.yml b/cpp/common/src/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/cpp/common/src/codeql-pack.lock.yml
+++ b/cpp/common/src/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/cpp/common/src/codingstandards/cpp/Config.qll b/cpp/common/src/codingstandards/cpp/Config.qll
index 7d12340719..5ce3f7a035 100644
--- a/cpp/common/src/codingstandards/cpp/Config.qll
+++ b/cpp/common/src/codingstandards/cpp/Config.qll
@@ -8,7 +8,7 @@ import codingstandards.cpp.exclusions.RuleMetadata
 import codingstandards.cpp.deviations.Deviations
 
 /** A `coding-standards.xml` configuration file (usually generated from an YAML configuration file). */
-class CodingStandardsFile extends XMLFile {
+class CodingStandardsFile extends XmlFile {
   CodingStandardsFile() {
     this.getBaseName() = "coding-standards.xml" and
     // Must be within the users source code.
@@ -16,12 +16,12 @@ class CodingStandardsFile extends XMLFile {
   }
 }
 
-class CodingStandardsConfigSection extends XMLElement {
+class CodingStandardsConfigSection extends XmlElement {
   CodingStandardsConfigSection() { getParent() instanceof CodingStandardsConfig }
 }
 
 /** A "Coding Standards" configuration file */
-class CodingStandardsConfig extends XMLElement {
+class CodingStandardsConfig extends XmlElement {
   CodingStandardsConfig() {
     any(CodingStandardsFile csf).getARootElement() = this and
     this.getName() = "codingstandards"
diff --git a/cpp/common/src/codingstandards/cpp/deviations/Deviations.qll b/cpp/common/src/codingstandards/cpp/deviations/Deviations.qll
index 9399607e3d..4dfadd12eb 100644
--- a/cpp/common/src/codingstandards/cpp/deviations/Deviations.qll
+++ b/cpp/common/src/codingstandards/cpp/deviations/Deviations.qll
@@ -17,7 +17,7 @@ predicate applyDeviationsAtQueryLevel() {
 }
 
 /** An element which tells the analysis whether to report deviated results. */
-class CodingStandardsReportDeviatedAlerts extends XMLElement {
+class CodingStandardsReportDeviatedAlerts extends XmlElement {
   CodingStandardsReportDeviatedAlerts() {
     getParent() instanceof CodingStandardsConfig and
     hasName("report-deviated-alerts")
@@ -35,7 +35,7 @@ class DeviationPermits extends CodingStandardsConfigSection {
 }
 
 /** A deviation permit record, that is specified by a permit identifier */
-class DeviationPermit extends XMLElement {
+class DeviationPermit extends XmlElement {
   DeviationPermit() {
     getParent() instanceof DeviationPermits and
     hasName("deviation-permits-entry")
@@ -118,7 +118,7 @@ class DeviationPermit extends XMLElement {
 }
 
 /** A deviation record, that is a specified rule or query */
-class DeviationRecord extends XMLElement {
+class DeviationRecord extends XmlElement {
   DeviationRecord() {
     getParent() instanceof DeviationRecords and
     hasName("deviations-entry")
@@ -134,13 +134,13 @@ class DeviationRecord extends XMLElement {
 
   private string getRawPermitId() { result = getAChild("permit-id").getTextValue() }
 
-  private XMLElement getRawRaisedBy() { result = getAChild("raised-by") }
+  private XmlElement getRawRaisedBy() { result = getAChild("raised-by") }
 
   private string getRawRaisedByName() { result = getRawRaisedBy().getAChild("name").getTextValue() }
 
   private string getRawRaisedByDate() { result = getRawRaisedBy().getAChild("date").getTextValue() }
 
-  private XMLElement getRawApprovedBy() { result = getAChild("approved-by") }
+  private XmlElement getRawApprovedBy() { result = getAChild("approved-by") }
 
   private string getRawApprovedByName() {
     result = getRawApprovedBy().getAChild("name").getTextValue()
diff --git a/cpp/common/src/codingstandards/cpp/guideline_recategorizations/GuidelineRecategorizations.qll b/cpp/common/src/codingstandards/cpp/guideline_recategorizations/GuidelineRecategorizations.qll
index ff148a4a72..ec5731f1bf 100644
--- a/cpp/common/src/codingstandards/cpp/guideline_recategorizations/GuidelineRecategorizations.qll
+++ b/cpp/common/src/codingstandards/cpp/guideline_recategorizations/GuidelineRecategorizations.qll
@@ -12,7 +12,7 @@ class GuidelineRecategorizations extends CodingStandardsConfigSection {
   GuidelineRecategorizations() { hasName("guideline-recategorizations") }
 }
 
-class GuidelineRecategorization extends XMLElement {
+class GuidelineRecategorization extends XmlElement {
   GuidelineRecategorization() {
     getParent() instanceof GuidelineRecategorizations and
     hasName("guideline-recategorizations-entry")
diff --git a/cpp/common/src/qlpack.yml b/cpp/common/src/qlpack.yml
index 6d6281cf2c..147f1d79e7 100644
--- a/cpp/common/src/qlpack.yml
+++ b/cpp/common/src/qlpack.yml
@@ -2,4 +2,4 @@ name: codeql/common-cpp-coding-standards
 version: 2.15.0-dev
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.2.3
+  codeql/cpp-all: 0.3.5
diff --git a/cpp/common/test/codeql-pack.lock.yml b/cpp/common/test/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/cpp/common/test/codeql-pack.lock.yml
+++ b/cpp/common/test/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/cpp/misra/src/codeql-pack.lock.yml b/cpp/misra/src/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/cpp/misra/src/codeql-pack.lock.yml
+++ b/cpp/misra/src/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/cpp/misra/src/qlpack.yml b/cpp/misra/src/qlpack.yml
index 1de329e235..d634c59bd8 100644
--- a/cpp/misra/src/qlpack.yml
+++ b/cpp/misra/src/qlpack.yml
@@ -5,4 +5,4 @@ suites: codeql-suites
 license: MIT
 dependencies:
   codeql/common-cpp-coding-standards: '*'
-  codeql/cpp-all: 0.2.3
+  codeql/cpp-all: 0.3.5
diff --git a/cpp/misra/test/codeql-pack.lock.yml b/cpp/misra/test/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/cpp/misra/test/codeql-pack.lock.yml
+++ b/cpp/misra/test/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/cpp/report/src/codeql-pack.lock.yml b/cpp/report/src/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/cpp/report/src/codeql-pack.lock.yml
+++ b/cpp/report/src/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/cpp/report/src/qlpack.yml b/cpp/report/src/qlpack.yml
index 2c6789e1a6..d40ab29324 100644
--- a/cpp/report/src/qlpack.yml
+++ b/cpp/report/src/qlpack.yml
@@ -2,4 +2,4 @@ name: codeql/report-cpp-coding-standards
 version: 2.15.0-dev
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.2.3
+  codeql/cpp-all: 0.3.5
diff --git a/scripts/generate_modules/queries/codeql-pack.lock.yml b/scripts/generate_modules/queries/codeql-pack.lock.yml
index b0f02a9d1f..1da7b6075b 100644
--- a/scripts/generate_modules/queries/codeql-pack.lock.yml
+++ b/scripts/generate_modules/queries/codeql-pack.lock.yml
@@ -1,6 +1,6 @@
 ---
 dependencies:
   codeql/cpp-all:
-    version: 0.2.3
+    version: 0.3.5
 compiled: false
 lockVersion: 1.0.0
diff --git a/scripts/generate_modules/queries/qlpack.yml b/scripts/generate_modules/queries/qlpack.yml
index 29906305c6..76ee66f817 100644
--- a/scripts/generate_modules/queries/qlpack.yml
+++ b/scripts/generate_modules/queries/qlpack.yml
@@ -2,4 +2,4 @@ name: codeql/standard-library-extraction-cpp-coding-standards
 version: 0.0.0
 license: MIT
 dependencies:
-  codeql/cpp-all: 0.2.3
+  codeql/cpp-all: 0.3.5
diff --git a/supported_codeql_configs.json b/supported_codeql_configs.json
index 269af480e3..c6c35979d9 100644
--- a/supported_codeql_configs.json
+++ b/supported_codeql_configs.json
@@ -1,9 +1,9 @@
 {
   "supported_environment": [
     {
-      "codeql_cli": "2.9.4",
-      "codeql_standard_library": "codeql-cli/v2.9.4",
-      "codeql_cli_bundle": "codeql-bundle-20220615"
+      "codeql_cli": "2.10.5",
+      "codeql_standard_library": "codeql-cli/v2.10.5",
+      "codeql_cli_bundle": "codeql-bundle-20220908"
     }
   ], 
   "supported_language" : [
@@ -14,4 +14,4 @@
       "language" : "c"
     }
   ]
-}
\ No newline at end of file
+}