diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index b024934..1aaa7c7 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -51,7 +51,7 @@
     ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
 
 - project:
-    name: 'metal3io_project_infra'
+    name: 'project_infra'
     branch: '${{ghprbActualCommit}}'
     repo:
       org: "metal3-io"
@@ -74,16 +74,16 @@
     - keep_v1a5_test_centos_alive
 
 - project:
-    name: 'metal3io_project_infra_cleanup'
+    name: 'project_infra_cleanup'
     repo:
       org: "metal3-io"
       name: "project-infra"
     ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
     jobs:
-    - master_clean
+    - main_clean
 
 - project:
-    name: "metal3io_bmo"
+    name: "bmo"
     repo:
       org: "metal3-io"
       name: "baremetal-operator"
@@ -101,7 +101,7 @@
     - feature_tests_ubuntu
 
 - project:
-    name: "metal3io_ipam"
+    name: "ipam"
     repo:
       org: "metal3-io"
       name: "ip-address-manager"
@@ -118,28 +118,28 @@
     - keep_v1a5_test_centos_alive
 
 - project:
-    name: "metal3io_metal3_dev_env"
+    name: "metal3_dev_env"
     jobs:
     - capm3_v1a4_integration_tests_centos
     - capm3_v1a4_integration_tests_ubuntu
-    - capm3_v1a4_master_integration_tests_centos
-    - capm3_v1a4_master_integration_tests_ubuntu
+    - capm3_v1a4_main_integration_tests_centos
+    - capm3_v1a4_main_integration_tests_ubuntu
     - capm3_v1a5_integration_tests_centos
     - capm3_v1a5_integration_tests_ubuntu
-    - capm3_v1a5_master_integration_tests_centos
-    - capm3_v1a5_master_integration_tests_ubuntu
+    - capm3_v1a5_main_integration_tests_centos
+    - capm3_v1a5_main_integration_tests_ubuntu
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu
-    - capm3_v1b1_master_integration_tests_centos
-    - capm3_v1b1_master_integration_tests_ubuntu
+    - capm3_v1b1_main_integration_tests_centos
+    - capm3_v1b1_main_integration_tests_ubuntu
     - feature_tests_ubuntu
     - feature_tests_centos
     - feature_tests_upgrade_ubuntu
-    - master_feature_tests_ubuntu
-    - master_feature_tests_centos
-    - master_feature_tests_upgrade_ubuntu
+    - main_feature_tests_ubuntu
+    - main_feature_tests_centos
+    - main_feature_tests_upgrade_ubuntu
     - bml_integration_tests_centos
-    - bml_master_integration_tests_centos
+    - bml_main_integration_tests_centos
     - keep_v1b1_test_ubuntu_alive
     - keep_v1b1_test_centos_alive
     - keep_v1a5_test_ubuntu_alive
@@ -150,7 +150,7 @@
       name: "metal3-dev-env"
 
 - project:
-    name: "metal3io_capi_m3"
+    name: "capm3"
     repo:
       org: "metal3-io"
       name: "cluster-api-provider-metal3"
@@ -161,15 +161,15 @@
     - capm3_v1a5_integration_tests_ubuntu
     - capm3_v1a5_e2e_tests_ubuntu
     - capm3_v1a5_e2e_tests_centos
-    - capm3_v1a5_master_e2e_tests_ubuntu
-    - capm3_v1a5_master_e2e_tests_centos
+    - capm3_v1a5_main_e2e_tests_ubuntu
+    - capm3_v1a5_main_e2e_tests_centos
     - capm3_v1b1_integration_tests_centos
     - capm3_v1b1_integration_tests_ubuntu
     - capm3_v1b1_e2e_tests_centos
     - capm3_v1b1_e2e_tests_ubuntu
     - capm3_v1b1_e2e_upgrade_tests_ubuntu
-    - capm3_v1b1_master_e2e_tests_centos
-    - capm3_v1b1_master_e2e_tests_ubuntu
+    - capm3_v1b1_main_e2e_tests_centos
+    - capm3_v1b1_main_e2e_tests_ubuntu
     - keep_v1b1_test_ubuntu_alive
     - keep_v1b1_test_centos_alive
     - keep_v1a5_test_ubuntu_alive
@@ -177,7 +177,7 @@
 
 
 - project:
-    name: "metal3io_ironic_image"
+    name: "ironic_image"
     repo:
       org: "metal3-io"
       name: "ironic-image"
@@ -194,7 +194,7 @@
     - keep_v1a5_test_centos_alive
 
 - project:
-    name: "metal3io_ironic_ipa_downloader"
+    name: "ironic_ipa_downloader"
     repo:
       org: "metal3-io"
       name: "ironic-ipa-downloader"