diff --git a/src/plugins/autotest/testrunner.cpp b/src/plugins/autotest/testrunner.cpp
index 58192741855..206dca8da41 100644
--- a/src/plugins/autotest/testrunner.cpp
+++ b/src/plugins/autotest/testrunner.cpp
@@ -444,7 +444,7 @@ void TestRunner::runTestsHelper()
         const Group group {
             optional,
             Storage(storage),
-            OnGroupSetup(onSetup),
+            onGroupSetup(onSetup),
             ProcessTask(onProcessSetup, onProcessDone, onProcessDone)
         };
         tasks.append(group);
diff --git a/src/plugins/clangtools/clangtoolrunner.cpp b/src/plugins/clangtools/clangtoolrunner.cpp
index 8afdd60f186..40cbf75d47e 100644
--- a/src/plugins/clangtools/clangtoolrunner.cpp
+++ b/src/plugins/clangtools/clangtoolrunner.cpp
@@ -184,7 +184,7 @@ TaskItem clangToolTask(const AnalyzeInputData &input,
 
     const Group group {
         Storage(storage),
-        OnGroupSetup(onSetup),
+        onGroupSetup(onSetup),
         Group {
             optional,
             ProcessTask(onProcessSetup, onProcessDone, onProcessError)
diff --git a/src/plugins/coreplugin/locator/directoryfilter.cpp b/src/plugins/coreplugin/locator/directoryfilter.cpp
index 6100181ff43..0c1dd72bb77 100644
--- a/src/plugins/coreplugin/locator/directoryfilter.cpp
+++ b/src/plugins/coreplugin/locator/directoryfilter.cpp
@@ -95,7 +95,7 @@ DirectoryFilter::DirectoryFilter(Id id)
             m_cache.setFilePaths(async.result());
     };
     const Group root {
-        OnGroupSetup(groupSetup),
+        onGroupSetup(groupSetup),
         AsyncTask<FilePaths>(asyncSetup, asyncDone)
     };
     setRefreshRecipe(root);
diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.cpp b/src/plugins/coreplugin/locator/ilocatorfilter.cpp
index 31f23cafd24..3c0ab0a5659 100644
--- a/src/plugins/coreplugin/locator/ilocatorfilter.cpp
+++ b/src/plugins/coreplugin/locator/ilocatorfilter.cpp
@@ -472,9 +472,9 @@ void LocatorMatcher::start()
         const Group group {
             optional,
             Storage(storage),
-            OnGroupSetup(onSetup(storage, index)),
-            OnGroupDone(onDone(storage)),
-            OnGroupError(onDone(storage)),
+            onGroupSetup(onSetup(storage, index)),
+            onGroupDone(onDone(storage)),
+            onGroupError(onDone(storage)),
             task.task
         };
         parallelTasks << group;
diff --git a/src/plugins/coreplugin/locator/javascriptfilter.cpp b/src/plugins/coreplugin/locator/javascriptfilter.cpp
index e5cad19baa9..3656d673205 100644
--- a/src/plugins/coreplugin/locator/javascriptfilter.cpp
+++ b/src/plugins/coreplugin/locator/javascriptfilter.cpp
@@ -426,7 +426,7 @@ LocatorMatcherTasks JavaScriptFilter::matchers()
     };
 
     const Group root {
-        OnGroupSetup(onSetup),
+        onGroupSetup(onSetup),
         JavaScriptRequestTask(onJavaScriptSetup, onJavaScriptDone, onJavaScriptError)
     };
 
diff --git a/src/plugins/coreplugin/locator/locator.cpp b/src/plugins/coreplugin/locator/locator.cpp
index 30d996a08e8..fb9f50c3b1f 100644
--- a/src/plugins/coreplugin/locator/locator.cpp
+++ b/src/plugins/coreplugin/locator/locator.cpp
@@ -389,7 +389,7 @@ void Locator::refresh(const QList<ILocatorFilter *> &filters)
         const Group group {
             optional,
             *task,
-            OnGroupDone([this, filter] { m_refreshingFilters.removeOne(filter); })
+            onGroupDone([this, filter] { m_refreshingFilters.removeOne(filter); })
         };
         tasks.append(group);
     }
diff --git a/src/plugins/cppeditor/cppprojectupdater.cpp b/src/plugins/cppeditor/cppprojectupdater.cpp
index e848c6eba5a..c92d091396e 100644
--- a/src/plugins/cppeditor/cppprojectupdater.cpp
+++ b/src/plugins/cppeditor/cppprojectupdater.cpp
@@ -93,8 +93,8 @@ void CppProjectUpdater::update(const ProjectUpdateInfo &projectUpdateInfo,
     const Group root {
         Storage(storage),
         Group(tasks),
-        OnGroupDone(onDone),
-        OnGroupError(onError)
+        onGroupDone(onDone),
+        onGroupError(onError)
     };
     m_taskTree.reset(new TaskTree(root));
     auto progress = new Core::TaskProgress(m_taskTree.get());
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp
index e5bed027a34..fe4c4f9a6a5 100644
--- a/src/plugins/diffeditor/diffeditorplugin.cpp
+++ b/src/plugins/diffeditor/diffeditorplugin.cpp
@@ -151,8 +151,8 @@ DiffFilesController::DiffFilesController(IDocument *document)
     const Group root = {
         Storage(storage),
         TaskTreeTask(setupTree),
-        OnGroupDone(onTreeDone),
-        OnGroupError(onTreeError)
+        onGroupDone(onTreeDone),
+        onGroupError(onTreeError)
     };
     setReloadRecipe(root);
 }
