diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM0/apic.asl b/misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM0/apic.asl
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM0/apic.asl
rename to misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM0/apic.asl
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM0/dsdt.asl b/misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM0/dsdt.asl
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM0/dsdt.asl
rename to misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM0/dsdt.asl
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM0/facp.asl b/misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM0/facp.asl
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM0/facp.asl
rename to misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM0/facp.asl
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM0/mcfg.asl b/misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM0/mcfg.asl
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM0/mcfg.asl
rename to misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM0/mcfg.asl
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM0/rsdp.asl b/misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM0/rsdp.asl
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM0/rsdp.asl
rename to misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM0/rsdp.asl
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM0/xsdt.asl b/misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM0/xsdt.asl
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM0/xsdt.asl
rename to misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM0/xsdt.asl
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM1/apic.asl b/misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM1/apic.asl
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM1/apic.asl
rename to misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM1/apic.asl
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM1/dsdt.asl b/misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM1/dsdt.asl
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM1/dsdt.asl
rename to misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM1/dsdt.asl
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM1/facp.asl b/misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM1/facp.asl
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM1/facp.asl
rename to misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM1/facp.asl
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM1/mcfg.asl b/misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM1/mcfg.asl
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM1/mcfg.asl
rename to misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM1/mcfg.asl
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM1/rsdp.asl b/misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM1/rsdp.asl
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM1/rsdp.asl
rename to misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM1/rsdp.asl
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM1/xsdt.asl b/misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM1/xsdt.asl
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/ACPI_VM1/xsdt.asl
rename to misc/config_tools/data/generic_board/generic_code/partitioned/ACPI_VM1/xsdt.asl
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/generic_board.config b/misc/config_tools/data/generic_board/generic_code/partitioned/generic_board.config
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/generic_board.config
rename to misc/config_tools/data/generic_board/generic_code/partitioned/generic_board.config
diff --git a/misc/config_tools/data/generic_board/generic_code/industry/ivshmem_cfg.h b/misc/config_tools/data/generic_board/generic_code/partitioned/ivshmem_cfg.h
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/industry/ivshmem_cfg.h
rename to misc/config_tools/data/generic_board/generic_code/partitioned/ivshmem_cfg.h
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/misc_cfg.h b/misc/config_tools/data/generic_board/generic_code/partitioned/misc_cfg.h
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/misc_cfg.h
rename to misc/config_tools/data/generic_board/generic_code/partitioned/misc_cfg.h
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/pci_dev.c b/misc/config_tools/data/generic_board/generic_code/partitioned/pci_dev.c
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/pci_dev.c
rename to misc/config_tools/data/generic_board/generic_code/partitioned/pci_dev.c
diff --git a/misc/config_tools/data/generic_board/generic_code/industry/pt_intx.c b/misc/config_tools/data/generic_board/generic_code/partitioned/pt_intx.c
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/industry/pt_intx.c
rename to misc/config_tools/data/generic_board/generic_code/partitioned/pt_intx.c
diff --git a/misc/config_tools/data/generic_board/generic_code/industry/vbar_base.h b/misc/config_tools/data/generic_board/generic_code/partitioned/vbar_base.h
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/industry/vbar_base.h
rename to misc/config_tools/data/generic_board/generic_code/partitioned/vbar_base.h
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/vm_configurations.c b/misc/config_tools/data/generic_board/generic_code/partitioned/vm_configurations.c
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/vm_configurations.c
rename to misc/config_tools/data/generic_board/generic_code/partitioned/vm_configurations.c
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/vm_configurations.h b/misc/config_tools/data/generic_board/generic_code/partitioned/vm_configurations.h
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/vm_configurations.h
rename to misc/config_tools/data/generic_board/generic_code/partitioned/vm_configurations.h
diff --git a/misc/config_tools/data/generic_board/generic_code/industry/generic_board.config b/misc/config_tools/data/generic_board/generic_code/shared/generic_board.config
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/industry/generic_board.config
rename to misc/config_tools/data/generic_board/generic_code/shared/generic_board.config
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/ivshmem_cfg.h b/misc/config_tools/data/generic_board/generic_code/shared/ivshmem_cfg.h
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/ivshmem_cfg.h
rename to misc/config_tools/data/generic_board/generic_code/shared/ivshmem_cfg.h
diff --git a/misc/config_tools/data/generic_board/generic_code/industry/misc_cfg.h b/misc/config_tools/data/generic_board/generic_code/shared/misc_cfg.h
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/industry/misc_cfg.h
rename to misc/config_tools/data/generic_board/generic_code/shared/misc_cfg.h
diff --git a/misc/config_tools/data/generic_board/generic_code/industry/pci_dev.c b/misc/config_tools/data/generic_board/generic_code/shared/pci_dev.c
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/industry/pci_dev.c
rename to misc/config_tools/data/generic_board/generic_code/shared/pci_dev.c
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/pt_intx.c b/misc/config_tools/data/generic_board/generic_code/shared/pt_intx.c
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/pt_intx.c
rename to misc/config_tools/data/generic_board/generic_code/shared/pt_intx.c
diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/vbar_base.h b/misc/config_tools/data/generic_board/generic_code/shared/vbar_base.h
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/logical_partition/vbar_base.h
rename to misc/config_tools/data/generic_board/generic_code/shared/vbar_base.h
diff --git a/misc/config_tools/data/generic_board/generic_code/industry/vm_configurations.c b/misc/config_tools/data/generic_board/generic_code/shared/vm_configurations.c
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/industry/vm_configurations.c
rename to misc/config_tools/data/generic_board/generic_code/shared/vm_configurations.c
diff --git a/misc/config_tools/data/generic_board/generic_code/industry/vm_configurations.h b/misc/config_tools/data/generic_board/generic_code/shared/vm_configurations.h
similarity index 100%
rename from misc/config_tools/data/generic_board/generic_code/industry/vm_configurations.h
rename to misc/config_tools/data/generic_board/generic_code/shared/vm_configurations.h
diff --git a/misc/config_tools/data/generic_board/industry_launch_6uos.xml b/misc/config_tools/data/generic_board/shared_launch_6uos.xml
similarity index 99%
rename from misc/config_tools/data/generic_board/industry_launch_6uos.xml
rename to misc/config_tools/data/generic_board/shared_launch_6uos.xml
index e741c2aef..108c309e1 100644
--- a/misc/config_tools/data/generic_board/industry_launch_6uos.xml
+++ b/misc/config_tools/data/generic_board/shared_launch_6uos.xml
@@ -1,4 +1,4 @@
-<acrn-config board="generic_board" scenario="industry" uos_launcher="6">
+<acrn-config board="generic_board" scenario="shared" uos_launcher="6">
     <uos id="1">
 	<uos_type desc="UOS type">WINDOWS</uos_type>
 	<rtos_type desc="UOS Realtime capability">no</rtos_type>
diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml
index e8ba3e33f..71e38299a 100644
--- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml
+++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<acrn-config board="whl-ipc-i5" scenario="partitioned.xml">
+<acrn-config board="whl-ipc-i5" scenario="partitioned">
   <hv>
     <DEBUG_OPTIONS>
         <RELEASE>n</RELEASE>