diff --git a/taskcluster/kinds/all-pipeline/kind.yml b/taskcluster/kinds/all/kind.yml
similarity index 96%
rename from taskcluster/kinds/all-pipeline/kind.yml
rename to taskcluster/kinds/all/kind.yml
index bfc4de780..26deeabb4 100644
--- a/taskcluster/kinds/all-pipeline/kind.yml
+++ b/taskcluster/kinds/all/kind.yml
@@ -23,10 +23,10 @@ kind-dependencies:
     - analyze-mono
 
 tasks:
-    all-pipeline:
+    all:
         description: Dummy task that ensures all parts of training pipeline will run
         attributes:
-            stage: all-pipeline
+            stage: all
             src_locale: "{src_locale}"
             trg_locale: "{trg_locale}"
 
diff --git a/taskcluster/test/test_default_params.py b/taskcluster/test/test_default_params.py
index c3e13516f..ee00c3505 100644
--- a/taskcluster/test/test_default_params.py
+++ b/taskcluster/test/test_default_params.py
@@ -101,7 +101,7 @@
 
 def test_last_task_is_targeted(target_task_set: TaskGraph):
     """Ensure that the last task in the pipeline is targeted by default"""
-    assert any([task == "all-pipeline-ru-en-1" for task in target_task_set.tasks])
+    assert any([task == "all-ru-en-1" for task in target_task_set.tasks])
 
 
 def test_cached_tasks_optimized_away(optimized_task_graph: TaskGraph):
diff --git a/tests/test_preflight_check.py b/tests/test_preflight_check.py
index f0bf522ac..db871c06a 100644
--- a/tests/test_preflight_check.py
+++ b/tests/test_preflight_check.py
@@ -42,7 +42,7 @@ def test_task_group():
     assert "Training config" not in output
     assert "Visualization" not in output
 
-    assert "all-pipeline-en-ru-1" in output
+    assert "all-en-ru-1" in output
     assert not opened_url