diff --git a/powershell/ql/lib/semmle/code/powershell/ForEachStmt.qll b/powershell/ql/lib/semmle/code/powershell/ForEachStmt.qll
index d1b4975c179..abe61126998 100644
--- a/powershell/ql/lib/semmle/code/powershell/ForEachStmt.qll
+++ b/powershell/ql/lib/semmle/code/powershell/ForEachStmt.qll
@@ -9,8 +9,7 @@ class ForEachStmt extends @foreach_statement, LoopStmt {
 
   VarAccess getVariable() { foreach_statement(this, result, _, _, _) } // TODO: Change @ast to @variable_expression in dbscheme
 
-  /** ..., if any. */
-  PipelineBase getCondition() { foreach_statement(this, _, result, _, _) } // TODO: Change @ast to @pipeline_base in dbscheme
+  PipelineBase getIterableExpr() { foreach_statement(this, _, result, _, _) } // TODO: Change @ast to @pipeline_base in dbscheme
 
   predicate isParallel() { foreach_statement(this, _, _, _, 1) }
 }
diff --git a/powershell/ql/lib/semmle/code/powershell/StatementBlock.qll b/powershell/ql/lib/semmle/code/powershell/StatementBlock.qll
index c493372b8a5..74d2d36c5b2 100644
--- a/powershell/ql/lib/semmle/code/powershell/StatementBlock.qll
+++ b/powershell/ql/lib/semmle/code/powershell/StatementBlock.qll
@@ -3,17 +3,17 @@ import powershell
 class StmtBlock extends @statement_block, Ast {
   override SourceLocation getLocation() { statement_block_location(this, result) }
 
-  int getNumStatements() { statement_block(this, result, _) }
+  int getNumberOfStmts() { statement_block(this, result, _) }
 
   int getNumTraps() { statement_block(this, _, result) }
 
-  Stmt getStatement(int index) { statement_block_statement(this, index, result) }
+  Stmt getStmt(int index) { statement_block_statement(this, index, result) }
 
-  Stmt getAStatement() { result = this.getStatement(_) }
+  Stmt getAStmt() { result = this.getStmt(_) }
 
-  TrapStmt getTrapStatement(int index) { statement_block_trap(this, index, result) }
+  TrapStmt getTrapStmt(int index) { statement_block_trap(this, index, result) }
 
-  TrapStmt getATrapStatement() { result = this.getTrapStatement(_) }
+  TrapStmt getATrapStmt() { result = this.getTrapStmt(_) }
 
   override string toString() { result = "{...}" }
 }