3 files changed, 5 insertions, 4 deletions
diff --git a/tools/kleaver/main.cpp b/tools/kleaver/main.cpp
index 22c23422..eed4e4c9 100644
--- a/tools/kleaver/main.cpp
+++ b/tools/kleaver/main.cpp
@@ -296,7 +296,7 @@ static bool EvaluateInputAST(const char *Filename,
 
   delete S;
 
-  if (uint64_t queries = *theStatisticManager->getStatisticByName("Queries")) {
+  if (uint64_t queries = *theStatisticManager->getStatisticByName("SolverQueries")) {
     llvm::outs()
       << "--\n"
       << "total queries = " << queries << '\n'
diff --git a/tools/klee-stats/klee-stats b/tools/klee-stats/klee-stats
index be30a0ca..5e49587b 100755
--- a/tools/klee-stats/klee-stats
+++ b/tools/klee-stats/klee-stats
@@ -50,8 +50,9 @@ Legend = [
     ('AvgActiveStates', 'average number of active states', "AvgStates"),
     ('InhibitedForks', 'number of inhibited state forks due to e.g. memory pressure', "InhibitedForks"),
     # - constraint caching/solving
-    ('Queries', 'number of queries issued to the constraint solver', "NumQueries"),
-    ('QueryConstructs', 'number of query constructs for all queries send to the constraint solver', "NumQueryConstructs"),
+    ('Queries', 'number of queries issued to the solver chain', "Queries"),
+    ('SolverQueries', 'number of queries issued to the constraint solver', "SolverQueries"),
+    ('SolverQueryConstructs', 'number of query constructs for all queries send to the constraint solver', "NumQueryConstructs"),
     ('AvgSolverQuerySize', 'average number of query constructs per query issued to the constraint solver', "AvgQC"),
     ('QCacheMisses', 'Query cache misses', "QueryCacheMisses"),
     ('QCacheHits', 'Query cache hits', "QueryCacheHits"),
diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp
index 0b76e904..ddb1faec 100644
--- a/tools/klee/main.cpp
+++ b/tools/klee/main.cpp
@@ -1547,7 +1547,7 @@ int main(int argc, char **argv, char **envp) {
   delete interpreter;
 
   uint64_t queries =
-    *theStatisticManager->getStatisticByName("Queries");
+    *theStatisticManager->getStatisticByName("SolverQueries");
   uint64_t queriesValid =
     *theStatisticManager->getStatisticByName("QueriesValid");
   uint64_t queriesInvalid =