diff --git a/misc/config_tools/acpi_gen/asl_gen.py b/misc/config_tools/acpi_gen/asl_gen.py
index ee105a896..3a1b89527 100644
--- a/misc/config_tools/acpi_gen/asl_gen.py
+++ b/misc/config_tools/acpi_gen/asl_gen.py
@@ -408,7 +408,7 @@ def main(args):
 
     if os.path.isdir(DEST_ACPI_PATH):
         for config in os.listdir(DEST_ACPI_PATH):
-            if config.startswith('VM') and os.path.isdir(os.path.join(DEST_ACPI_PATH, config)):
+            if config.startswith('ACPI_VM') and os.path.isdir(os.path.join(DEST_ACPI_PATH, config)):
                 shutil.rmtree(os.path.join(DEST_ACPI_PATH, config))
 
     dict_passthru_devices = collections.OrderedDict()
@@ -455,12 +455,12 @@ def main(args):
             break
 
         print('start to generate ACPI ASL code for VM{}'.format(vm_id))
-        dest_vm_acpi_path = os.path.join(DEST_ACPI_PATH, 'VM'+vm_id)
+        dest_vm_acpi_path = os.path.join(DEST_ACPI_PATH, 'ACPI_VM'+vm_id)
         if not os.path.isdir(dest_vm_acpi_path):
             os.makedirs(dest_vm_acpi_path)
         if PASSTHROUGH_PTCT is True and vm_id == PRELAUNCHED_RTVM_ID:
             passthru_devices.append(PTCT)
-            shutil.copy(os.path.join(VM_CONFIGS_PATH, 'acpi', board_type, PTCT), dest_vm_acpi_path)
+            shutil.copy(os.path.join(VM_CONFIGS_PATH, 'acpi_template', board_type, PTCT), dest_vm_acpi_path)
         gen_rsdp(dest_vm_acpi_path)
         gen_xsdt(dest_vm_acpi_path, passthru_devices)
         gen_fadt(dest_vm_acpi_path, board_root)
diff --git a/misc/config_tools/acpi_gen/bin_gen.py b/misc/config_tools/acpi_gen/bin_gen.py
index 18a9b0b27..3c6416a63 100644
--- a/misc/config_tools/acpi_gen/bin_gen.py
+++ b/misc/config_tools/acpi_gen/bin_gen.py
@@ -185,14 +185,14 @@ def main(args):
         return 1
 
     for config in os.listdir(DEST_ACPI_PATH):
-        if os.path.isdir(os.path.join(DEST_ACPI_PATH, config)) and config.startswith('VM'):
+        if os.path.isdir(os.path.join(DEST_ACPI_PATH, config)) and config.startswith('ACPI_VM'):
             print('start to generate ACPI binary for {}'.format(config))
             dest_vm_acpi_path = os.path.join(DEST_ACPI_PATH, config)
             dest_vm_acpi_bin_path = os.path.join(DEST_ACPI_BIN_PATH, config)
             os.makedirs(dest_vm_acpi_bin_path)
             if asl_to_aml(dest_vm_acpi_path, dest_vm_acpi_bin_path):
                 return 1
-            aml_to_bin(dest_vm_acpi_path, dest_vm_acpi_bin_path, 'ACPI_'+config+'.bin')
+            aml_to_bin(dest_vm_acpi_path, dest_vm_acpi_bin_path, config+'.bin')
 
     return 0