diff --git a/src/plugins/git/branchmodel.cpp b/src/plugins/git/branchmodel.cpp
index 8a495a8d8f3..3bf65cf5b38 100644
--- a/src/plugins/git/branchmodel.cpp
+++ b/src/plugins/git/branchmodel.cpp
@@ -472,8 +472,8 @@ void BranchModel::refresh(const FilePath &workingDirectory, ShowError showError)
     const Group root {
         topRevisionProc,
         ProcessTask(setupForEachRef, forEachRefDone, forEachRefError),
-        OnGroupDone(finalize),
-        OnGroupError(finalize)
+        onGroupDone(finalize),
+        onGroupError(finalize)
     };
     d->refreshTask.reset(new TaskTree(root));
     d->refreshTask->start();
diff --git a/src/plugins/git/branchview.cpp b/src/plugins/git/branchview.cpp
index ff428b1b90e..c3daf9d5a88 100644
--- a/src/plugins/git/branchview.cpp
+++ b/src/plugins/git/branchview.cpp
@@ -560,7 +560,7 @@ TaskTree *BranchView::onFastForwardMerge(const std::function<void()> &callback)
         parallel,
         ProcessTask(setupMergeBase, onMergeBaseDone),
         topRevisionProc,
-        OnGroupDone([storage, callback] {
+        onGroupDone([storage, callback] {
             if (storage->mergeBase == storage->topRevision)
                 callback();
         })
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 3b4a748c0c1..5c1d82d359f 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -270,7 +270,7 @@ FileListDiffController::FileListDiffController(IDocument *document, const QStrin
             continueOnDone,
             ProcessTask(setupStaged, onStagedDone),
             ProcessTask(setupUnstaged, onUnstagedDone),
-            OnGroupDone(onStagingDone)
+            onGroupDone(onStagingDone)
         },
         postProcessTask()
     };
@@ -441,7 +441,7 @@ ShowController::ShowController(IDocument *document, const QString &id)
         };
 
         using namespace std::placeholders;
-        QList<TaskItem> tasks {parallel, continueOnDone, OnGroupError(onFollowsError)};
+        QList<TaskItem> tasks {parallel, continueOnDone, onGroupError(onFollowsError)};
         for (int i = 0, total = parents.size(); i < total; ++i) {
             tasks.append(ProcessTask(std::bind(setupFollow, _1, parents.at(i)),
                                  std::bind(onFollowDone, _1, i)));
@@ -463,14 +463,14 @@ ShowController::ShowController(IDocument *document, const QString &id)
         Storage(storage),
         Storage(diffInputStorage),
         parallel,
-        OnGroupSetup([this] { setStartupFile(VcsBase::source(this->document()).toString()); }),
+        onGroupSetup([this] { setStartupFile(VcsBase::source(this->document()).toString()); }),
         Group {
             optional,
             ProcessTask(setupDescription, onDescriptionDone),
             Group {
                 parallel,
                 optional,
-                OnGroupSetup(desciptionDetailsSetup),
+                onGroupSetup(desciptionDetailsSetup),
                 ProcessTask(setupBranches, onBranchesDone, onBranchesError),
                 ProcessTask(setupPrecedes, onPrecedesDone, onPrecedesError),
                 TaskTreeTask(setupFollows)
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index 2f257977a81..c747f756581 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -333,7 +333,7 @@ void QMakeStep::doRun()
     QList<TaskItem> processList = {ProcessTask(setupQMake, onProcessDone, onProcessError)};
     if (m_runMakeQmake)
         processList << ProcessTask(setupMakeQMake, onProcessDone, onProcessError);
-    processList << OnGroupDone(onDone);
+    processList << onGroupDone(onDone);
 
     runTaskTree(Group(processList));
 }
diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
index 2a7f56d2f34..768553ff7a7 100644
--- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
+++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp
@@ -261,18 +261,18 @@ Group QnxDeployQtLibrariesDialogPrivate::deployRecipe()
         return TaskAction::Continue;
     };
     const Group root {
-        OnGroupSetup(setupHandler),
+        onGroupSetup(setupHandler),
         Group {
             optional,
             checkDirTask()
         },
         Group {
-            OnGroupSetup(subGroupSetupHandler),
+            onGroupSetup(subGroupSetupHandler),
             removeDirTask(),
             uploadTask(),
             chmodTree()
         },
-        OnGroupDone(doneHandler)
+        onGroupDone(doneHandler)
     };
     return root;
 }
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index 8a7c1e4c029..586fc8bafd4 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -310,7 +310,7 @@ Group GenericDirectUploadStep::deployRecipe()
             chmodTree(storage),
             statTree(storage, postFilesToStat, postStatEndHandler)
         },
