diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2uos.xml b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
similarity index 98%
rename from misc/config_tools/data/nuc11tnbi5/hybrid_launch_2uos.xml
rename to misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
index 5573f3dfa..be69c3809 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2uos.xml
+++ b/misc/config_tools/data/generic_board/hybrid_launch_2user_vm.xml
@@ -1,4 +1,4 @@
-<acrn-config board="nuc11tnbi5" scenario="hybrid" uos_launcher="2">
+<acrn-config board="generic_board" scenario="hybrid" user_vm_launcher="2">
 	<user_vm id="1">
 		<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
 		<rtos_type desc="User VM Realtime capability">no</rtos_type>
diff --git a/misc/config_tools/data/generic_board/shared_launch_6uos.xml b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
similarity index 99%
rename from misc/config_tools/data/generic_board/shared_launch_6uos.xml
rename to misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
index 8e0412ce9..52c5d6995 100644
--- a/misc/config_tools/data/generic_board/shared_launch_6uos.xml
+++ b/misc/config_tools/data/generic_board/shared_launch_6user_vm.xml
@@ -1,4 +1,4 @@
-<acrn-config board="generic_board" scenario="shared" uos_launcher="6">
+<acrn-config board="generic_board" scenario="shared" user_vm_launcher="6">
 	<user_vm id="1">
 		<user_vm_type desc="UOS type">WINDOWS</user_vm_type>
 		<rtos_type desc="UOS Realtime capability">no</rtos_type>
diff --git a/misc/config_tools/data/generic_board/hybrid_launch_2uos.xml b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
similarity index 98%
rename from misc/config_tools/data/generic_board/hybrid_launch_2uos.xml
rename to misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
index 56dcadf8f..a80fac83a 100644
--- a/misc/config_tools/data/generic_board/hybrid_launch_2uos.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid_launch_2user_vm.xml
@@ -1,4 +1,4 @@
-<acrn-config board="generic_board" scenario="hybrid" uos_launcher="2">
+<acrn-config board="nuc11tnbi5" scenario="hybrid" user_vm_launcher="2">
 	<user_vm id="1">
 		<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
 		<rtos_type desc="User VM Realtime capability">no</rtos_type>
diff --git a/misc/config_tools/data/nuc11tnbi5/shared_launch_6uos.xml b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
similarity index 99%
rename from misc/config_tools/data/nuc11tnbi5/shared_launch_6uos.xml
rename to misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
index aeddbb00c..59a4cfc1a 100644
--- a/misc/config_tools/data/nuc11tnbi5/shared_launch_6uos.xml
+++ b/misc/config_tools/data/nuc11tnbi5/shared_launch_6user_vm.xml
@@ -1,4 +1,4 @@
-<acrn-config board="nuc11tnbi5" scenario="shared" uos_launcher="6">
+<acrn-config board="nuc11tnbi5" scenario="shared" user_vm_launcher="6">
 	<user_vm id="1">
 		<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
 		<rtos_type desc="User VM Realtime capability">no</rtos_type>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1uos_waag.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
similarity index 97%
rename from misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1uos_waag.xml
rename to misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
index cf9515ee9..8b954a09c 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1uos_waag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt_launch_1user_vm_waag.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="hybrid_rt" uos_launcher="1">
+<acrn-config board="whl-ipc-i5" scenario="hybrid_rt" user_vm_launcher="1">
 	<user_vm id="1">
 		<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
 		<rtos_type desc="User VM Realtime capability">no</rtos_type>
diff --git a/misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_laag.xml b/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_laag.xml
similarity index 97%
rename from misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_laag.xml
rename to misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_laag.xml
index 9ab8f5066..8778a5af0 100644
--- a/misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_laag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_laag.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="sdc" uos_launcher="1">
+<acrn-config board="whl-ipc-i5" scenario="sdc" user_vm_launcher="1">
 	<user_vm id="1">
 		<user_vm_type desc="User VM type">YOCTO</user_vm_type>
 		<rtos_type desc="User VM Realtime capability">no</rtos_type>
diff --git a/misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_zephyr.xml b/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_zephyr.xml
similarity index 97%
rename from misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_zephyr.xml
rename to misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_zephyr.xml
index 1ca664f0a..bb7f146bd 100644
--- a/misc/config_tools/data/whl-ipc-i5/sdc_launch_1uos_zephyr.xml
+++ b/misc/config_tools/data/whl-ipc-i5/sdc_launch_1user_vm_zephyr.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="sdc" uos_launcher="1">
+<acrn-config board="whl-ipc-i5" scenario="sdc" user_vm_launcher="1">
 	<user_vm id="1">
 		<user_vm_type desc="User VM type">ZEPHYR</user_vm_type>
 		<rtos_type desc="User VM Realtime capability">no</rtos_type>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1uos_hardrt.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
