2 files changed, 3 insertions, 3 deletions
diff --git a/include/framework/scheduling/Epoch.h b/include/framework/scheduling/Epoch.h
index fc08d57..4e1b8a2 100644
--- a/include/framework/scheduling/Epoch.h
+++ b/include/framework/scheduling/Epoch.h
@@ -170,7 +170,7 @@ public:
      * isn't, return true and set a flag indicating that
      * there is an active merge.
      */
-    bool prepare_merge() {
+    bool prepare_reconstruction() {
         auto old = m_active_merge.load();
         if (old) {
             return false;
diff --git a/include/framework/scheduling/Task.h b/include/framework/scheduling/Task.h
index c10ed8b..16f5e58 100644
--- a/include/framework/scheduling/Task.h
+++ b/include/framework/scheduling/Task.h
@@ -17,9 +17,9 @@
 namespace de {
 
 template <RecordInterface R, ShardInterface S, QueryInterface Q, LayoutPolicy L>
-struct MergeArgs {
+struct ReconstructionArgs {
     Epoch<R, S, Q, L> *epoch;
-    std::vector<MergeTask> merges;
+    std::vector<ReconstructionTask> merges;
     std::promise<bool> result;
     bool compaction;
     void *extension;