-        OnGroupDone(doneHandler)
+        onGroupDone(doneHandler)
     };
     return root;
 }
diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp
index e1a209664fe..ecb4296262d 100644
--- a/src/plugins/remotelinux/linuxdevicetester.cpp
+++ b/src/plugins/remotelinux/linuxdevicetester.cpp
@@ -225,7 +225,7 @@ TaskItem GenericLinuxDeviceTesterPrivate::transferTasks() const
         transferTask(FileTransferMethod::GenericCopy, storage),
         transferTask(FileTransferMethod::Sftp, storage),
         transferTask(FileTransferMethod::Rsync, storage),
-        OnGroupError([this] { emit q->errorMessage(Tr::tr("Deployment to this device will not "
+        onGroupError([this] { emit q->errorMessage(Tr::tr("Deployment to this device will not "
                                                           "work out of the box.\n"));
         })
     };
@@ -255,7 +255,7 @@ TaskItem GenericLinuxDeviceTesterPrivate::commandTask(const QString &commandName
 TaskItem GenericLinuxDeviceTesterPrivate::commandTasks() const
 {
     QList<TaskItem> tasks {continueOnError};
-    tasks.append(OnGroupSetup([this] {
+    tasks.append(onGroupSetup([this] {
         emit q->progressMessage(Tr::tr("Checking if required commands are available..."));
     }));
     for (const QString &commandName : commandsToTest())
@@ -305,8 +305,8 @@ void GenericLinuxDeviceTester::testDevice(const IDevice::Ptr &deviceConfiguratio
     if (!d->m_extraTests.isEmpty())
         taskItems << Group { d->m_extraTests };
     taskItems << d->commandTasks()
-              << OnGroupDone(std::bind(allFinished, TestSuccess))
-              << OnGroupError(std::bind(allFinished, TestFailure));
+              << onGroupDone(std::bind(allFinished, TestSuccess))
+              << onGroupError(std::bind(allFinished, TestFailure));
 
     d->m_taskTree.reset(new TaskTree(taskItems));
     d->m_taskTree->start();
diff --git a/tests/auto/solutions/tasking/tst_tasking.cpp b/tests/auto/solutions/tasking/tst_tasking.cpp
index 1efcf7096a3..a94c449dfc6 100644
--- a/tests/auto/solutions/tasking/tst_tasking.cpp
+++ b/tests/auto/solutions/tasking/tst_tasking.cpp
@@ -111,12 +111,12 @@ void tst_Tasking::validConstructs()
             Group {
                 parallel,
                 Test([](TestTask &) {}, [](const TestTask &) {}),
-                OnGroupDone([] {})
+                onGroupDone([] {})
             }
         },
         task,
-        OnGroupDone([] {}),
-        OnGroupError([] {})
+        onGroupDone([] {}),
+        onGroupError([] {})
     };
 
     const auto setupHandler = [](TestTask &) {};
@@ -272,8 +272,8 @@ void tst_Tasking::testTree_data()
             Test(setupTask(1), logDone),
             Test(setupFailingTask(2), logDone, logError),
             Test(setupTask(3), logDone),
-            OnGroupDone(groupDone(0)),
-            OnGroupError(groupError(0))
+            onGroupDone(groupDone(0)),
+            onGroupError(groupError(0))
         };
     };
     const auto constructDynamicHierarchy = [=](TaskAction taskAction) {
@@ -283,39 +283,39 @@ void tst_Tasking::testTree_data()
                 Test(setupTask(1), logDone)
             },
             Group {
-                OnGroupSetup([=] { return taskAction; }),
+                onGroupSetup([=] { return taskAction; }),
                 Test(setupTask(2), logDone),
                 Test(setupTask(3), logDone),
                 Test(setupTask(4), logDone)
             },
-            OnGroupDone(groupDone(0)),
-            OnGroupError(groupError(0))
+            onGroupDone(groupDone(0)),
+            onGroupError(groupError(0))
         };
     };
 
     {
         const Group root1 {
             Storage(storage),
-            OnGroupDone(groupDone(0)),
-            OnGroupError(groupError(0))
+            onGroupDone(groupDone(0)),
+            onGroupError(groupError(0))
         };
         const Group root2 {
             Storage(storage),
-            OnGroupSetup([] { return TaskAction::Continue; }),
-            OnGroupDone(groupDone(0)),
-            OnGroupError(groupError(0))
+            onGroupSetup([] { return TaskAction::Continue; }),
+            onGroupDone(groupDone(0)),
+            onGroupError(groupError(0))
         };
         const Group root3 {
             Storage(storage),
-            OnGroupSetup([] { return TaskAction::StopWithDone; }),
-            OnGroupDone(groupDone(0)),
-            OnGroupError(groupError(0))
+            onGroupSetup([] { return TaskAction::StopWithDone; }),
+            onGroupDone(groupDone(0)),
+            onGroupError(groupError(0))
         };
         const Group root4 {
             Storage(storage),
-            OnGroupSetup([] { return TaskAction::StopWithError; }),
-            OnGroupDone(groupDone(0)),
-            OnGroupError(groupError(0))
+            onGroupSetup([] { return TaskAction::StopWithError; }),
+            onGroupDone(groupDone(0)),
+            onGroupError(groupError(0))
         };
         const Log logDone {{0, Handler::GroupDone}};
         const Log logError {{0, Handler::GroupError}};
@@ -410,7 +410,7 @@ void tst_Tasking::testTree_data()
             Test(setupDynamicTask(1, TaskAction::Continue), logDone, logError),
             Test(setupDynamicTask(2, TaskAction::Continue), logDone, logError),
             Group {
-                OnGroupSetup([storage] {
+                onGroupSetup([storage] {
                     storage->m_log.append({0, Handler::GroupSetup});
                     return TaskAction::StopWithError;
                 }),
@@ -438,22 +438,22 @@ void tst_Tasking::testTree_data()
                         Group {
                             Group {
                                 Test(setupTask(5), logDone, logError),
-                                OnGroupSetup(groupSetup(5)),
-                                OnGroupDone(groupDone(5))
+                                onGroupSetup(groupSetup(5)),
+                                onGroupDone(groupDone(5))
                             },
-                            OnGroupSetup(groupSetup(4)),
-                            OnGroupDone(groupDone(4))
+                            onGroupSetup(groupSetup(4)),
+                            onGroupDone(groupDone(4))
                         },
-                        OnGroupSetup(groupSetup(3)),
-                        OnGroupDone(groupDone(3))
+                        onGroupSetup(groupSetup(3)),
+                        onGroupDone(groupDone(3))
                     },
-                    OnGroupSetup(groupSetup(2)),
-                    OnGroupDone(groupDone(2))
+                    onGroupSetup(groupSetup(2)),
+                    onGroupDone(groupDone(2))
                 },
-                OnGroupSetup(groupSetup(1)),
-                OnGroupDone(groupDone(1))
+                onGroupSetup(groupSetup(1)),
+                onGroupDone(groupDone(1))
             },
-            OnGroupDone(groupDone(0))
+            onGroupDone(groupDone(0))
         };
         const Log log {
             {1, Handler::GroupSetup},
@@ -485,7 +485,7 @@ void tst_Tasking::testTree_data()
             Test(setupTask(3), logDoneAnonymously),
             Test(setupTask(4), logDoneAnonymously),
             Test(setupTask(5), logDoneAnonymously),
-            OnGroupDone(groupDone(0))
+            onGroupDone(groupDone(0))
         };
         const Log log {
             {1, Handler::Setup}, // Setup order is determined in parallel mode
@@ -525,7 +525,7 @@ void tst_Tasking::testTree_data()
             Test(setupTask(3), logDone),
             Test(setupTask(4), logDone),
             Test(setupTask(5), logDone),
-            OnGroupDone(groupDone(0))
+            onGroupDone(groupDone(0))
         };
         const Group root2 {
             Storage(storage),
@@ -534,14 +534,14 @@ void tst_Tasking::testTree_data()
             Group { Test(setupTask(3), logDone) },
             Group { Test(setupTask(4), logDone) },
             Group { Test(setupTask(5), logDone) },
-            OnGroupDone(groupDone(0))
+            onGroupDone(groupDone(0))
         };
         const Group root3 {
             Storage(storage),
             Test(setupTask(1), logDone),
             TaskTreeTask(setupSubTree),
             Test(setupTask(5), logDone),
-            OnGroupDone(groupDone(0))
+            onGroupDone(groupDone(0))
         };
         const Log log {
             {1, Handler::Setup},
@@ -575,17 +575,17 @@ void tst_Tasking::testTree_data()
                             Test(setupTask(4), logDone),
                             Group {
                                 Test(setupTask(5), logDone),
-                                OnGroupDone(groupDone(5))
+                                onGroupDone(groupDone(5))
                             },
-                            OnGroupDone(groupDone(4))
+                            onGroupDone(groupDone(4))
                         },
-                        OnGroupDone(groupDone(3))
+                        onGroupDone(groupDone(3))
                     },
-                    OnGroupDone(groupDone(2))
+                    onGroupDone(groupDone(2))
                 },
-                OnGroupDone(groupDone(1))
+                onGroupDone(groupDone(1))
             },
