diff --git a/src/engine/GroupBy.cpp b/src/engine/GroupBy.cpp
index 7c615ce38..b95c64d3f 100644
--- a/src/engine/GroupBy.cpp
+++ b/src/engine/GroupBy.cpp
@@ -535,11 +535,11 @@ cppcoro::generator<Result::IdTableVocabPair> GroupBy::computeResultLazily(
     lazyGroupBy.processBlock(evaluationContext, lastBlockStart, idTable.size());
     if (!singleIdTable && !resultTable.empty()) {
       currentLocalVocab.mergeWith(storedLocalVocabs);
-      Result::IdTableVocabPair pair{std::move(resultTable),
-                                    std::move(currentLocalVocab)};
-      co_yield pair;
-      // Re-use buffer if not moved out
-      resultTable = std::move(pair.idTable_);
+      Result::IdTableVocabPair outputPair{std::move(resultTable),
+                                          std::move(currentLocalVocab)};
+      co_yield outputPair;
+      // Reuse buffer if not moved out
+      resultTable = std::move(outputPair.idTable_);
       resultTable.clear();
       currentLocalVocab = LocalVocab{};
       storedLocalVocabs.clear();
diff --git a/src/engine/Service.cpp b/src/engine/Service.cpp
index a7dcb13e7..4aa9b83b8 100644
--- a/src/engine/Service.cpp
+++ b/src/engine/Service.cpp
@@ -264,7 +264,7 @@ cppcoro::generator<Result::IdTableVocabPair> Service::computeResultLazily(
         Result::IdTableVocabPair pair{std::move(idTable),
                                       std::move(localVocab)};
         co_yield pair;
-        // Move back to re-use buffer if not moved out.
+        // Move back to reuse buffer if not moved out.
         idTable = std::move(pair.idTable_);
         idTable.clear();
         localVocab = LocalVocab{};
diff --git a/test/ResultTest.cpp b/test/ResultTest.cpp
index 04aa78cdb..251a7539a 100644
--- a/test/ResultTest.cpp
+++ b/test/ResultTest.cpp
@@ -40,7 +40,7 @@ std::vector<cppcoro::generator<Result::IdTableVocabPair>> getAllSubSplits(
             if (splitIndex < split.size() && split[splitIndex] == i) {
               Result::IdTableVocabPair pair{std::move(subSplit), LocalVocab{}};
               co_yield pair;
-              // Move back if not moved out to re-use buffer.
+              // Move back if not moved out to reuse buffer.
               subSplit = std::move(pair.idTable_);
               subSplit.clear();
               ++splitIndex;