diff --git a/rust/ql/lib/codeql/rust/security/WeakSensitiveDataHashingExtensions.qll b/rust/ql/lib/codeql/rust/security/WeakSensitiveDataHashingExtensions.qll
index 80612d615764..8407ee4467d1 100644
--- a/rust/ql/lib/codeql/rust/security/WeakSensitiveDataHashingExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/WeakSensitiveDataHashingExtensions.qll
@@ -61,12 +61,12 @@ module NormalHashFunction {
    */
   class SensitiveDataAsSource extends Source instanceof SensitiveData {
     SensitiveDataAsSource() {
-      not this.(SensitiveData).getClassification() = SensitiveDataClassification::password() and // (covered in ComputationallyExpensiveHashFunction)
-      not this.(SensitiveData).getClassification() = SensitiveDataClassification::id() // (not accurate enough)
+      not SensitiveData.super.getClassification() = SensitiveDataClassification::password() and // (covered in ComputationallyExpensiveHashFunction)
+      not SensitiveData.super.getClassification() = SensitiveDataClassification::id() // (not accurate enough)
     }
 
     override SensitiveDataClassification getClassification() {
-      result = this.(SensitiveData).getClassification()
+      result = SensitiveData.super.getClassification()
     }
   }
 
@@ -138,11 +138,11 @@ module ComputationallyExpensiveHashFunction {
    */
   class PasswordAsSource extends Source instanceof SensitiveData {
     PasswordAsSource() {
-      this.(SensitiveData).getClassification() = SensitiveDataClassification::password()
+      SensitiveData.super.getClassification() = SensitiveDataClassification::password()
     }
 
     override SensitiveDataClassification getClassification() {
-      result = this.(SensitiveData).getClassification()
+      result = SensitiveData.super.getClassification()
     }
   }
 
diff --git a/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.qhelp b/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.qhelp
index 8ee0fc81a807..9fbeb22d39db 100755
--- a/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.qhelp
+++ b/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.qhelp
@@ -95,7 +95,6 @@
             and
             <a href="https://cheatsheetseries.owasp.org/cheatsheets/Transport_Layer_Security_Cheat_Sheet.html">
                 Transport Layer Security Cheat Sheet
-
             </a>.
         </li>
         <li>
diff --git a/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql b/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql
index 8779ce56d273..b7906d9af127 100755
--- a/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql
+++ b/rust/ql/src/queries/security/CWE-328/WeakSensitiveDataHashing.ql
@@ -43,7 +43,7 @@ module NormalHashFunctionFlow {
     }
   }
 
-  module Flow = TaintTracking::Global<Config>;
+  import TaintTracking::Global<Config>
 }
 
 /**
@@ -74,7 +74,7 @@ module ComputationallyExpensiveHashFunctionFlow {
     }
   }
 
-  module Flow = TaintTracking::Global<Config>;
+  import TaintTracking::Global<Config>
 }
 
 /**
@@ -83,10 +83,10 @@ module ComputationallyExpensiveHashFunctionFlow {
  * merged to generate a combined path graph.
  */
 module WeakSensitiveDataHashingFlow =
-  DataFlow::MergePathGraph<NormalHashFunctionFlow::Flow::PathNode,
-    ComputationallyExpensiveHashFunctionFlow::Flow::PathNode,
-    NormalHashFunctionFlow::Flow::PathGraph,
-    ComputationallyExpensiveHashFunctionFlow::Flow::PathGraph>;
+  DataFlow::MergePathGraph<NormalHashFunctionFlow::PathNode,
+    ComputationallyExpensiveHashFunctionFlow::PathNode,
+    NormalHashFunctionFlow::PathGraph,
+    ComputationallyExpensiveHashFunctionFlow::PathGraph>;
 
 import WeakSensitiveDataHashingFlow::PathGraph
 
@@ -94,12 +94,12 @@ from
   WeakSensitiveDataHashingFlow::PathNode source, WeakSensitiveDataHashingFlow::PathNode sink,
   string ending, string algorithmName, string classification
 where
-  NormalHashFunctionFlow::Flow::flowPath(source.asPathNode1(), sink.asPathNode1()) and
+  NormalHashFunctionFlow::flowPath(source.asPathNode1(), sink.asPathNode1()) and
   algorithmName = sink.getNode().(NormalHashFunction::Sink).getAlgorithmName() and
   classification = source.getNode().(NormalHashFunction::Source).getClassification() and
   ending = "."
   or
-  ComputationallyExpensiveHashFunctionFlow::Flow::flowPath(source.asPathNode2(), sink.asPathNode2()) and
+  ComputationallyExpensiveHashFunctionFlow::flowPath(source.asPathNode2(), sink.asPathNode2()) and
   algorithmName = sink.getNode().(ComputationallyExpensiveHashFunction::Sink).getAlgorithmName() and
   classification =
     source.getNode().(ComputationallyExpensiveHashFunction::Source).getClassification() and