diff --git a/taskcluster/test/params/fork-push.yml b/taskcluster/test/params/fork-onpush.yml
similarity index 100%
rename from taskcluster/test/params/fork-push.yml
rename to taskcluster/test/params/fork-onpush.yml
diff --git a/taskcluster/test/params/fork-release-beta.yml b/taskcluster/test/params/fork-ship-beta.yml
similarity index 100%
rename from taskcluster/test/params/fork-release-beta.yml
rename to taskcluster/test/params/fork-ship-beta.yml
diff --git a/taskcluster/test/params/fork-release-production.yml b/taskcluster/test/params/fork-ship-release.yml
similarity index 100%
rename from taskcluster/test/params/fork-release-production.yml
rename to taskcluster/test/params/fork-ship-release.yml
diff --git a/taskcluster/test/params/main-repo-push.yml b/taskcluster/test/params/main-repo-onpush.yml
similarity index 100%
rename from taskcluster/test/params/main-repo-push.yml
rename to taskcluster/test/params/main-repo-onpush.yml
diff --git a/taskcluster/test/params/main-repo-release-beta.yml b/taskcluster/test/params/main-repo-ship-beta.yml
similarity index 100%
rename from taskcluster/test/params/main-repo-release-beta.yml
rename to taskcluster/test/params/main-repo-ship-beta.yml
diff --git a/taskcluster/test/params/main-repo-release-production.yml b/taskcluster/test/params/main-repo-ship-release.yml
similarity index 100%
rename from taskcluster/test/params/main-repo-release-production.yml
rename to taskcluster/test/params/main-repo-ship-release.yml