-            OnGroupDone(groupDone(0))
+            onGroupDone(groupDone(0))
         };
         const Log log {
             {1, Handler::Setup},
@@ -616,8 +616,8 @@ void tst_Tasking::testTree_data()
             Test(setupFailingTask(3), logDone, logError),
             Test(setupTask(4), logDone),
             Test(setupTask(5), logDone),
-            OnGroupDone(groupDone(0)),
-            OnGroupError(groupError(0))
+            onGroupDone(groupDone(0)),
+            onGroupError(groupError(0))
         };
         const Log log {
             {1, Handler::Setup},
@@ -699,8 +699,8 @@ void tst_Tasking::testTree_data()
                 Storage(storage),
                 Test(setupSleepingTask(1, firstSuccess, 1000ms), logDone, logError),
                 Test(setupSleepingTask(2, secondSuccess, 5ms), logDone, logError),
-                OnGroupDone(groupDone(0)),
-                OnGroupError(groupError(0))
+                onGroupDone(groupDone(0)),
+                onGroupError(groupError(0))
             };
         };
 
@@ -736,8 +736,8 @@ void tst_Tasking::testTree_data()
             optional,
             Test(setupFailingTask(1), logDone, logError),
             Test(setupFailingTask(2), logDone, logError),
-            OnGroupDone(groupDone(0)),
-            OnGroupError(groupError(0))
+            onGroupDone(groupDone(0)),
+            onGroupError(groupError(0))
         };
         const Log log {
             {1, Handler::Setup},
@@ -790,19 +790,19 @@ void tst_Tasking::testTree_data()
             ParallelLimit(2),
             Storage(storage),
             Group {
-                OnGroupSetup(groupSetup(1)),
+                onGroupSetup(groupSetup(1)),
                 Test(setupTask(1))
             },
             Group {
-                OnGroupSetup(groupSetup(2)),
+                onGroupSetup(groupSetup(2)),
                 Test(setupTask(2))
             },
             Group {
-                OnGroupSetup(groupSetup(3)),
+                onGroupSetup(groupSetup(3)),
                 Test(setupTask(3))
             },
             Group {
-                OnGroupSetup(groupSetup(4)),
+                onGroupSetup(groupSetup(4)),
                 Test(setupTask(4))
             }
         };
