diff --git a/src/libs/utils/tasktree.cpp b/src/libs/utils/tasktree.cpp
index dccb023ff31..e27cd8f8bbd 100644
--- a/src/libs/utils/tasktree.cpp
+++ b/src/libs/utils/tasktree.cpp
@@ -1264,7 +1264,7 @@ void TaskNode::invokeEndHandler(bool success)
     recipe described by the Group root element.
 
     As TaskTree is also an asynchronous task, it can be a part of another TaskTree.
-    To place a nested TaskTree inside another TaskTree, insert the Tasking::Tree
+    To place a nested TaskTree inside another TaskTree, insert the Tasking::TaskTreeTask
     element into other tree's Group element.
 
     TaskTree reports progress of completed tasks when running. The progress value
@@ -1455,13 +1455,13 @@ void TaskTree::setupStorageHandler(const Tasking::TreeStorageBase &storage,
     }
 }
 
-TaskTreeAdapter::TaskTreeAdapter()
+TaskTreeTaskAdapter::TaskTreeTaskAdapter()
 {
     connect(task(), &TaskTree::done, this, [this] { emit done(true); });
     connect(task(), &TaskTree::errorOccurred, this, [this] { emit done(false); });
 }
 
-void TaskTreeAdapter::start()
+void TaskTreeTaskAdapter::start()
 {
     task()->start();
 }
diff --git a/src/libs/utils/tasktree.h b/src/libs/utils/tasktree.h
index 418feb797ec..46333c3dc86 100644
--- a/src/libs/utils/tasktree.h
+++ b/src/libs/utils/tasktree.h
@@ -413,10 +413,10 @@ private:
     TaskTreePrivate *d;
 };
 
-class QTCREATOR_UTILS_EXPORT TaskTreeAdapter : public Tasking::TaskAdapter<TaskTree>
+class QTCREATOR_UTILS_EXPORT TaskTreeTaskAdapter : public Tasking::TaskAdapter<TaskTree>
 {
 public:
-    TaskTreeAdapter();
+    TaskTreeTaskAdapter();
     void start() final;
 };
 
@@ -431,4 +431,4 @@ template <typename ...Args>\
 using CustomTaskName = CustomTask<TaskAdapterClass<Args...>>;\
 } // namespace Utils::Tasking
 
-QTC_DECLARE_CUSTOM_TASK(Tree, Utils::TaskTreeAdapter);
+QTC_DECLARE_CUSTOM_TASK(TaskTreeTask, Utils::TaskTreeTaskAdapter);
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp
index 5f48dc13a97..e5bed027a34 100644
--- a/src/plugins/diffeditor/diffeditorplugin.cpp
+++ b/src/plugins/diffeditor/diffeditorplugin.cpp
@@ -150,7 +150,7 @@ DiffFilesController::DiffFilesController(IDocument *document)
 
     const Group root = {
         Storage(storage),
-        Tree(setupTree),
+        TaskTreeTask(setupTree),
         OnGroupDone(onTreeDone),
         OnGroupError(onTreeError)
     };
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index df6249f3dbf..fad0d19afb6 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -472,7 +472,7 @@ ShowController::ShowController(IDocument *document, const QString &id)
                 OnGroupSetup(desciptionDetailsSetup),
                 ProcessTask(setupBranches, onBranchesDone, onBranchesError),
                 ProcessTask(setupPrecedes, onPrecedesDone, onPrecedesError),
-                Tree(setupFollows)
+                TaskTreeTask(setupFollows)
             }
         },
         Group {
diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
index f87d9a85712..e06303cffaa 100644
--- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
+++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
@@ -230,7 +230,7 @@ TaskItem QnxDeployQtLibrariesDialogPrivate::chmodTree()
         }
         tree.setupRoot(chmodList);
     };
-    return Tree{setupChmodHandler};
+    return TaskTreeTask{setupChmodHandler};
 }
 
 Group QnxDeployQtLibrariesDialogPrivate::deployRecipe()
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index 7388ceee039..a8f2200cf80 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -186,7 +186,7 @@ TaskItem GenericDirectUploadStep::statTree(const TreeStorage<UploadStorage> &sto
         }
         tree.setupRoot({statList});
     };
-    return Tree(setupHandler);
+    return TaskTreeTask(setupHandler);
 }
 
 TaskItem GenericDirectUploadStep::uploadTask(const TreeStorage<UploadStorage> &storage)
@@ -263,7 +263,7 @@ TaskItem GenericDirectUploadStep::chmodTree(const TreeStorage<UploadStorage> &st
         }
         tree.setupRoot({chmodList});
     };
-    return Tree(setupChmodHandler);
+    return TaskTreeTask(setupChmodHandler);
 }
 
 Group GenericDirectUploadStep::deployRecipe()
diff --git a/tests/auto/utils/tasktree/tst_tasktree.cpp b/tests/auto/utils/tasktree/tst_tasktree.cpp
index ae696e9fd7c..ea60db9745d 100644
--- a/tests/auto/utils/tasktree/tst_tasktree.cpp
+++ b/tests/auto/utils/tasktree/tst_tasktree.cpp
@@ -550,7 +550,7 @@ void tst_TaskTree::testTree_data()
         const Group root3 {
             Storage(storage),
             Test(setupTask(1), logDone),
-            Tree(setupSubTree),
+            TaskTreeTask(setupSubTree),
             Test(setupTask(5), logDone),
             OnGroupDone(groupDone(0))
         };