similarity index 97%
rename from misc/config_tools/data/whl-ipc-i5/shared_launch_1uos_hardrt.xml
rename to misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
index cb47aeff5..3bfff15d5 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1uos_hardrt.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_hardrt.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="shared" uos_launcher="1">
+<acrn-config board="whl-ipc-i5" scenario="shared" user_vm_launcher="1">
 	<user_vm id="2">
 		<user_vm_type desc="User VM type">PREEMPT-RT LINUX</user_vm_type>
 		<rtos_type desc="User VM Realtime capability">Hard RT</rtos_type>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1uos_vxworks.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
similarity index 97%
rename from misc/config_tools/data/whl-ipc-i5/shared_launch_1uos_vxworks.xml
rename to misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
index 2510d8292..c8bea5d41 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1uos_vxworks.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_vxworks.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="shared" uos_launcher="1">
+<acrn-config board="whl-ipc-i5" scenario="shared" user_vm_launcher="1">
 	<user_vm id="1">
 		<user_vm_type desc="User VM type">VXWORKS</user_vm_type>
 		<rtos_type desc="User VM Realtime capability">Hard RT</rtos_type>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_1uos_waag.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
similarity index 97%
rename from misc/config_tools/data/whl-ipc-i5/shared_launch_1uos_waag.xml
rename to misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
index c76bb49c6..ba24ad662 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_1uos_waag.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_1user_vm_waag.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="shared" uos_launcher="1">
+<acrn-config board="whl-ipc-i5" scenario="shared" user_vm_launcher="1">
 	<user_vm id="1">
 		<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
 		<rtos_type desc="User VM Realtime capability">no</rtos_type>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_2uos.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
similarity index 98%
rename from misc/config_tools/data/whl-ipc-i5/shared_launch_2uos.xml
rename to misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
index 5b1f79e8e..6103a6204 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_2uos.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_2user_vm.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="shared" uos_launcher="2">
+<acrn-config board="whl-ipc-i5" scenario="shared" user_vm_launcher="2">
 	<user_vm id="1">
 		<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
 		<rtos_type desc="User VM Realtime capability">no</rtos_type>
diff --git a/misc/config_tools/data/whl-ipc-i5/shared_launch_6uos.xml b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
similarity index 99%
rename from misc/config_tools/data/whl-ipc-i5/shared_launch_6uos.xml
rename to misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
index 1b7b911b9..916812b44 100644
--- a/misc/config_tools/data/whl-ipc-i5/shared_launch_6uos.xml
+++ b/misc/config_tools/data/whl-ipc-i5/shared_launch_6user_vm.xml
@@ -1,4 +1,4 @@
-<acrn-config board="whl-ipc-i5" scenario="shared" uos_launcher="6">
+<acrn-config board="whl-ipc-i5" scenario="shared" user_vm_launcher="6">
 	<user_vm id="1">
 		<user_vm_type desc="User VM type">WINDOWS</user_vm_type>
 		<rtos_type desc="User VM Realtime capability">no</rtos_type>
diff --git a/misc/config_tools/launch_config/launch_cfg_gen.py b/misc/config_tools/launch_config/launch_cfg_gen.py
index fcbd1e174..690e6633e 100644
--- a/misc/config_tools/launch_config/launch_cfg_gen.py
+++ b/misc/config_tools/launch_config/launch_cfg_gen.py
@@ -32,7 +32,7 @@ def get_launch_item_values(board_info, scenario_info=None):
 
     # pre passthrough device for ui
     launch_item_values["user_vm,passthrough_devices,usb_xdci"] = pthru.avl["usb_xdci"]
-    launch_item_values["uos,passthrough_devices,gpu"] = pthru.avl["gpu"]
+    launch_item_values["user_vm,passthrough_devices,gpu"] = pthru.avl["gpu"]
     launch_item_values["user_vm,passthrough_devices,ipu"] = pthru.avl["ipu"]
     launch_item_values["user_vm,passthrough_devices,ipu_i2c"] = pthru.avl["ipu_i2c"]
     launch_item_values["user_vm,passthrough_devices,cse"] = pthru.avl["cse"]
@@ -225,7 +225,7 @@ def main(args):
 
     # generate launch script
     if vm_th:
-        script_name = "launch_uos_id{}.sh".format(vm_th)
+        script_name = "launch_user_vm_id{}.sh".format(vm_th)
         launch_script_file = os.path.join(output, script_name)
         with open(launch_script_file, mode = 'w', newline=None, encoding='utf-8') as config:
             err_dic = generate_script_file(names, pt_sel, virt_io.dev, dm.args, sriov.dev, vm_th, config)
@@ -233,7 +233,7 @@ def main(args):
                 return err_dic
     else:
         for post_vm_i in post_num_list:
-            script_name = "launch_uos_id{}.sh".format(post_vm_i)
+            script_name = "launch_user_vm_id{}.sh".format(post_vm_i)
             launch_script_file = os.path.join(output, script_name)
             with open(launch_script_file, mode = 'w', newline='\n', encoding='utf-8') as config:
                 err_dic = generate_script_file(names, pt_sel, virt_io.dev, dm.args, sriov.dev, post_vm_i, config)