diff --git a/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle b/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
index 4a8e312bb..319263cd8 100644
--- a/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/rhels7.3_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_x
diff --git a/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle
index 65ff91ea2..fba0b2b96 100644
--- a/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12.1_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_x
diff --git a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
index 65ff91ea2..fba0b2b96 100644
--- a/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12.2_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_x
diff --git a/xCAT-test/autotest/bundle/sles12_ppc64le.bundle b/xCAT-test/autotest/bundle/sles12_ppc64le.bundle
index 31b05bf80..4189d2a14 100644
--- a/xCAT-test/autotest/bundle/sles12_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/sles12_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 makehosts_h
 makehosts_help
 makehosts_n
diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle
index 9aecea63a..3c4472521 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.3_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 makehosts_h
 makehosts_help
 makehosts_n_noderange
diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
index b714108f4..48d7290d3 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.3_x86_64.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Ubuntu_diskless_installation_flat_x86_vm
-Ubuntu_full_installation_flat_x86_vm
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 makehosts_h
 makehosts_help
 makehosts_n_noderange
diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
index be6932c9d..619a31895 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_xcat-version-1
diff --git a/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
index 72d300f72..e81520d4d 100644
--- a/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu14.04.4_x86_64.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Ubuntu_diskless_installation_flat_x86_vm
-Ubuntu_full_installation_flat_x86_vm
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_xcat-version-1
diff --git a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
index 74df70cbe..44a902112 100644
--- a/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_xcat-version-1
diff --git a/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle
index 51decc528..d9d9f3d53 100644
--- a/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04.1_x86_64.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Ubuntu_diskless_installation_flat_x86_vm
-Ubuntu_full_installation_flat_x86_vm
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_xcat-version-1
diff --git a/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle b/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle
index db2beed03..db918d358 100644
--- a/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04_ppc64le.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Diskless_installation_flat_p8_le
-Full_installation_flat_p8_le
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_x
diff --git a/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle b/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle
index 07491602a..31619a4fe 100644
--- a/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle
+++ b/xCAT-test/autotest/bundle/ubuntu16.04_x86_64.bundle
@@ -1,6 +1,6 @@
 setup_vm
-Ubuntu_diskless_installation_flat_x86_vm
-Ubuntu_full_installation_flat_x86_vm
+reg_linux_diskless_installation_flat
+reg_linux_diskfull_installation_flat
 go_xcat_local_repo_case7
 go_xcat_noinput
 go_xcat_with_x