@@ -824,23 +824,23 @@ void tst_Tasking::testTree_data()
             ParallelLimit(2),
             Storage(storage),
             Group {
-                OnGroupSetup(groupSetup(1)),
+                onGroupSetup(groupSetup(1)),
                 Test(setupTask(1))
             },
             Group {
-                OnGroupSetup(groupSetup(2)),
+                onGroupSetup(groupSetup(2)),
                 Test(setupTask(2))
             },
             Group {
-                OnGroupSetup(groupSetup(3)),
+                onGroupSetup(groupSetup(3)),
                 Test(setupDynamicTask(3, TaskAction::StopWithDone))
             },
             Group {
-                OnGroupSetup(groupSetup(4)),
+                onGroupSetup(groupSetup(4)),
                 Test(setupTask(4))
             },
             Group {
-                OnGroupSetup(groupSetup(5)),
+                onGroupSetup(groupSetup(5)),
                 Test(setupTask(5))
             }
         };
@@ -864,23 +864,23 @@ void tst_Tasking::testTree_data()
             ParallelLimit(2),
             Storage(storage),
             Group {
-                OnGroupSetup(groupSetup(1)),
+                onGroupSetup(groupSetup(1)),
                 Test(setupTask(1))
             },
             Group {
-                OnGroupSetup(groupSetup(2)),
+                onGroupSetup(groupSetup(2)),
                 Test(setupTask(2))
             },
             Group {
-                OnGroupSetup(groupSetup(3)),
+                onGroupSetup(groupSetup(3)),
                 Test(setupDynamicTask(3, TaskAction::StopWithError))
             },
             Group {
-                OnGroupSetup(groupSetup(4)),
+                onGroupSetup(groupSetup(4)),
                 Test(setupTask(4))
             },
             Group {
-                OnGroupSetup(groupSetup(5)),
+                onGroupSetup(groupSetup(5)),
                 Test(setupTask(5))
             }
         };
@@ -893,23 +893,23 @@ void tst_Tasking::testTree_data()
             ParallelLimit(2),
             Storage(storage),
             Group {
-                OnGroupSetup(groupSetup(1)),
+                onGroupSetup(groupSetup(1)),
                 Test(setupSleepingTask(1, true, 10ms))
             },
             Group {
-                OnGroupSetup(groupSetup(2)),
+                onGroupSetup(groupSetup(2)),
                 Test(setupTask(2))
             },
             Group {
-                OnGroupSetup(groupSetup(3)),
+                onGroupSetup(groupSetup(3)),
                 Test(setupDynamicTask(3, TaskAction::StopWithError))
             },
             Group {
-                OnGroupSetup(groupSetup(4)),
+                onGroupSetup(groupSetup(4)),
                 Test(setupTask(4))
             },
             Group {
-                OnGroupSetup(groupSetup(5)),
+                onGroupSetup(groupSetup(5)),
                 Test(setupTask(5))
             }
         };
