diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java
index 868e4b8..d206336 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java
@@ -136,7 +136,7 @@
             IHyracksClientConnection hcc = (IHyracksClientConnection) ctx.get(HYRACKS_CONNECTION_ATTR);
             IResultSet resultSet = ServletUtil.getResultSet(hcc, appCtx, ctx);
             IParser parser = parserFactory.createParser(query);
-            List<Statement> aqlStatements = parser.parse();
+            List<Statement> statements = parser.parse();
             SessionConfig sessionConfig = new SessionConfig(format, true, isSet(executeQuery), true, planFormat);
             sessionConfig.set(SessionConfig.FORMAT_HTML, true);
             sessionConfig.set(SessionConfig.FORMAT_CSV_HEADER, csvAndHeader);
@@ -145,7 +145,7 @@
                     isSet(printLogicalPlanParam), isSet(printOptimizedLogicalPlanParam), isSet(printJob));
             SessionOutput sessionOutput = new SessionOutput(sessionConfig, out);
             MetadataManager.INSTANCE.init();
-            IStatementExecutor translator = statementExectorFactory.create(appCtx, aqlStatements, sessionOutput,
+            IStatementExecutor translator = statementExectorFactory.create(appCtx, statements, sessionOutput,
                     compilationProvider, componentProvider);
             double duration;
             long startTime = System.currentTimeMillis();
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiServlet.java
index 99c7308..0aa2211 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiServlet.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiServlet.java
@@ -190,10 +190,10 @@
             response.setStatus(HttpResponseStatus.OK);
             IHyracksClientConnection hcc = (IHyracksClientConnection) ctx.get(HYRACKS_CONNECTION_ATTR);
             IParser parser = parserFactory.createParser(query);
-            List<Statement> aqlStatements = parser.parse();
-            validate(aqlStatements);
+            List<Statement> statements = parser.parse();
+            validate(statements);
             MetadataManager.INSTANCE.init();
-            IStatementExecutor translator = statementExecutorFactory.create(appCtx, aqlStatements, sessionOutput,
+            IStatementExecutor translator = statementExecutorFactory.create(appCtx, statements, sessionOutput,
                     compilationProvider, componentProvider);
             final IResultSet resultSet = ServletUtil.getResultSet(hcc, appCtx, ctx);
             final IRequestParameters requestParameters = new RequestParameters(resultSet,
@@ -222,8 +222,8 @@
         }
     }
 
-    private void validate(List<Statement> aqlStatements) throws AsterixException {
-        for (Statement st : aqlStatements) {
+    private void validate(List<Statement> statements) throws AsterixException {
+        for (Statement st : statements) {
             if ((st.getCategory() & getAllowedCategories()) == 0) {
                 throw new AsterixException(String.format(getErrorMessage(), st.getKind()));
             }
diff --git a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java
index c6095bd..9f886b5 100644
--- a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java
+++ b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java
@@ -36,13 +36,13 @@
 public class ADGenDmlTranslator extends AbstractLangTranslator {
 
     private final MetadataTransactionContext mdTxnCtx;
-    private final List<Statement> aqlStatements;
+    private final List<Statement> statements;
     private Map<TypeSignature, IAType> types;
     private Map<TypeSignature, TypeDataGen> typeDataGenMap;
 
-    public ADGenDmlTranslator(MetadataTransactionContext mdTxnCtx, List<Statement> aqlStatements) {
+    public ADGenDmlTranslator(MetadataTransactionContext mdTxnCtx, List<Statement> statements) {
         this.mdTxnCtx = mdTxnCtx;
-        this.aqlStatements = aqlStatements;
+        this.statements = statements;
     }
 
     public void translate() throws AlgebricksException {
@@ -50,7 +50,7 @@
         types = new HashMap<>();
         typeDataGenMap = new HashMap<>();
 
-        for (Statement stmt : aqlStatements) {
+        for (Statement stmt : statements) {
             if (stmt.getKind() == Statement.Kind.TYPE_DECL) {
                 TypeDecl td = (TypeDecl) stmt;
                 String typeDataverse =
@@ -70,7 +70,7 @@
     }
 
     private String getDefaultDataverse() {
-        for (Statement stmt : aqlStatements) {
+        for (Statement stmt : statements) {
             if (stmt.getKind() == Statement.Kind.DATAVERSE_DECL) {
                 return ((DataverseDecl) stmt).getDataverseName().getValue();
             }