@@ -928,24 +928,24 @@ void tst_Tasking::testTree_data()
             Group {
                 ParallelLimit(2),
                 Group {
-                    OnGroupSetup(groupSetup(1)),
+                    onGroupSetup(groupSetup(1)),
                     Test(setupSleepingTask(1, true, 20ms))
                 },
                 Group {
-                    OnGroupSetup(groupSetup(2)),
+                    onGroupSetup(groupSetup(2)),
                     Test(setupSleepingTask(2, true, 10ms))
                 },
                 Group {
-                    OnGroupSetup(groupSetup(3)),
+                    onGroupSetup(groupSetup(3)),
                     Test(setupDynamicTask(3, TaskAction::StopWithError))
                 },
                 Group {
-                    OnGroupSetup(groupSetup(4)),
+                    onGroupSetup(groupSetup(4)),
                     Test(setupTask(4))
                 }
             },
             Group {
-                OnGroupSetup(groupSetup(5)),
+                onGroupSetup(groupSetup(5)),
                 Test(setupTask(5))
             }
         };
@@ -972,7 +972,7 @@ void tst_Tasking::testTree_data()
             Storage(storage),
             Group {
                 Storage(TreeStorage<CustomStorage>()),
-                OnGroupSetup(groupSetup(1)),
+                onGroupSetup(groupSetup(1)),
                 Group {
                     parallel,
                     Test(setupTask(1))
@@ -980,7 +980,7 @@ void tst_Tasking::testTree_data()
             },
             Group {
                 Storage(TreeStorage<CustomStorage>()),
-                OnGroupSetup(groupSetup(2)),
+                onGroupSetup(groupSetup(2)),
                 Group {
                     parallel,
                     Test(setupTask(2))
@@ -988,7 +988,7 @@ void tst_Tasking::testTree_data()
             },
             Group {
                 Storage(TreeStorage<CustomStorage>()),
-                OnGroupSetup(groupSetup(3)),
+                onGroupSetup(groupSetup(3)),
                 Group {
                     parallel,
                     Test(setupTask(3))
@@ -996,7 +996,7 @@ void tst_Tasking::testTree_data()
             },
             Group {
                 Storage(TreeStorage<CustomStorage>()),
-                OnGroupSetup(groupSetup(4)),
+                onGroupSetup(groupSetup(4)),
                 Group {
                     parallel,
                     Test(setupTask(4))
@@ -1022,27 +1022,27 @@ void tst_Tasking::testTree_data()
             Storage(storage),
             Group {
                 Storage(TreeStorage<CustomStorage>()),
-                OnGroupSetup(groupSetup(1)),
+                onGroupSetup(groupSetup(1)),
                 Group { Test(setupTask(1)) }
             },
             Group {
                 Storage(TreeStorage<CustomStorage>()),
-                OnGroupSetup(groupSetup(2)),
+                onGroupSetup(groupSetup(2)),
                 Group { Test(setupTask(2)) }
             },
             Group {
                 Storage(TreeStorage<CustomStorage>()),
-                OnGroupSetup(groupSetup(3)),
+                onGroupSetup(groupSetup(3)),
                 Group { Test(setupDynamicTask(3, TaskAction::StopWithDone)) }
             },
             Group {
                 Storage(TreeStorage<CustomStorage>()),
-                OnGroupSetup(groupSetup(4)),
+                onGroupSetup(groupSetup(4)),
                 Group { Test(setupTask(4)) }
             },
             Group {
                 Storage(TreeStorage<CustomStorage>()),
-                OnGroupSetup(groupSetup(5)),
+                onGroupSetup(groupSetup(5)),
                 Group { Test(setupTask(5)) }
             }
         };
@@ -1068,27 +1068,27 @@ void tst_Tasking::testTree_data()
             Storage(storage),
             Group {
                 Storage(TreeStorage<CustomStorage>()),
-                OnGroupSetup(groupSetup(1)),
+                onGroupSetup(groupSetup(1)),
                 Group { Test(setupTask(1)) }
             },
             Group {
                 Storage(TreeStorage<CustomStorage>()),
-                OnGroupSetup(groupSetup(2)),
+                onGroupSetup(groupSetup(2)),
                 Group { Test(setupTask(2)) }
             },
             Group {
                 Storage(TreeStorage<CustomStorage>()),
-                OnGroupSetup(groupSetup(3)),
+                onGroupSetup(groupSetup(3)),
                 Group { Test(setupDynamicTask(3, TaskAction::StopWithError)) }
             },
             Group {
                 Storage(TreeStorage<CustomStorage>()),
-                OnGroupSetup(groupSetup(4)),
+                onGroupSetup(groupSetup(4)),
                 Group { Test(setupTask(4)) }
             },
             Group {
                 Storage(TreeStorage<CustomStorage>()),
-                OnGroupSetup(groupSetup(5)),
+                onGroupSetup(groupSetup(5)),
                 Group { Test(setupTask(5)) }
             }
         };
@@ -1188,7 +1188,7 @@ void tst_Tasking::testTree_data()
             Sync(setupSync(3)),
             Test(setupTask(4)),
             Sync(setupSync(5)),
-            OnGroupDone(groupDone(0))
+            onGroupDone(groupDone(0))
         };
         const Log log {
             {1, Handler::Sync},
@@ -1209,7 +1209,7 @@ void tst_Tasking::testTree_data()
             Sync(setupSyncWithReturn(3, false)),
             Test(setupTask(4)),
             Sync(setupSync(5)),
-            OnGroupError(groupError(0))
+            onGroupError(groupError(0))
         };
         const Log log {
             {1, Handler::Sync},
@@ -1232,7 +1232,7 @@ void tst_Tasking::testTree_data()
             sequential,
             AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)),
             Group {
-                OnGroupSetup(groupSetup(2)),
+                onGroupSetup(groupSetup(2)),
                 WaitForBarrierTask(barrier),
                 Test(setupTask(2)),
                 Test(setupTask(3))
@@ -1255,7 +1255,7 @@ void tst_Tasking::testTree_data()
             parallel,
             AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)),
             Group {
-                OnGroupSetup(groupSetup(2)),
+                onGroupSetup(groupSetup(2)),
                 WaitForBarrierTask(barrier),
                 Test(setupTask(2)),
                 Test(setupTask(3))
@@ -1284,7 +1284,7 @@ void tst_Tasking::testTree_data()
             Storage(barrier),
             parallel,
             Group {
-                OnGroupSetup(groupSetup(2)),
+                onGroupSetup(groupSetup(2)),
                 WaitForBarrierTask(barrier),
                 Test(setupTask(2)),
                 Test(setupTask(3))
@@ -1308,12 +1308,12 @@ void tst_Tasking::testTree_data()
             parallel,
             AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)),
             Group {
-                OnGroupSetup(groupSetup(2)),
+                onGroupSetup(groupSetup(2)),
                 WaitForBarrierTask(barrier),
                 Test(setupTask(4))
             },
             Group {
-                OnGroupSetup(groupSetup(3)),
+                onGroupSetup(groupSetup(3)),
                 WaitForBarrierTask(barrier),
                 Test(setupTask(5))
             }
@@ -1341,7 +1341,7 @@ void tst_Tasking::testTree_data()
             Group {
                 Group {
                     parallel,
-                    OnGroupSetup(groupSetup(1)),
+                    onGroupSetup(groupSetup(1)),
                     WaitForBarrierTask(barrier),
                     WaitForBarrierTask(barrier2)
                 },
@@ -1383,7 +1383,7 @@ void tst_Tasking::testTree_data()
             AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)),
             AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 2)),
             Group {
-                OnGroupSetup(groupSetup(2)),
+                onGroupSetup(groupSetup(2)),
                 WaitForBarrierTask(barrier),
                 Test(setupTask(2)),
                 Test(setupTask(3))
@@ -1409,7 +1409,7 @@ void tst_Tasking::testTree_data()
             AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)),
             AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)),
             Group {
-                OnGroupSetup(groupSetup(2)),
+                onGroupSetup(groupSetup(2)),
                 WaitForBarrierTask(barrier),
                 Test(setupTask(2)),
                 Test(setupTask(3))
@@ -1440,7 +1440,7 @@ void tst_Tasking::testTree_data()
             Storage(barrier),
             parallel,
             Group {
-                OnGroupSetup(groupSetup(2)),
+                onGroupSetup(groupSetup(2)),
                 WaitForBarrierTask(barrier),
                 Test(setupTask(2)),
                 Test(setupTask(3))
@@ -1468,12 +1468,12 @@ void tst_Tasking::testTree_data()
             AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)),
             AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)),
             Group {
-                OnGroupSetup(groupSetup(2)),
+                onGroupSetup(groupSetup(2)),
                 WaitForBarrierTask(barrier),
                 Test(setupTask(4))
             },
             Group {
-                OnGroupSetup(groupSetup(3)),
+                onGroupSetup(groupSetup(3)),
                 WaitForBarrierTask(barrier),
                 Test(setupTask(5))
             }
diff --git a/tests/auto/utils/async/tst_async.cpp b/tests/auto/utils/async/tst_async.cpp
index 4a496f93a00..01c3306a3bf 100644
--- a/tests/auto/utils/async/tst_async.cpp
+++ b/tests/auto/utils/async/tst_async.cpp
@@ -503,13 +503,13 @@ void tst_Async::mapReduce_data()
                                 const DoneHandler &doneHandler) {
         return Group {
             executeMode,
-            OnGroupSetup(initTree),
+            onGroupSetup(initTree),
             AsyncTask<int>(std::bind(setupHandler, _1, 1), handleAsync),
             AsyncTask<int>(std::bind(setupHandler, _1, 2), handleAsync),
             AsyncTask<int>(std::bind(setupHandler, _1, 3), handleAsync),
             AsyncTask<int>(std::bind(setupHandler, _1, 4), handleAsync),
             AsyncTask<int>(std::bind(setupHandler, _1, 5), handleAsync),
-            OnGroupDone(doneHandler)
+            onGroupDone(doneHandler)
         };
     };
 
@@ -539,7 +539,7 @@ void tst_Async::mapReduce_data()
     };
     const Group simpleRoot = {
         sequential,
-        OnGroupSetup([] { s_sum = 0; }),
+        onGroupSetup([] { s_sum = 0; }),
         AsyncTask<int>(std::bind(setupSimpleAsync, _1, 1), handleSimpleAsync),
         AsyncTask<int>(std::bind(setupSimpleAsync, _1, 2), handleSimpleAsync),
         AsyncTask<int>(std::bind(setupSimpleAsync, _1, 3), handleSimpleAsync)
@@ -554,7 +554,7 @@ void tst_Async::mapReduce_data()
     };
     const Group stringRoot = {
         parallel,
-        OnGroupSetup([] { s_sum = 90.0; }),
+        onGroupSetup([] { s_sum = 90.0; }),
         AsyncTask<int>(std::bind(setupStringAsync, _1, "blubb"), handleStringAsync),
         AsyncTask<int>(std::bind(setupStringAsync, _1, "foo"), handleStringAsync),
         AsyncTask<int>(std::bind(setupStringAsync, _1, "blah"), handleStringAsync)
diff --git a/tests/manual/tasktree/main.cpp b/tests/manual/tasktree/main.cpp
index 6b6db61adeb..de575346bf8 100644
--- a/tests/manual/tasktree/main.cpp
+++ b/tests/manual/tasktree/main.cpp
@@ -172,16 +172,16 @@ int main(int argc, char *argv[])
         const Group root {
             rootGroup->executeMode(),
             Workflow(rootGroup->workflowPolicy()),
-            OnGroupSetup([rootGroup] { rootGroup->setState(State::Running); }),
-            OnGroupDone([rootGroup] { rootGroup->setState(State::Done); }),
-            OnGroupError([rootGroup] { rootGroup->setState(State::Error); }),
+            onGroupSetup([rootGroup] { rootGroup->setState(State::Running); }),
+            onGroupDone([rootGroup] { rootGroup->setState(State::Done); }),
+            onGroupError([rootGroup] { rootGroup->setState(State::Error); }),
 
             Group {
                 groupTask_1->executeMode(),
                 Workflow(groupTask_1->workflowPolicy()),
-                OnGroupSetup([groupTask_1] { groupTask_1->setState(State::Running); }),
-                OnGroupDone([groupTask_1] { groupTask_1->setState(State::Done); }),
-                OnGroupError([groupTask_1] { groupTask_1->setState(State::Error); }),
+                onGroupSetup([groupTask_1] { groupTask_1->setState(State::Running); }),
+                onGroupDone([groupTask_1] { groupTask_1->setState(State::Done); }),
+                onGroupError([groupTask_1] { groupTask_1->setState(State::Error); }),
 
                 taskItem(task_1_1),
                 taskItem(task_1_2),
@@ -192,18 +192,18 @@ int main(int argc, char *argv[])
             Group {
                 groupTask_4->executeMode(),
                 Workflow(groupTask_4->workflowPolicy()),
-                OnGroupSetup([groupTask_4] { groupTask_4->setState(State::Running); }),
-                OnGroupDone([groupTask_4] { groupTask_4->setState(State::Done); }),
-                OnGroupError([groupTask_4] { groupTask_4->setState(State::Error); }),
+                onGroupSetup([groupTask_4] { groupTask_4->setState(State::Running); }),
+                onGroupDone([groupTask_4] { groupTask_4->setState(State::Done); }),
+                onGroupError([groupTask_4] { groupTask_4->setState(State::Error); }),
 
                 taskItem(task_4_1),
                 taskItem(task_4_2),
                 Group {
                     groupTask_4_3->executeMode(),
                     Workflow(groupTask_4_3->workflowPolicy()),
-                    OnGroupSetup([groupTask_4_3] { groupTask_4_3->setState(State::Running); }),
-                    OnGroupDone([groupTask_4_3] { groupTask_4_3->setState(State::Done); }),
-                    OnGroupError([groupTask_4_3] { groupTask_4_3->setState(State::Error); }),
+                    onGroupSetup([groupTask_4_3] { groupTask_4_3->setState(State::Running); }),
+                    onGroupDone([groupTask_4_3] { groupTask_4_3->setState(State::Done); }),
+                    onGroupError([groupTask_4_3] { groupTask_4_3->setState(State::Error); }),
 
                     taskItem(task_4_3_1),
                     taskItem(task_4_3_2),