[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [test-API 17/17] Substitute 'guestname' with 'domain_name'



On 04/20/2012 08:46 AM, Osier Yang wrote:
> % for i in $(grep 'guestname' * -r | awk -F':' '{print $1}' | uniq); do \
>     sed -i -e 's/guestname/domain_name/g' $i; \
>   done
> ---
>  cases/consumption_cpu_topology.conf                |   10 +-
>  cases/consumption_domain_nfs_start.conf            |    4 +-
>  cases/consumption_eventhandler.conf                |    8 +-
>  cases/consumption_libvirtd.conf                    |    6 +-
>  cases/consumption_ownership_test.conf              |    4 +-
>  cases/domain_linux_net_inst.conf                   |    8 +-
>  cases/linux_domain.conf                            |   48 +++++-----
>  cases/migration/ssh_persistent_paused_no_dst.conf  |   72 +++++++-------
>  .../migration/ssh_persistent_paused_with_dst.conf  |   96 +++++++++---------
>  cases/migration/ssh_persistent_running_no_dst.conf |   72 +++++++-------
>  .../migration/ssh_persistent_running_with_dst.conf |   96 +++++++++---------
>  cases/migration/ssh_transient_paused_no_dst.conf   |   46 ++++----
>  cases/migration/ssh_transient_paused_with_dst.conf |   72 +++++++-------
>  cases/migration/ssh_transient_running_no_dst.conf  |   48 +++++-----
>  .../migration/ssh_transient_running_with_dst.conf  |   72 +++++++-------
>  cases/migration/tcp_persistent_paused_no_dst.conf  |   72 +++++++-------
>  .../migration/tcp_persistent_paused_with_dst.conf  |   96 +++++++++---------
>  cases/migration/tcp_persistent_running_no_dst.conf |   72 +++++++-------
>  .../migration/tcp_persistent_running_with_dst.conf |   96 +++++++++---------
>  .../tcp_sasl_persistent_paused_no_dst.conf         |   24 ++--
>  .../tcp_sasl_persistent_paused_with_dst.conf       |   32 +++---
>  .../tcp_sasl_persistent_running_no_dst.conf        |   24 ++--
>  .../tcp_sasl_persistent_running_with_dst.conf      |   32 +++---
>  .../tcp_sasl_transient_paused_no_dst.conf          |   16 ++--
>  .../tcp_sasl_transient_paused_with_dst.conf        |   24 ++--
>  .../tcp_sasl_transient_running_no_dst.conf         |   16 ++--
>  .../tcp_sasl_transient_running_with_dst.conf       |   24 ++--
>  cases/migration/tcp_transient_paused_no_dst.conf   |   46 ++++----
>  cases/migration/tcp_transient_paused_with_dst.conf |   72 +++++++-------
>  cases/migration/tcp_transient_running_no_dst.conf  |   48 +++++-----
>  .../migration/tcp_transient_running_with_dst.conf  |   72 +++++++-------
>  cases/migration/tls_persistent_paused_no_dst.conf  |   72 +++++++-------
>  .../migration/tls_persistent_paused_with_dst.conf  |   96 +++++++++---------
>  cases/migration/tls_persistent_running_no_dst.conf |   72 +++++++-------
>  .../migration/tls_persistent_running_with_dst.conf |   96 +++++++++---------
>  .../tls_sasl_persistent_paused_no_dst.conf         |   24 ++--
>  .../tls_sasl_persistent_paused_with_dst.conf       |   32 +++---
>  .../tls_sasl_persistent_running_no_dst.conf        |   24 ++--
>  .../tls_sasl_persistent_running_with_dst.conf      |   32 +++---
>  .../tls_sasl_transient_paused_no_dst.conf          |   16 ++--
>  .../tls_sasl_transient_paused_with_dst.conf        |   24 ++--
>  .../tls_sasl_transient_running_no_dst.conf         |   16 ++--
>  .../tls_sasl_transient_running_with_dst.conf       |   24 ++--
>  cases/migration/tls_transient_paused_no_dst.conf   |   46 ++++----
>  cases/migration/tls_transient_paused_with_dst.conf |   72 +++++++-------
>  cases/migration/tls_transient_running_no_dst.conf  |   48 +++++-----
>  .../migration/tls_transient_running_with_dst.conf  |   72 +++++++-------
>  cases/snapshot.conf                                |   26 +++---
>  cases/windows_domain.conf                          |   46 ++++----
>  .../en-US/Creating_a_configuration_file.xml        |   82 ++++++++--------
>  .../en-US/Writing_a_test_case.xml                  |    4 +-
>  repos/domain/attach_disk.py                        |   12 +-
>  repos/domain/attach_interface.py                   |   16 ++--
>  repos/domain/autostart.py                          |   20 ++--
>  repos/domain/balloon_memory.py                     |    4 +-
>  repos/domain/blkstats.py                           |    6 +-
>  repos/domain/console_io.py                         |    4 +-
>  repos/domain/console_mutex.py                      |    4 +-
>  repos/domain/cpu_affinity.py                       |    4 +-
>  repos/domain/cpu_topology.py                       |   34 +++---
>  repos/domain/create.py                             |   18 ++--
>  repos/domain/define.py                             |   16 ++--
>  repos/domain/destroy.py                            |   18 ++--
>  repos/domain/detach_disk.py                        |   12 +-
>  repos/domain/detach_interface.py                   |   14 ++--
>  repos/domain/domain_blkinfo.py                     |   18 ++--
>  repos/domain/domain_id.py                          |   12 +-
>  repos/domain/domain_uuid.py                        |   24 ++--
>  repos/domain/domblkinfo.py                         |   18 ++--
>  repos/domain/dump.py                               |   24 ++--
>  repos/domain/eventhandler.py                       |   48 +++++-----
>  repos/domain/ifstats.py                            |   10 +-
>  repos/domain/install_image.py                      |   30 +++---
>  repos/domain/install_linux_cdrom.py                |   94 +++++++++---------
>  repos/domain/install_linux_check.py                |   20 ++--
>  repos/domain/install_linux_net.py                  |   76 +++++++-------
>  repos/domain/install_windows_cdrom.py              |   72 +++++++-------
>  repos/domain/migrate.py                            |   42 ++++----
>  repos/domain/ownership_test.py                     |   22 ++--
>  repos/domain/reboot.py                             |    4 +-
>  repos/domain/restore.py                            |   20 ++--
>  repos/domain/resume.py                             |    8 +-
>  repos/domain/save.py                               |   24 ++--
>  repos/domain/sched_params.py                       |   14 ++--
>  repos/domain/screenshot.py                         |    4 +-
>  repos/domain/shutdown.py                           |    8 +-
>  repos/domain/start.py                              |    8 +-
>  repos/domain/suspend.py                            |    8 +-
>  repos/domain/undefine.py                           |   14 ++--
>  repos/domain/update_devflag.py                     |   16 ++--
>  repos/libvirtd/qemu_hang.py                        |   32 +++---
>  repos/libvirtd/restart.py                          |   50 +++++-----
>  .../multiple_thread_block_on_domain_create.py      |    8 +-
>  repos/sVirt/domain_nfs_start.py                    |  106 ++++++++++----------
>  repos/snapshot/delete.py                           |   24 ++--
>  repos/snapshot/file_flag.py                        |   26 +++---
>  repos/snapshot/flag_check.py                       |   24 ++--
>  repos/snapshot/internal_create.py                  |   22 ++--
>  repos/snapshot/revert.py                           |   16 ++--
>  repos/snapshot/snapshot_list.py                    |   12 +-
>  utils/dev_num.sh                                   |   10 +-
>  utils/disk_num.sh                                  |   10 +-
>  utils/utils.py                                     |    4 +-
>  utils/xml_builder.py                               |    8 +-
>  utils/xml_generator.py                             |    6 +-
>  105 files changed, 1765 insertions(+), 1765 deletions(-)
> 
> diff --git a/cases/consumption_cpu_topology.conf b/cases/consumption_cpu_topology.conf
> index 1fdb1e2..5ad71a9 100644
> --- a/cases/consumption_cpu_topology.conf
> +++ b/cases/consumption_cpu_topology.conf
> @@ -1,5 +1,5 @@
>  domain:install_linux_cdrom
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -19,11 +19,11 @@ domain:install_linux_cdrom
>          54:52:00:45:c3:8a
>  
>  domain:shutdown
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:cpu_topology
> -    guestname
> +    domain_name
>          $defaultname
>      username
>          root
> @@ -37,9 +37,9 @@ domain:cpu_topology
>          2
>  
>  domain:destroy
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:undefine
> -    guestname
> +    domain_name
>          $defaultname
> diff --git a/cases/consumption_domain_nfs_start.conf b/cases/consumption_domain_nfs_start.conf
> index f213b2a..7435f8f 100644
> --- a/cases/consumption_domain_nfs_start.conf
> +++ b/cases/consumption_domain_nfs_start.conf
> @@ -1,5 +1,5 @@
>  domain:install_linux_cdrom
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -19,7 +19,7 @@ domain:install_linux_cdrom
>          54:52:00:45:c3:8a
>  
>  sVirt:domain_nfs_start
> -    guestname
> +    domain_name
>          $defaultname
>      dynamic_ownership
>          $enable
> diff --git a/cases/consumption_eventhandler.conf b/cases/consumption_eventhandler.conf
> index 47de579..8a84058 100644
> --- a/cases/consumption_eventhandler.conf
> +++ b/cases/consumption_eventhandler.conf
> @@ -1,5 +1,5 @@
>  domain:install_linux_cdrom
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -19,13 +19,13 @@ domain:install_linux_cdrom
>          54:52:00:45:c3:8a
>  
>  domain:eventhandler
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:destroy
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:undefine
> -    guestname
> +    domain_name
>          $defaultname
> diff --git a/cases/consumption_libvirtd.conf b/cases/consumption_libvirtd.conf
> index 6cf070e..96771c1 100644
> --- a/cases/consumption_libvirtd.conf
> +++ b/cases/consumption_libvirtd.conf
> @@ -1,5 +1,5 @@
>  domain:install_linux_cdrom
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -19,13 +19,13 @@ domain:install_linux_cdrom
>          54:52:00:45:c3:8a
>  
>  libvirtd:restart
> -    guestname
> +    domain_name
>          $defaultname
>  
>  libvirtd:upstart
>  
>  libvirtd:qemu_hang
> -    guestname
> +    domain_name
>          $defaultname
>  
>  options cleanup=enable
> diff --git a/cases/consumption_ownership_test.conf b/cases/consumption_ownership_test.conf
> index e588b54..cd05b90 100644
> --- a/cases/consumption_ownership_test.conf
> +++ b/cases/consumption_ownership_test.conf
> @@ -1,5 +1,5 @@
>  domain:install_linux_cdrom
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -19,7 +19,7 @@ domain:install_linux_cdrom
>          54:52:00:45:c3:8a
>  
>  domain:ownership_test
> -    guestname
> +    domain_name
>          $defaultname
>      dynamic_ownership
>          enable
> diff --git a/cases/domain_linux_net_inst.conf b/cases/domain_linux_net_inst.conf
> index 5e30434..13e9964 100644
> --- a/cases/domain_linux_net_inst.conf
> +++ b/cases/domain_linux_net_inst.conf
> @@ -1,5 +1,5 @@
>  domain:install_linux_net
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -21,7 +21,7 @@ domain:install_linux_net
>  	define
>  
>  domain:install_linux_check
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -31,10 +31,10 @@ domain:install_linux_check
>          $defaultnic
>  
>  domain:destroy
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:undefine
> -    guestname
> +    domain_name
>          $defaultname
>  
> diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf
> index 73ef9f3..401b948 100644
> --- a/cases/linux_domain.conf
> +++ b/cases/linux_domain.conf
> @@ -1,5 +1,5 @@
>  domain:install_linux_cdrom
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -19,7 +19,7 @@ domain:install_linux_cdrom
>          54:52:00:45:c3:8a
>  
>  domain:install_linux_check
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -29,23 +29,23 @@ domain:install_linux_check
>          $defaultnic
>  
>  domain:shutdown
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:destroy
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:undefine
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -61,60 +61,60 @@ domain:define
>          54:52:00:45:c3:8a
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:suspend
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:resume
> -    guestname
> +    domain_name
>          $defaultname
>  /*
>  domain:save
> -    guestname
> +    domain_name
>          $defaultname
>      filepath
>          /tmp/$defaultname
>  
>  domain:restore
> -    guestname
> +    domain_name
>          $defaultname
>      filepath
>          /tmp/$defaultname
>  */
>  
>  domain:autostart
> -    guestname
> +    domain_name
>          $defaultname
>      autostart
>          enable
>  
>  domain:ifstats
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:blkstats
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:dump
> -    guestname
> +    domain_name
>          $defaultname
>      file
>          /tmp/core
>  
>  domain:shutdown
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:attach_disk
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -126,7 +126,7 @@ domain:attach_disk
>          $defaulthd
>  
>  domain:detach_disk
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -136,23 +136,23 @@ domain:detach_disk
>          $defaulthd
>  
>  domain:cpu_affinity
> -    guestname
> +    domain_name
>          $defaultname
>      vcpu
>          $defaultvcpu
>  
>  domain:balloon_memory
> -    guestname
> +    domain_name
>          $defaultname
>      memorypair
>          1024,2048
>  
>  domain:destroy
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:undefine
> -    guestname
> +    domain_name
>          $defaultname
>  
>  options cleanup=enable
> diff --git a/cases/migration/ssh_persistent_paused_no_dst.conf b/cases/migration/ssh_persistent_paused_no_dst.conf
> index 542b465..fdc05a7 100644
> --- a/cases/migration/ssh_persistent_paused_no_dst.conf
> +++ b/cases/migration/ssh_persistent_paused_no_dst.conf
> @@ -3,13 +3,13 @@
>  # the default libvirt image folder: /var/lib/libvirt/images
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -23,7 +23,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -41,13 +41,13 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -61,7 +61,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -79,13 +79,13 @@ domain:migrate
>          peer2peer|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -99,7 +99,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -117,13 +117,13 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -137,7 +137,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -155,13 +155,13 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -175,7 +175,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -193,13 +193,13 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -213,7 +213,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -231,13 +231,13 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -251,7 +251,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -269,13 +269,13 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -289,7 +289,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -307,13 +307,13 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -327,7 +327,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -345,13 +345,13 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -365,7 +365,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -383,13 +383,13 @@ domain:migrate
>          0|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -403,7 +403,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -421,13 +421,13 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -441,7 +441,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/ssh_persistent_paused_with_dst.conf b/cases/migration/ssh_persistent_paused_with_dst.conf
> index 058379e..b52b2ac 100644
> --- a/cases/migration/ssh_persistent_paused_with_dst.conf
> +++ b/cases/migration/ssh_persistent_paused_with_dst.conf
> @@ -3,7 +3,7 @@
>  # the default libvirt image folder: /var/lib/libvirt/images
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -11,7 +11,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -25,7 +25,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -39,7 +39,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -57,7 +57,7 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -65,7 +65,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -79,7 +79,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -93,7 +93,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -111,7 +111,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -119,7 +119,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -133,7 +133,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -147,7 +147,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -165,7 +165,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -173,7 +173,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -187,7 +187,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -201,7 +201,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -219,7 +219,7 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -227,7 +227,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -241,7 +241,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -255,7 +255,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -273,7 +273,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -281,7 +281,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -295,7 +295,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -309,7 +309,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -327,7 +327,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -335,7 +335,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -349,7 +349,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -363,7 +363,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -381,7 +381,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -389,7 +389,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -403,7 +403,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -417,7 +417,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -435,7 +435,7 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -443,7 +443,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -457,7 +457,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -471,7 +471,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -489,7 +489,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -497,7 +497,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -511,7 +511,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -525,7 +525,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -543,7 +543,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -551,7 +551,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -565,7 +565,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -579,7 +579,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -597,7 +597,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -605,7 +605,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -619,7 +619,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -633,7 +633,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/ssh_persistent_running_no_dst.conf b/cases/migration/ssh_persistent_running_no_dst.conf
> index dc06b8f..b09592a 100644
> --- a/cases/migration/ssh_persistent_running_no_dst.conf
> +++ b/cases/migration/ssh_persistent_running_no_dst.conf
> @@ -3,13 +3,13 @@
>  # the default libvirt image folder: /var/lib/libvirt/images
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -21,7 +21,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -39,13 +39,13 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -57,7 +57,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -75,13 +75,13 @@ domain:migrate
>          peer2peer|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -93,7 +93,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -111,13 +111,13 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -129,7 +129,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -147,13 +147,13 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -165,7 +165,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -183,13 +183,13 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -201,7 +201,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -219,13 +219,13 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -237,7 +237,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -255,13 +255,13 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -273,7 +273,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -291,13 +291,13 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -309,7 +309,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -327,13 +327,13 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -345,7 +345,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -363,13 +363,13 @@ domain:migrate
>          0|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -381,7 +381,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -399,13 +399,13 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -417,7 +417,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/ssh_persistent_running_with_dst.conf b/cases/migration/ssh_persistent_running_with_dst.conf
> index 7e1bd89..27fcb80 100644
> --- a/cases/migration/ssh_persistent_running_with_dst.conf
> +++ b/cases/migration/ssh_persistent_running_with_dst.conf
> @@ -3,7 +3,7 @@
>  # the default libvirt image folder: /var/lib/libvirt/images
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -11,7 +11,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -25,7 +25,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -37,7 +37,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -55,7 +55,7 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -63,7 +63,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -77,7 +77,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -89,7 +89,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -107,7 +107,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -115,7 +115,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -129,7 +129,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -141,7 +141,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -159,7 +159,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -167,7 +167,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -181,7 +181,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -193,7 +193,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -211,7 +211,7 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -219,7 +219,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -233,7 +233,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -245,7 +245,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -263,7 +263,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -271,7 +271,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -285,7 +285,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -297,7 +297,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -315,7 +315,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -323,7 +323,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -337,7 +337,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -349,7 +349,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -367,7 +367,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -375,7 +375,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -389,7 +389,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -401,7 +401,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -419,7 +419,7 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -427,7 +427,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -441,7 +441,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -453,7 +453,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -471,7 +471,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -479,7 +479,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -493,7 +493,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -505,7 +505,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -523,7 +523,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -531,7 +531,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -545,7 +545,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -557,7 +557,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -575,7 +575,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -583,7 +583,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -597,7 +597,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -609,7 +609,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/ssh_transient_paused_no_dst.conf b/cases/migration/ssh_transient_paused_no_dst.conf
> index a3fdbf4..e0ef2ce 100644
> --- a/cases/migration/ssh_transient_paused_no_dst.conf
> +++ b/cases/migration/ssh_transient_paused_no_dst.conf
> @@ -3,7 +3,7 @@
>  # the default libvirt image folder: /var/lib/libvirt/images
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -19,7 +19,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -37,7 +37,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -53,7 +53,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -71,7 +71,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -87,7 +87,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -105,7 +105,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -121,7 +121,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -139,7 +139,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -155,7 +155,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -173,7 +173,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -189,7 +189,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -207,7 +207,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -223,7 +223,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -241,7 +241,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -257,7 +257,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -283,7 +283,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -301,7 +301,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -317,7 +317,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -335,7 +335,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -351,7 +351,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -369,7 +369,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -385,7 +385,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/ssh_transient_paused_with_dst.conf b/cases/migration/ssh_transient_paused_with_dst.conf
> index 3cb89b4..e1b3efa 100644
> --- a/cases/migration/ssh_transient_paused_with_dst.conf
> +++ b/cases/migration/ssh_transient_paused_with_dst.conf
> @@ -3,7 +3,7 @@
>  # the default libvirt image folder: /var/lib/libvirt/images
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -13,7 +13,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -35,7 +35,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -53,7 +53,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -63,7 +63,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -85,7 +85,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -103,7 +103,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -113,7 +113,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -135,7 +135,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -153,7 +153,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -163,7 +163,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -185,7 +185,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -203,7 +203,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -213,7 +213,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -235,7 +235,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -253,7 +253,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -263,7 +263,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -285,7 +285,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -303,7 +303,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -313,7 +313,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -335,7 +335,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -353,7 +353,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -363,7 +363,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -385,7 +385,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -403,7 +403,7 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -413,7 +413,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -435,7 +435,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -453,7 +453,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -463,7 +463,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -485,7 +485,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -503,7 +503,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -513,7 +513,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -535,7 +535,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -553,7 +553,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -563,7 +563,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -585,7 +585,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/ssh_transient_running_no_dst.conf b/cases/migration/ssh_transient_running_no_dst.conf
> index 570033e..7e053c9 100644
> --- a/cases/migration/ssh_transient_running_no_dst.conf
> +++ b/cases/migration/ssh_transient_running_no_dst.conf
> @@ -3,7 +3,7 @@
>  # the default libvirt image folder: /var/lib/libvirt/images
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -17,7 +17,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -35,7 +35,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -49,7 +49,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -67,7 +67,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -81,7 +81,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -99,7 +99,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -113,7 +113,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -131,7 +131,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -145,7 +145,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -163,7 +163,7 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -177,7 +177,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -195,7 +195,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -209,7 +209,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -227,7 +227,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -241,7 +241,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -259,7 +259,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -273,7 +273,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -291,7 +291,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -305,7 +305,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -323,7 +323,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -337,7 +337,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -355,7 +355,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -369,7 +369,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/ssh_transient_running_with_dst.conf b/cases/migration/ssh_transient_running_with_dst.conf
> index 6dd45b5..8e9b655 100644
> --- a/cases/migration/ssh_transient_running_with_dst.conf
> +++ b/cases/migration/ssh_transient_running_with_dst.conf
> @@ -3,7 +3,7 @@
>  # the default libvirt image folder: /var/lib/libvirt/images
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -11,7 +11,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -33,7 +33,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -51,7 +51,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -59,7 +59,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -81,7 +81,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -99,7 +99,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -107,7 +107,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -129,7 +129,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -147,7 +147,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -155,7 +155,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -177,7 +177,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -195,7 +195,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -203,7 +203,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -225,7 +225,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -243,7 +243,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -251,7 +251,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -273,7 +273,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -291,7 +291,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -299,7 +299,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -321,7 +321,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -339,7 +339,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -347,7 +347,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -369,7 +369,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -387,7 +387,7 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -395,7 +395,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -417,7 +417,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -435,7 +435,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -443,7 +443,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -465,7 +465,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -483,7 +483,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -491,7 +491,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -513,7 +513,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -531,7 +531,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -539,7 +539,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -561,7 +561,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tcp_persistent_paused_no_dst.conf b/cases/migration/tcp_persistent_paused_no_dst.conf
> index 53fa442..82dfbc7 100644
> --- a/cases/migration/tcp_persistent_paused_no_dst.conf
> +++ b/cases/migration/tcp_persistent_paused_no_dst.conf
> @@ -15,13 +15,13 @@ remoteAccess:tcp_setup
>          none
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -35,7 +35,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -53,13 +53,13 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -73,7 +73,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -91,13 +91,13 @@ domain:migrate
>          peer2peer|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -111,7 +111,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -129,13 +129,13 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -149,7 +149,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -167,13 +167,13 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -187,7 +187,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -205,13 +205,13 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -225,7 +225,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -243,13 +243,13 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -263,7 +263,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -281,13 +281,13 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -301,7 +301,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -319,13 +319,13 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -339,7 +339,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -357,13 +357,13 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -377,7 +377,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -395,13 +395,13 @@ domain:migrate
>          0|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -415,7 +415,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -433,13 +433,13 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -453,7 +453,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tcp_persistent_paused_with_dst.conf b/cases/migration/tcp_persistent_paused_with_dst.conf
> index 11e4ea0..641ed1c 100644
> --- a/cases/migration/tcp_persistent_paused_with_dst.conf
> +++ b/cases/migration/tcp_persistent_paused_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tcp_setup
>          none
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -23,7 +23,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -37,7 +37,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -51,7 +51,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -69,7 +69,7 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -77,7 +77,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -91,7 +91,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -105,7 +105,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -123,7 +123,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -131,7 +131,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -145,7 +145,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -159,7 +159,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -177,7 +177,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -185,7 +185,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -199,7 +199,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -213,7 +213,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -231,7 +231,7 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -239,7 +239,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -253,7 +253,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -267,7 +267,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -285,7 +285,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -293,7 +293,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -307,7 +307,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -321,7 +321,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -339,7 +339,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -347,7 +347,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -361,7 +361,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -375,7 +375,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -393,7 +393,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -401,7 +401,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -415,7 +415,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -429,7 +429,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -447,7 +447,7 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -455,7 +455,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -469,7 +469,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -483,7 +483,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -501,7 +501,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -509,7 +509,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -523,7 +523,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -537,7 +537,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -555,7 +555,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -563,7 +563,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -577,7 +577,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -591,7 +591,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -609,7 +609,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -617,7 +617,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -631,7 +631,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -645,7 +645,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tcp_persistent_running_no_dst.conf b/cases/migration/tcp_persistent_running_no_dst.conf
> index 552b8a3..e390048 100644
> --- a/cases/migration/tcp_persistent_running_no_dst.conf
> +++ b/cases/migration/tcp_persistent_running_no_dst.conf
> @@ -15,13 +15,13 @@ remoteAccess:tcp_setup
>          none
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -33,7 +33,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -51,13 +51,13 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -69,7 +69,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -87,13 +87,13 @@ domain:migrate
>          peer2peer|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -105,7 +105,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -123,13 +123,13 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -141,7 +141,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -159,13 +159,13 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -177,7 +177,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -195,13 +195,13 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -213,7 +213,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -231,13 +231,13 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -249,7 +249,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -267,13 +267,13 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -285,7 +285,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -303,13 +303,13 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -321,7 +321,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -339,13 +339,13 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -357,7 +357,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -375,13 +375,13 @@ domain:migrate
>          0|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -393,7 +393,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -411,13 +411,13 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -429,7 +429,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tcp_persistent_running_with_dst.conf b/cases/migration/tcp_persistent_running_with_dst.conf
> index 8c8770c..f04e030 100644
> --- a/cases/migration/tcp_persistent_running_with_dst.conf
> +++ b/cases/migration/tcp_persistent_running_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tcp_setup
>          none
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -23,7 +23,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -37,7 +37,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -49,7 +49,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -67,7 +67,7 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -75,7 +75,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -89,7 +89,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -101,7 +101,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -119,7 +119,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -127,7 +127,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -141,7 +141,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -153,7 +153,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -171,7 +171,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -179,7 +179,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -193,7 +193,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -205,7 +205,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -223,7 +223,7 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -231,7 +231,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -245,7 +245,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -257,7 +257,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -275,7 +275,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -283,7 +283,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -297,7 +297,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -309,7 +309,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -327,7 +327,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -335,7 +335,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -349,7 +349,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -361,7 +361,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -379,7 +379,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -387,7 +387,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -401,7 +401,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -413,7 +413,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -431,7 +431,7 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -439,7 +439,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -453,7 +453,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -465,7 +465,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -483,7 +483,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -491,7 +491,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -505,7 +505,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -517,7 +517,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -535,7 +535,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -543,7 +543,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -557,7 +557,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -569,7 +569,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -587,7 +587,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -595,7 +595,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -609,7 +609,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -621,7 +621,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tcp_sasl_persistent_paused_no_dst.conf b/cases/migration/tcp_sasl_persistent_paused_no_dst.conf
> index f8f8b41..e4f33ef 100644
> --- a/cases/migration/tcp_sasl_persistent_paused_no_dst.conf
> +++ b/cases/migration/tcp_sasl_persistent_paused_no_dst.conf
> @@ -15,13 +15,13 @@ remoteAccess:tcp_setup
>          sasl
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -35,7 +35,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -53,13 +53,13 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -73,7 +73,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -91,13 +91,13 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -111,7 +111,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -129,13 +129,13 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -149,7 +149,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tcp_sasl_persistent_paused_with_dst.conf b/cases/migration/tcp_sasl_persistent_paused_with_dst.conf
> index 711fa91..7f1a3a9 100644
> --- a/cases/migration/tcp_sasl_persistent_paused_with_dst.conf
> +++ b/cases/migration/tcp_sasl_persistent_paused_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tcp_setup
>          sasl
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -23,7 +23,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -37,7 +37,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -51,7 +51,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -69,7 +69,7 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -77,7 +77,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -91,7 +91,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -105,7 +105,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -123,7 +123,7 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -131,7 +131,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -145,7 +145,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -159,7 +159,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -177,7 +177,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -185,7 +185,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -199,7 +199,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -213,7 +213,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tcp_sasl_persistent_running_no_dst.conf b/cases/migration/tcp_sasl_persistent_running_no_dst.conf
> index cb1b4d3..805aea8 100644
> --- a/cases/migration/tcp_sasl_persistent_running_no_dst.conf
> +++ b/cases/migration/tcp_sasl_persistent_running_no_dst.conf
> @@ -15,13 +15,13 @@ remoteAccess:tcp_setup
>          sasl
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -33,7 +33,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -51,13 +51,13 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -69,7 +69,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -87,13 +87,13 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -105,7 +105,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -123,13 +123,13 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -141,7 +141,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tcp_sasl_persistent_running_with_dst.conf b/cases/migration/tcp_sasl_persistent_running_with_dst.conf
> index 90dec94..4c84002 100644
> --- a/cases/migration/tcp_sasl_persistent_running_with_dst.conf
> +++ b/cases/migration/tcp_sasl_persistent_running_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tcp_setup
>          sasl
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -23,7 +23,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -37,7 +37,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -49,7 +49,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -67,7 +67,7 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -75,7 +75,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -89,7 +89,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -101,7 +101,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -119,7 +119,7 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -127,7 +127,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -141,7 +141,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -153,7 +153,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -171,7 +171,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -179,7 +179,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -193,7 +193,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -205,7 +205,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tcp_sasl_transient_paused_no_dst.conf b/cases/migration/tcp_sasl_transient_paused_no_dst.conf
> index d5b7764..31ed954 100644
> --- a/cases/migration/tcp_sasl_transient_paused_no_dst.conf
> +++ b/cases/migration/tcp_sasl_transient_paused_no_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tcp_setup
>          sasl
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -31,7 +31,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -49,7 +49,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -65,7 +65,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -83,7 +83,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -99,7 +99,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -117,7 +117,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -133,7 +133,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tcp_sasl_transient_paused_with_dst.conf b/cases/migration/tcp_sasl_transient_paused_with_dst.conf
> index 6b8195a..6bba582 100644
> --- a/cases/migration/tcp_sasl_transient_paused_with_dst.conf
> +++ b/cases/migration/tcp_sasl_transient_paused_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tcp_setup
>          sasl
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -25,7 +25,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -47,7 +47,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -65,7 +65,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -75,7 +75,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -97,7 +97,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -115,7 +115,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -125,7 +125,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -147,7 +147,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -165,7 +165,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -175,7 +175,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -197,7 +197,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tcp_sasl_transient_running_no_dst.conf b/cases/migration/tcp_sasl_transient_running_no_dst.conf
> index 347a6b8..9c99271 100644
> --- a/cases/migration/tcp_sasl_transient_running_no_dst.conf
> +++ b/cases/migration/tcp_sasl_transient_running_no_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tcp_setup
>          sasl
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -29,7 +29,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -47,7 +47,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -61,7 +61,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -79,7 +79,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -93,7 +93,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -111,7 +111,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -125,7 +125,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tcp_sasl_transient_running_with_dst.conf b/cases/migration/tcp_sasl_transient_running_with_dst.conf
> index 35575e1..b9a979f 100644
> --- a/cases/migration/tcp_sasl_transient_running_with_dst.conf
> +++ b/cases/migration/tcp_sasl_transient_running_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tcp_setup
>          sasl
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -23,7 +23,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -45,7 +45,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -63,7 +63,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -71,7 +71,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -93,7 +93,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -111,7 +111,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -119,7 +119,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -141,7 +141,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -159,7 +159,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -167,7 +167,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -189,7 +189,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tcp_transient_paused_no_dst.conf b/cases/migration/tcp_transient_paused_no_dst.conf
> index 69d502e..aa5f76d 100644
> --- a/cases/migration/tcp_transient_paused_no_dst.conf
> +++ b/cases/migration/tcp_transient_paused_no_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tcp_setup
>          none
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -31,7 +31,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -49,7 +49,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -65,7 +65,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -83,7 +83,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -99,7 +99,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -117,7 +117,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -133,7 +133,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -151,7 +151,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -167,7 +167,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -185,7 +185,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -201,7 +201,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -219,7 +219,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -235,7 +235,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -253,7 +253,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -269,7 +269,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -295,7 +295,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -313,7 +313,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -329,7 +329,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -347,7 +347,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -363,7 +363,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -381,7 +381,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -397,7 +397,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tcp_transient_paused_with_dst.conf b/cases/migration/tcp_transient_paused_with_dst.conf
> index df93e5b..03b0d55 100644
> --- a/cases/migration/tcp_transient_paused_with_dst.conf
> +++ b/cases/migration/tcp_transient_paused_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tcp_setup
>          none
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -25,7 +25,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -47,7 +47,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -65,7 +65,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -75,7 +75,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -97,7 +97,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -115,7 +115,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -125,7 +125,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -147,7 +147,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -165,7 +165,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -175,7 +175,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -197,7 +197,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -215,7 +215,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -225,7 +225,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -247,7 +247,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -265,7 +265,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -275,7 +275,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -297,7 +297,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -315,7 +315,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -325,7 +325,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -347,7 +347,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -365,7 +365,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -375,7 +375,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -397,7 +397,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -415,7 +415,7 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -425,7 +425,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -447,7 +447,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -465,7 +465,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -475,7 +475,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -497,7 +497,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -515,7 +515,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -525,7 +525,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -547,7 +547,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -565,7 +565,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -575,7 +575,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -597,7 +597,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tcp_transient_running_no_dst.conf b/cases/migration/tcp_transient_running_no_dst.conf
> index 97cf6b0..d8cb5ec 100644
> --- a/cases/migration/tcp_transient_running_no_dst.conf
> +++ b/cases/migration/tcp_transient_running_no_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tcp_setup
>          none
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -29,7 +29,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -47,7 +47,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -61,7 +61,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -79,7 +79,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -93,7 +93,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -111,7 +111,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -125,7 +125,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -143,7 +143,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -157,7 +157,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -175,7 +175,7 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -189,7 +189,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -207,7 +207,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -221,7 +221,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -239,7 +239,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -253,7 +253,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -271,7 +271,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -285,7 +285,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -303,7 +303,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -317,7 +317,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -335,7 +335,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -349,7 +349,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -367,7 +367,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -381,7 +381,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tcp_transient_running_with_dst.conf b/cases/migration/tcp_transient_running_with_dst.conf
> index 4d9ba03..edf7225 100644
> --- a/cases/migration/tcp_transient_running_with_dst.conf
> +++ b/cases/migration/tcp_transient_running_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tcp_setup
>          none
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -23,7 +23,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -45,7 +45,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -63,7 +63,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -71,7 +71,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -93,7 +93,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -111,7 +111,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -119,7 +119,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -141,7 +141,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -159,7 +159,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -167,7 +167,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -189,7 +189,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -207,7 +207,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -215,7 +215,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -237,7 +237,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -255,7 +255,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -263,7 +263,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -285,7 +285,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -303,7 +303,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -311,7 +311,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -333,7 +333,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -351,7 +351,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -359,7 +359,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -381,7 +381,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -399,7 +399,7 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -407,7 +407,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -429,7 +429,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -447,7 +447,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -455,7 +455,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -477,7 +477,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -495,7 +495,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -503,7 +503,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -525,7 +525,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -543,7 +543,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -551,7 +551,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -573,7 +573,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tls_persistent_paused_no_dst.conf b/cases/migration/tls_persistent_paused_no_dst.conf
> index 6ff366b..aa1e2e3 100644
> --- a/cases/migration/tls_persistent_paused_no_dst.conf
> +++ b/cases/migration/tls_persistent_paused_no_dst.conf
> @@ -15,13 +15,13 @@ remoteAccess:tls_setup
>          none
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -35,7 +35,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -53,13 +53,13 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -73,7 +73,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -91,13 +91,13 @@ domain:migrate
>          peer2peer|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -111,7 +111,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -129,13 +129,13 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -149,7 +149,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -167,13 +167,13 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -187,7 +187,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -205,13 +205,13 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -225,7 +225,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -243,13 +243,13 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -263,7 +263,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -281,13 +281,13 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -301,7 +301,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -319,13 +319,13 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -339,7 +339,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -357,13 +357,13 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -377,7 +377,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -395,13 +395,13 @@ domain:migrate
>          0|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -415,7 +415,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -433,13 +433,13 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -453,7 +453,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tls_persistent_paused_with_dst.conf b/cases/migration/tls_persistent_paused_with_dst.conf
> index 1f86546..d7685f8 100644
> --- a/cases/migration/tls_persistent_paused_with_dst.conf
> +++ b/cases/migration/tls_persistent_paused_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tls_setup
>          none
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -23,7 +23,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -37,7 +37,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -51,7 +51,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -69,7 +69,7 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -77,7 +77,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -91,7 +91,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -105,7 +105,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -123,7 +123,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -131,7 +131,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -145,7 +145,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -159,7 +159,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -177,7 +177,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -185,7 +185,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -199,7 +199,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -213,7 +213,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -231,7 +231,7 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -239,7 +239,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -253,7 +253,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -267,7 +267,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -285,7 +285,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -293,7 +293,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -307,7 +307,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -321,7 +321,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -339,7 +339,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -347,7 +347,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -361,7 +361,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -375,7 +375,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -393,7 +393,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -401,7 +401,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -415,7 +415,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -429,7 +429,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -447,7 +447,7 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -455,7 +455,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -469,7 +469,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -483,7 +483,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -501,7 +501,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -509,7 +509,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -523,7 +523,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -537,7 +537,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -555,7 +555,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -563,7 +563,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -577,7 +577,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -591,7 +591,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -609,7 +609,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -617,7 +617,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -631,7 +631,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -645,7 +645,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tls_persistent_running_no_dst.conf b/cases/migration/tls_persistent_running_no_dst.conf
> index f72b3d4..8aacc71 100644
> --- a/cases/migration/tls_persistent_running_no_dst.conf
> +++ b/cases/migration/tls_persistent_running_no_dst.conf
> @@ -15,13 +15,13 @@ remoteAccess:tls_setup
>          none
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -33,7 +33,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -51,13 +51,13 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -69,7 +69,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -87,13 +87,13 @@ domain:migrate
>          peer2peer|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -105,7 +105,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -123,13 +123,13 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -141,7 +141,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -159,13 +159,13 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -177,7 +177,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -195,13 +195,13 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -213,7 +213,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -231,13 +231,13 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -249,7 +249,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -267,13 +267,13 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -285,7 +285,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -303,13 +303,13 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -321,7 +321,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -339,13 +339,13 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -357,7 +357,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -375,13 +375,13 @@ domain:migrate
>          0|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -393,7 +393,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -411,13 +411,13 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -429,7 +429,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tls_persistent_running_with_dst.conf b/cases/migration/tls_persistent_running_with_dst.conf
> index cd6589f..bfc89ff 100644
> --- a/cases/migration/tls_persistent_running_with_dst.conf
> +++ b/cases/migration/tls_persistent_running_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tls_setup
>          none
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -23,7 +23,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -37,7 +37,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -49,7 +49,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -67,7 +67,7 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -75,7 +75,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -89,7 +89,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -101,7 +101,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -119,7 +119,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -127,7 +127,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -141,7 +141,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -153,7 +153,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -171,7 +171,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -179,7 +179,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -193,7 +193,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -205,7 +205,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -223,7 +223,7 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -231,7 +231,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -245,7 +245,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -257,7 +257,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -275,7 +275,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -283,7 +283,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -297,7 +297,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -309,7 +309,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -327,7 +327,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -335,7 +335,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -349,7 +349,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -361,7 +361,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -379,7 +379,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -387,7 +387,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -401,7 +401,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -413,7 +413,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -431,7 +431,7 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -439,7 +439,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -453,7 +453,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -465,7 +465,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -483,7 +483,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -491,7 +491,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -505,7 +505,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -517,7 +517,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -535,7 +535,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -543,7 +543,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -557,7 +557,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -569,7 +569,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -587,7 +587,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -595,7 +595,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -609,7 +609,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -621,7 +621,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tls_sasl_persistent_paused_no_dst.conf b/cases/migration/tls_sasl_persistent_paused_no_dst.conf
> index 5e33a60..d74db91 100644
> --- a/cases/migration/tls_sasl_persistent_paused_no_dst.conf
> +++ b/cases/migration/tls_sasl_persistent_paused_no_dst.conf
> @@ -15,13 +15,13 @@ remoteAccess:tls_setup
>          sasl
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -35,7 +35,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -53,13 +53,13 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -73,7 +73,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -91,13 +91,13 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -111,7 +111,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -129,13 +129,13 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -149,7 +149,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tls_sasl_persistent_paused_with_dst.conf b/cases/migration/tls_sasl_persistent_paused_with_dst.conf
> index 196789a..86c8dd1 100644
> --- a/cases/migration/tls_sasl_persistent_paused_with_dst.conf
> +++ b/cases/migration/tls_sasl_persistent_paused_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tls_setup
>          sasl
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -23,7 +23,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -37,7 +37,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -51,7 +51,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -69,7 +69,7 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -77,7 +77,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -91,7 +91,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -105,7 +105,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -123,7 +123,7 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -131,7 +131,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -145,7 +145,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -159,7 +159,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -177,7 +177,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -185,7 +185,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -199,7 +199,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>      flags
>          start_paused
> @@ -213,7 +213,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tls_sasl_persistent_running_no_dst.conf b/cases/migration/tls_sasl_persistent_running_no_dst.conf
> index 5086ec4..028878a 100644
> --- a/cases/migration/tls_sasl_persistent_running_no_dst.conf
> +++ b/cases/migration/tls_sasl_persistent_running_no_dst.conf
> @@ -15,13 +15,13 @@ remoteAccess:tls_setup
>          sasl
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -33,7 +33,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -51,13 +51,13 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -69,7 +69,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -87,13 +87,13 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -105,7 +105,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -123,13 +123,13 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -141,7 +141,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tls_sasl_persistent_running_with_dst.conf b/cases/migration/tls_sasl_persistent_running_with_dst.conf
> index cf1c5dc..01d2e9b 100644
> --- a/cases/migration/tls_sasl_persistent_running_with_dst.conf
> +++ b/cases/migration/tls_sasl_persistent_running_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tls_setup
>          sasl
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -23,7 +23,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -37,7 +37,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -49,7 +49,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -67,7 +67,7 @@ domain:migrate
>          0|live
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -75,7 +75,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -89,7 +89,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -101,7 +101,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -119,7 +119,7 @@ domain:migrate
>          0|paused
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -127,7 +127,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -141,7 +141,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -153,7 +153,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -171,7 +171,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -179,7 +179,7 @@ domain:define
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -193,7 +193,7 @@ domain:define
>          $target_password
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultos
>  
>  domain:migrate
> @@ -205,7 +205,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tls_sasl_transient_paused_no_dst.conf b/cases/migration/tls_sasl_transient_paused_no_dst.conf
> index a93efed..0ea5826 100644
> --- a/cases/migration/tls_sasl_transient_paused_no_dst.conf
> +++ b/cases/migration/tls_sasl_transient_paused_no_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tls_setup
>          sasl
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -31,7 +31,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -49,7 +49,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -65,7 +65,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -83,7 +83,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -99,7 +99,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -117,7 +117,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -133,7 +133,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tls_sasl_transient_paused_with_dst.conf b/cases/migration/tls_sasl_transient_paused_with_dst.conf
> index 25f455b..89ea05e 100644
> --- a/cases/migration/tls_sasl_transient_paused_with_dst.conf
> +++ b/cases/migration/tls_sasl_transient_paused_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tls_setup
>          sasl
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -25,7 +25,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -47,7 +47,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -65,7 +65,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -75,7 +75,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -97,7 +97,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -115,7 +115,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -125,7 +125,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -147,7 +147,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -165,7 +165,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -175,7 +175,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -197,7 +197,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tls_sasl_transient_running_no_dst.conf b/cases/migration/tls_sasl_transient_running_no_dst.conf
> index d67383d..c40eb91 100644
> --- a/cases/migration/tls_sasl_transient_running_no_dst.conf
> +++ b/cases/migration/tls_sasl_transient_running_no_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tls_setup
>          sasl
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -29,7 +29,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -47,7 +47,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -61,7 +61,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -79,7 +79,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -93,7 +93,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -111,7 +111,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -125,7 +125,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tls_sasl_transient_running_with_dst.conf b/cases/migration/tls_sasl_transient_running_with_dst.conf
> index db68b92..230884a 100644
> --- a/cases/migration/tls_sasl_transient_running_with_dst.conf
> +++ b/cases/migration/tls_sasl_transient_running_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tls_setup
>          sasl
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -23,7 +23,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -45,7 +45,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -63,7 +63,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -71,7 +71,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -93,7 +93,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -111,7 +111,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -119,7 +119,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -141,7 +141,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -159,7 +159,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -167,7 +167,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -189,7 +189,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tls_transient_paused_no_dst.conf b/cases/migration/tls_transient_paused_no_dst.conf
> index d6d3b60..9ea0fac 100644
> --- a/cases/migration/tls_transient_paused_no_dst.conf
> +++ b/cases/migration/tls_transient_paused_no_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tls_setup
>          none
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -31,7 +31,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -49,7 +49,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -65,7 +65,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -83,7 +83,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -99,7 +99,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -117,7 +117,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -133,7 +133,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -151,7 +151,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -167,7 +167,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -185,7 +185,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -201,7 +201,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -219,7 +219,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -235,7 +235,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -253,7 +253,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -269,7 +269,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -295,7 +295,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -313,7 +313,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -329,7 +329,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -347,7 +347,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -363,7 +363,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -381,7 +381,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -397,7 +397,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tls_transient_paused_with_dst.conf b/cases/migration/tls_transient_paused_with_dst.conf
> index 9052a9c..8e57f79 100644
> --- a/cases/migration/tls_transient_paused_with_dst.conf
> +++ b/cases/migration/tls_transient_paused_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tls_setup
>          none
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -25,7 +25,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -47,7 +47,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -65,7 +65,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -75,7 +75,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -97,7 +97,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -115,7 +115,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -125,7 +125,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -147,7 +147,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -165,7 +165,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -175,7 +175,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -197,7 +197,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -215,7 +215,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -225,7 +225,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -247,7 +247,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -265,7 +265,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -275,7 +275,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -297,7 +297,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -315,7 +315,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -325,7 +325,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -347,7 +347,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -365,7 +365,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -375,7 +375,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -397,7 +397,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -415,7 +415,7 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -425,7 +425,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -447,7 +447,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -465,7 +465,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -475,7 +475,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -497,7 +497,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -515,7 +515,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -525,7 +525,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -547,7 +547,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> @@ -565,7 +565,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -575,7 +575,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -597,7 +597,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          paused
> diff --git a/cases/migration/tls_transient_running_no_dst.conf b/cases/migration/tls_transient_running_no_dst.conf
> index dfaff02..21daefc 100644
> --- a/cases/migration/tls_transient_running_no_dst.conf
> +++ b/cases/migration/tls_transient_running_no_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tls_setup
>          none
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -29,7 +29,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -47,7 +47,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -61,7 +61,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -79,7 +79,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -93,7 +93,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -111,7 +111,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -125,7 +125,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -143,7 +143,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -157,7 +157,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -175,7 +175,7 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -189,7 +189,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -207,7 +207,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -221,7 +221,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -239,7 +239,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -253,7 +253,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -271,7 +271,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -285,7 +285,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -303,7 +303,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -317,7 +317,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -335,7 +335,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -349,7 +349,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -367,7 +367,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -381,7 +381,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/migration/tls_transient_running_with_dst.conf b/cases/migration/tls_transient_running_with_dst.conf
> index f789d55..06d7307 100644
> --- a/cases/migration/tls_transient_running_with_dst.conf
> +++ b/cases/migration/tls_transient_running_with_dst.conf
> @@ -15,7 +15,7 @@ remoteAccess:tls_setup
>          none
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -23,7 +23,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -45,7 +45,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -63,7 +63,7 @@ domain:migrate
>          0|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -71,7 +71,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -93,7 +93,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -111,7 +111,7 @@ domain:migrate
>          peer2peer|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -119,7 +119,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -141,7 +141,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -159,7 +159,7 @@ domain:migrate
>          peer2peer|tunnelled|live
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -167,7 +167,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -189,7 +189,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -207,7 +207,7 @@ domain:migrate
>          0|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -215,7 +215,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -237,7 +237,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -255,7 +255,7 @@ domain:migrate
>          peer2peer|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -263,7 +263,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -285,7 +285,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -303,7 +303,7 @@ domain:migrate
>          peer2peer|tunnelled|paused
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -311,7 +311,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -333,7 +333,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -351,7 +351,7 @@ domain:migrate
>          0|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -359,7 +359,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -381,7 +381,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -399,7 +399,7 @@ domain:migrate
>          peer2peer|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -407,7 +407,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -429,7 +429,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -447,7 +447,7 @@ domain:migrate
>          peer2peer|tunnelled|persist_dest
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -455,7 +455,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -477,7 +477,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -495,7 +495,7 @@ domain:migrate
>          0|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -503,7 +503,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -525,7 +525,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> @@ -543,7 +543,7 @@ domain:migrate
>          peer2peer|undefine_source
>  
>  domain:create
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -551,7 +551,7 @@ domain:create
>          $static_uuid
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultos
>      virt_type
>          $defaulthv
> @@ -573,7 +573,7 @@ domain:migrate
>          $target_user
>      password
>          $target_password
> -    guestname
> +    domain_name
>          $defaultos
>      prestate
>          running
> diff --git a/cases/snapshot.conf b/cases/snapshot.conf
> index bceabe2..a69190c 100644
> --- a/cases/snapshot.conf
> +++ b/cases/snapshot.conf
> @@ -1,5 +1,5 @@
>  domain:install_linux_cdrom
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -19,25 +19,25 @@ domain:install_linux_cdrom
>          54:52:00:45:c3:8a
>  
>  domain:shutdown
> -    guestname
> +    domain_name
>          $defaultname
>  
>  snapshot:internal_create
> -    guestname
> +    domain_name
>          $defaultname
>      snapshotname
>          test-API-snapshot-testing
>  
>  snapshot:snapshot_list
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultname
>  
>  snapshot:file_flag
> -    guestname
> +    domain_name
>          $defaultname
>      username
>          root
> @@ -45,21 +45,21 @@ snapshot:file_flag
>          redhat
>  
>  domain:shutdown
> -    guestname
> +    domain_name
>          $defaultname
>  
>  snapshot:revert
> -    guestname
> +    domain_name
>          $defaultname
>      snapshotname
>          test-API-snapshot-testing
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultname
>  
>  snapshot:flag_check
> -    guestname
> +    domain_name
>          $defaultname
>      username
>          root
> @@ -69,17 +69,17 @@ snapshot:flag_check
>          noexist
>  
>  domain:shutdown
> -    guestname
> +    domain_name
>          $defaultname
>  
>  snapshot:delete
> -    guestname
> +    domain_name
>          $defaultname
>      snapshotname
>          test-API-snapshot-testing
>  
>  domain:undefine
> -    guestname
> +    domain_name
>          $defaultname
>  
>  options cleanup=enable
> diff --git a/cases/windows_domain.conf b/cases/windows_domain.conf
> index 073009c..e114e76 100644
> --- a/cases/windows_domain.conf
> +++ b/cases/windows_domain.conf
> @@ -1,5 +1,5 @@
>  domain:install_windows_cdrom
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -17,81 +17,81 @@ domain:install_windows_cdrom
>          e1000
>  
>  domain:shutdown
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:destroy
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:undefine
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:define
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:suspend
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:resume
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:save
> -    guestname
> +    domain_name
>          $defaultname
>      filepath
>          /tmp/$defaultname
>  
>  domain:restore
> -    guestname
> +    domain_name
>          $defaultname
>      filepath
>          /tmp/$defaultname
>  
>  domain:autostart
> -    guestname
> +    domain_name
>          $defaultname
>      autostart
>          enable
>  
>  domain:ifstats
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:blkstats
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:dump
> -    guestname
> +    domain_name
>          $defaultname
>      file
>          /tmp/core
>  
>  domain:shutdown
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:start
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:attach_disk
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -103,7 +103,7 @@ domain:attach_disk
>          virtio
>  
>  domain:detach_disk
> -    guestname
> +    domain_name
>          $defaultname
>      virt_type
>          $defaulthv
> @@ -113,23 +113,23 @@ domain:detach_disk
>          virtio
>  
>  domain:cpu_affinity
> -    guestname
> +    domain_name
>          $defaultname
>      vcpu
>          $defaultvcpu
>  
>  #domain:balloon_memory
> -#    guestname
> +#    domain_name
>  #        $defaultname
>  #    memroy
>  #        1024,2048
>  
>  domain:destroy
> -    guestname
> +    domain_name
>          $defaultname
>  
>  domain:undefine
> -    guestname
> +    domain_name
>          $defaultname
>  
>  
> diff --git a/docs/User_Guide/libvirt-test-API_Guide/en-US/Creating_a_configuration_file.xml b/docs/User_Guide/libvirt-test-API_Guide/en-US/Creating_a_configuration_file.xml
> index ffac187..4e68dcc 100644
> --- a/docs/User_Guide/libvirt-test-API_Guide/en-US/Creating_a_configuration_file.xml
> +++ b/docs/User_Guide/libvirt-test-API_Guide/en-US/Creating_a_configuration_file.xml
> @@ -91,7 +91,7 @@ module:test_case
>  	      <title>Configuration file</title>
>  <programlisting>
>  Domain:install_domain
> -    guestname
> +    domain_name
>          rhel5u4
>      memory
>          1024
> @@ -105,7 +105,7 @@ Domain:install_domain
>  	      <title>List data structure</title>
>  <programlisting>
>  [
> -  [{'domain:install_domain': {'guestname': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}]
> +  [{'domain:install_domain': {'domain_name': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}]
>  ]
>  </programlisting>
>        </example>
> @@ -120,7 +120,7 @@ Domain:install_domain
>  	      <title>Configuration file</title>
>  <programlisting>
>  Domain:install_domain
> -    guestname
> +    domain_name
>          rhel5u4
>          rhel5u3
>          rhel5u2
> @@ -136,9 +136,9 @@ Domain:install_domain
>  	      <title>List data structure</title>
>  <programlisting>
>  [
> -  [{'domain:install_domain': {'guestname': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}],
> -  [{'domain:install_domain': {'guestname': 'rhel5u3', 'memory': '1024', 'vcpu': '1'}}],
> -  [{'domain:install_domain': {'guestname': 'rhel5u2', 'memory': '1024', 'vcpu': '1'}}]
> +  [{'domain:install_domain': {'domain_name': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}],
> +  [{'domain:install_domain': {'domain_name': 'rhel5u3', 'memory': '1024', 'vcpu': '1'}}],
> +  [{'domain:install_domain': {'domain_name': 'rhel5u2', 'memory': '1024', 'vcpu': '1'}}]
>  ]
>  </programlisting>
>        </example>
> @@ -153,7 +153,7 @@ Domain:install_domain
>  	      <title>Configuration file</title>
>  <programlisting>
>  domain:install_domain
> -    guestname
> +    domain_name
>          rhel5u4
>      memory
>          1024
> @@ -171,7 +171,7 @@ storage:initialize_storage
>  	      <title>List data structure</title>
>  <programlisting>
>  [
> -  [{'domain:install_domain': {'guestname': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'storage:initialize_storage': {'storagename': 'rhel5u4'}}]
> +  [{'domain:install_domain': {'domain_name': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'storage:initialize_storage': {'storagename': 'rhel5u4'}}]
>  ]
>  </programlisting>
>        </example>
> @@ -186,7 +186,7 @@ storage:initialize_storage
>  	      <title>Configuration file</title>
>  <programlisting>
>  domain:install_domain
> -    guestname
> +    domain_name
>          rhel5u4
>          rhel5u3
>          rhel5u2
> @@ -206,9 +206,9 @@ storage:initialize_storage
>  	      <title>List data structure</title>
>  <programlisting>
>  [
> -  [{'domain:install_domain': {'guestname': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'storage:initialize_storage': {'storagename': 'rhel5u4'}}],
> -  [{'domain:install_domain': {'guestname': 'rhel5u3', 'memory': '1024', 'vcpu': '1'}}, {'storage:initialize_storage': {'storagename': 'rhel5u4'}}],
> -  [{'domain:install_domain': {'guestname': 'rhel5u2', 'memory': '1024', 'vcpu': '1'}}, {'storage:initialize_storage': {'storagename': 'rhel5u4'}}]
> +  [{'domain:install_domain': {'domain_name': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'storage:initialize_storage': {'storagename': 'rhel5u4'}}],
> +  [{'domain:install_domain': {'domain_name': 'rhel5u3', 'memory': '1024', 'vcpu': '1'}}, {'storage:initialize_storage': {'storagename': 'rhel5u4'}}],
> +  [{'domain:install_domain': {'domain_name': 'rhel5u2', 'memory': '1024', 'vcpu': '1'}}, {'storage:initialize_storage': {'storagename': 'rhel5u4'}}]
>  ]
>  </programlisting>
>        </example>
> @@ -223,7 +223,7 @@ storage:initialize_storage
>  	      <title>Configuration file</title>
>  <programlisting>
>  domain:install_domain
> -    guestname
> +    domain_name
>          rhel5u4
>          rhel5u3
>          rhel5u2
> @@ -233,7 +233,7 @@ domain:install_domain
>          1
>  
>  domain:shutdown_domain
> -    guestname
> +    domain_name
>           rhel5u4 only rhel5u4
>           rhel5u3 only rhel5u3
>           rhel5u2 only rhel5u2
> @@ -245,9 +245,9 @@ domain:shutdown_domain
>  	      <title>List data structure</title>
>  <programlisting>
>  [
> -  [{'domain:install_domain': {'guestname': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'guestname': 'rhel5u4'}}],
> -  [{'domain:install_domain': {'guestname': 'rhel5u3', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'guestname': 'rhel5u3'}}],
> -  [{'domain:install_domain': {'guestname': 'rhel5u2', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'guestname': 'rhel5u2'}}]
> +  [{'domain:install_domain': {'domain_name': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'domain_name': 'rhel5u4'}}],
> +  [{'domain:install_domain': {'domain_name': 'rhel5u3', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'domain_name': 'rhel5u3'}}],
> +  [{'domain:install_domain': {'domain_name': 'rhel5u2', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'domain_name': 'rhel5u2'}}]
>  ]
>  </programlisting>
>        </example>
> @@ -262,7 +262,7 @@ domain:shutdown_domain
>  	      <title>Configuration file</title>
>  <programlisting>
>  domain:install_domain
> -    guestname
> +    domain_name
>          rhel5u4
>          rhel5u3
>          rhel5u2
> @@ -272,7 +272,7 @@ domain:install_domain
>          1
>  
>  domain:shutdown_domain
> -    guestname
> +    domain_name
>           rhel5u4 no rhel5u2|rhel5u3
>           rhel5u3 no rhel5u2|rhel5u4
>           rhel5u2 no rhel5u3|rhel5u4
> @@ -284,9 +284,9 @@ domain:shutdown_domain
>  	      <title>List data structure</title>
>  <programlisting>
>  [
> -  [{'domain:install_domain': {'guestname': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'guestname': 'rhel5u4'}}],
> -  [{'domain:install_domain': {'guestname': 'rhel5u3', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'guestname': 'rhel5u3'}}],
> -  [{'domain:install_domain': {'guestname': 'rhel5u2', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'guestname': 'rhel5u2'}}]
> +  [{'domain:install_domain': {'domain_name': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'domain_name': 'rhel5u4'}}],
> +  [{'domain:install_domain': {'domain_name': 'rhel5u3', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'domain_name': 'rhel5u3'}}],
> +  [{'domain:install_domain': {'domain_name': 'rhel5u2', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'domain_name': 'rhel5u2'}}]
>  ]
>  </programlisting>
>        </example>
> @@ -301,7 +301,7 @@ domain:shutdown_domain
>  	      <title>Configuration file</title>
>  <programlisting>
>  domain:install_domain
> -    guestname
> +    domain_name
>          rhel5u4
>          rhel5u3
>          rhel5u2
> @@ -311,7 +311,7 @@ domain:install_domain
>          1
>  
>  domain:shutdown_domain
> -    guestname
> +    domain_name
>          rhel5u4 no
>          rhel5u3 only rhel5u3
>          rhel5u2 no
> @@ -323,9 +323,9 @@ domain:shutdown_domain
>  	      <title>List data structure</title>
>  <programlisting>
>  [
> -  [{'domain:install_domain': {'guestname': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}],
> -  [{'domain:install_domain': {'guestname': 'rhel5u3', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'guestname': 'rhel5u3'}}],
> -  [{'domain:install_domain': {'guestname': 'rhel5u2', 'memory': '1024', 'vcpu': '1'}}]
> +  [{'domain:install_domain': {'domain_name': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}],
> +  [{'domain:install_domain': {'domain_name': 'rhel5u3', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'domain_name': 'rhel5u3'}}],
> +  [{'domain:install_domain': {'domain_name': 'rhel5u2', 'memory': '1024', 'vcpu': '1'}}]
>  ]
>  </programlisting>
>        </example>
> @@ -340,7 +340,7 @@ domain:shutdown_domain
>  	      <title>Configuration file</title>
>  <programlisting>
>  domain:install_domain
> -    guestname
> +    domain_name
>          rhel5u4
>          rhel5u3
>          rhel5u2
> @@ -350,7 +350,7 @@ domain:install_domain
>          1
>  
>  domain:shutdown_domain
> -    guestname
> +    domain_name
>          rhel5u4 no
>          rhel5u3 only rhel5u3
>          rhel5u2 no
> @@ -367,9 +367,9 @@ shutdowndomain
>  	      <title>List data structure</title>
>  <programlisting>
>  [
> -  [{'domain:install_domain': {'guestname': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'shutdowndomain': {'domainname': 'rhel5u4'}}],
> -  [{'domain:install_domain': {'guestname': 'rhel5u3', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'guestname': 'rhel5u3'}}, {'shutdowndomain': {'domainname': 'rhel5u3'}}],
> -  [{'domain:install_domain': {'guestname': 'rhel5u2', 'memory': '1024', 'vcpu': '1'}}, {'shutdowndomain': {'domainname': 'rhel5u2'}}]
> +  [{'domain:install_domain': {'domain_name': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'shutdowndomain': {'domainname': 'rhel5u4'}}],
> +  [{'domain:install_domain': {'domain_name': 'rhel5u3', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'domain_name': 'rhel5u3'}}, {'shutdowndomain': {'domainname': 'rhel5u3'}}],
> +  [{'domain:install_domain': {'domain_name': 'rhel5u2', 'memory': '1024', 'vcpu': '1'}}, {'shutdowndomain': {'domainname': 'rhel5u2'}}]
>  ]
>  </programlisting>
>        </example>
> @@ -384,7 +384,7 @@ shutdowndomain
>  	      <title>Configuration file</title>
>  <programlisting>
>  domain:install_domain times 2
> -    guestname
> +    domain_name
>          rhel5u4
>      memory
>          1024
> @@ -398,7 +398,7 @@ domain:install_domain times 2
>  	      <title>List data structure</title>
>  <programlisting>
>  [
> -  [{'domain:install_domain': {'guestname': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'domain:install_domain': {'guestname': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'domain:install_domain': {'guestname': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}]
> +  [{'domain:install_domain': {'domain_name': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'domain:install_domain': {'domain_name': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'domain:install_domain': {'domain_name': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}]
>  ]
>  </programlisting>
>        </example>
> @@ -413,7 +413,7 @@ domain:install_domain times 2
>  	      <title>Configuration file</title>
>  <programlisting>
>  domain:install_domain
> -    guestname
> +    domain_name
>          rhel5u4
>      memory
>          1024
> @@ -421,7 +421,7 @@ domain:install_domain
>          1
>  
>  domain:shutdown_domain
> -    guestname
> +    domain_name
>          rhel5u4
>  
>  options times 2
> @@ -433,9 +433,9 @@ options times 2
>  	      <title>List data structure</title>
>  <programlisting>
>  [
> -  [{'domain:install_domain': {'guestname': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'guestname': 'rhel5u4'}}],
> -  [{'domain:install_domain': {'guestname': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'guestname': 'rhel5u4'}}],
> -  [{'domain:install_domain': {'guestname': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'guestname': 'rhel5u4'}}]
> +  [{'domain:install_domain': {'domain_name': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'domain_name': 'rhel5u4'}}],
> +  [{'domain:install_domain': {'domain_name': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'domain_name': 'rhel5u4'}}],
> +  [{'domain:install_domain': {'domain_name': 'rhel5u4', 'memory': '1024', 'vcpu': '1'}}, {'domain:shutdown_domain': {'domain_name': 'rhel5u4'}}]
>  ]
>  </programlisting>
>        </example>
> @@ -450,7 +450,7 @@ options times 2
>  	      <title>Configuration file</title>
>  <programlisting>
>  domain:install_domain
> -    guestname
> +    domain_name
>          rhel5u4
>      memory
>          1024
> @@ -458,7 +458,7 @@ domain:install_domain
>          1
>  
>  domain:shutdown_domain
> -    guestname
> +    domain_name
>          rhel5u4
>  
>  options multiprocess=enable|disable
> diff --git a/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml b/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
> index 0280341..517a2af 100644
> --- a/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
> +++ b/docs/User_Guide/libvirt-test-API_Guide/en-US/Writing_a_test_case.xml
> @@ -106,7 +106,7 @@ storage:initialize_storage
>           raw
>  
>  domain:install_domain
> -    guestname
> +    domain_name
>          rhel5u4
>      virt_type
>          xenfv
> @@ -231,7 +231,7 @@ def prepare_cdrom(*args):
>  
>  def install_domain(dict):
>      logger = dict['logger']
> -    domname = dict['guestname']
> +    domname = dict['domain_name']
>      dict['ifacetype'] = 'bridge'
>      dict['bridge'] = 'xenbr0'
>      dict['bootcd'] = '/tmp/%s/custom.iso' %domname
> diff --git a/repos/domain/attach_disk.py b/repos/domain/attach_disk.py
> index b2cf45b..86e602f 100644
> --- a/repos/domain/attach_disk.py
> +++ b/repos/domain/attach_disk.py
> @@ -14,7 +14,7 @@ from src import sharedmod
>  from utils import utils
>  from utils import xml_builder
>  
> -required_params = ('guestname',
> +required_params = ('domain_name',
>                     'virt_type',
>                     'imagename',
>                     'imagesize',
> @@ -51,7 +51,7 @@ def check_attach_disk(num1, num2):
>  def attach_disk(params):
>      """Attach a disk to domain from xml"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      imagename = params['imagename']
>      imagesize = int(params['imagesize'])
>      disktype = params['hdmodel']
> @@ -65,14 +65,14 @@ def attach_disk(params):
>          logger.error("fail to create a image file")
>          return 1
>  
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      # Generate disk xml
>      xmlobj = xml_builder.XmlBuilder()
>      diskxml = xmlobj.build_disk(params)
>      logger.debug("disk xml:\n%s" %diskxml)
>  
> -    disk_num1 = utils.dev_num(guestname, "disk")
> +    disk_num1 = utils.dev_num(domain_name, "disk")
>      logger.debug("original disk number: %s" %disk_num1)
>  
>      if disktype == "virtio":
> @@ -85,7 +85,7 @@ def attach_disk(params):
>      # Attach disk to domain
>      try:
>          domobj.attachDevice(diskxml)
> -        disk_num2 = utils.dev_num(guestname, "disk")
> +        disk_num2 = utils.dev_num(domain_name, "disk")
>          logger.debug("update disk number to %s" %disk_num2)
>          if  check_attach_disk(disk_num1, disk_num2):
>              logger.info("current disk number: %s\n" %disk_num2)
> @@ -95,7 +95,7 @@ def attach_disk(params):
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("attach %s disk to domain %s" % (imagename, guestname))
> +        logger.error("attach %s disk to domain %s" % (imagename, domain_name))
>          return 1
>  
>      return 0
> diff --git a/repos/domain/attach_interface.py b/repos/domain/attach_interface.py
> index c22fbd9..64a1762 100644
> --- a/repos/domain/attach_interface.py
> +++ b/repos/domain/attach_interface.py
> @@ -12,12 +12,12 @@ from src import sharedmod
>  from utils import utils
>  from utils import xml_builder
>  
> -required_params = ('guestname', 'ifacetype', 'source',)
> +required_params = ('domain_name', 'ifacetype', 'source',)
>  optional_params = ('hdmodel',)
>  
> -def check_domain_status(guestname, domobj):
> +def check_domain_status(domain_name, domobj):
>      """Check domain current status"""
> -    state = domobj.get_state(guestname)
> +    state = domobj.get_state(domain_name)
>      if state == "shutoff" or state == "shutdown":
>      # add check function
>          return False
> @@ -34,23 +34,23 @@ def check_attach_interface(num1, num2):
>  def attach_interface(params):
>      """Attach a interface to domain from xml"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      conn = sharedmod.libvirtobj['conn']
>  
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      # Generate interface xml
>      xmlobj = xml_builder.XmlBuilder()
>      interfacexml = xmlobj.build_interface(params)
>      logger.debug("interface xml:\n%s" %interfacexml)
>  
> -    iface_num1 = utils.dev_num(guestname, "interface")
> +    iface_num1 = utils.dev_num(domain_name, "interface")
>      logger.debug("original interface number: %s" %iface_num1)
>  
>      # Attach interface to domain
>      try:
>          domobj.attachDeviceFlags(interfacexml, 0)
> -        iface_num2 = utils.dev_num(guestname, "interface")
> +        iface_num2 = utils.dev_num(domain_name, "interface")
>          logger.debug("update interface number to %s" %iface_num2)
>          if  check_attach_interface(iface_num1, iface_num2):
>              logger.info("current interface number: %s" %iface_num2)
> @@ -60,7 +60,7 @@ def attach_interface(params):
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("attach a interface to domain %s" % guestname)
> +        logger.error("attach a interface to domain %s" % domain_name)
>          return 1
>  
>      return 0
> diff --git a/repos/domain/autostart.py b/repos/domain/autostart.py
> index 7c3d498..aec1754 100644
> --- a/repos/domain/autostart.py
> +++ b/repos/domain/autostart.py
> @@ -10,19 +10,19 @@ from libvirt import libvirtError
>  
>  from src import sharedmod
>  
> -required_params = ('guestname', 'autostart',)
> +required_params = ('domain_name', 'autostart',)
>  optional_params = ()
>  
>  def check_domain_autostart(*args):
>      """Check domain start automatically result, if setting domain is
> -       successful, guestname.xml will exist under
> +       successful, domain_name.xml will exist under
>         /etc/libvirt/{hypervisor}/autostart/
>      """
> -    (guestname, hypervisor, flag, logger) = args
> +    (domain_name, hypervisor, flag, logger) = args
>      if 'xen' in hypervisor:
> -        domxml = "/etc/%s/auto/%s" % (hypervisor, guestname)
> +        domxml = "/etc/%s/auto/%s" % (hypervisor, domain_name)
>      else:
> -        domxml = "/etc/libvirt/%s/autostart/%s.xml" % (hypervisor, guestname)
> +        domxml = "/etc/libvirt/%s/autostart/%s.xml" % (hypervisor, domain_name)
>      logger.debug("domain xml file is: %s" %domxml)
>  
>      if flag == 1:
> @@ -41,7 +41,7 @@ def check_domain_autostart(*args):
>  def autostart(params):
>      """Set domain autostart capability"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      autostart = params['autostart']
>  
>      flag = -1
> @@ -54,14 +54,14 @@ def autostart(params):
>          return 1
>  
>      conn = sharedmod.libvirtobj['conn']
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>      uri = conn.getURI()
>  
>      try:
>          domobj.setAutostart(flag)
> -        if check_domain_autostart(guestname, uri.split(":")[0], flag, logger):
> +        if check_domain_autostart(domain_name, uri.split(":")[0], flag, logger):
>              logger.info("current %s autostart: %s" %
> -                        (guestname, domobj.autostart()))
> +                        (domain_name, domobj.autostart()))
>              logger.info("executing autostart operation is successful")
>          else:
>              logger.error("Error: fail to check autostart domain")
> @@ -69,7 +69,7 @@ def autostart(params):
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("Error: fail to autostart %s domain" %guestname)
> +        logger.error("Error: fail to autostart %s domain" %domain_name)
>          return 1
>  
>      return 0
> diff --git a/repos/domain/balloon_memory.py b/repos/domain/balloon_memory.py
> index dd3eafc..b027047 100644
> --- a/repos/domain/balloon_memory.py
> +++ b/repos/domain/balloon_memory.py
> @@ -15,7 +15,7 @@ from src import sharedmod
>  from utils import utils
>  from utils import check
>  
> -required_params = ('guestname', 'memorypair',)
> +required_params = ('domain_name', 'memorypair',)
>  optional_params = ()
>  
>  def get_mem_size(ip):
> @@ -127,7 +127,7 @@ def balloon_memory(params):
>      global logger
>      logger = params['logger']
>      params.pop('logger')
> -    domname = params['guestname']
> +    domname = params['domain_name']
>      memorypair = params['memorypair']
>      minmem = int(memorypair.split(',')[0]) * 1024
>      logger.info("the minimum memory is %s" % minmem)
> diff --git a/repos/domain/blkstats.py b/repos/domain/blkstats.py
> index 7b02ab9..bd3d08a 100644
> --- a/repos/domain/blkstats.py
> +++ b/repos/domain/blkstats.py
> @@ -11,7 +11,7 @@ from libvirt import libvirtError
>  
>  from src import sharedmod
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ()
>  
>  def check_domain_status(domobj):
> @@ -30,11 +30,11 @@ def check_blkstats():
>  def blkstats(params):
>      """Domain block device statistic"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>  
>      conn = sharedmod.libvirtobj['conn']
>  
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      # Check domain block status
>      if check_domain_status(domobj):
> diff --git a/repos/domain/console_io.py b/repos/domain/console_io.py
> index b63e0de..680cf42 100644
> --- a/repos/domain/console_io.py
> +++ b/repos/domain/console_io.py
> @@ -13,7 +13,7 @@ from exception import TestError
>  
>  from src import sharedmod
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ('device', 'timeout', 'input', 'output', 'expect',)
>  
>  def alarm_handler(signum, frame):
> @@ -22,7 +22,7 @@ def alarm_handler(signum, frame):
>  def console_io(params):
>      """Attach to console"""
>      logger = params['logger']
> -    domain = params['guestname']
> +    domain = params['domain_name']
>      device = params.get('device', 'serial0')
>      infile = params.get('input', None)
>      outfile = params.get('output', None)
> diff --git a/repos/domain/console_mutex.py b/repos/domain/console_mutex.py
> index 773e13d..1daace9 100644
> --- a/repos/domain/console_mutex.py
> +++ b/repos/domain/console_mutex.py
> @@ -7,13 +7,13 @@ from exception import TestError
>  
>  from src import sharedmod
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ('device',)
>  
>  def console_mutex(params):
>      """Attach to console"""
>      logger = params['logger']
> -    domain = params['guestname']
> +    domain = params['domain_name']
>      device = params.get('device', 'serial0')
>  
>      try:
> diff --git a/repos/domain/cpu_affinity.py b/repos/domain/cpu_affinity.py
> index 5a47ad4..2c18d09 100644
> --- a/repos/domain/cpu_affinity.py
> +++ b/repos/domain/cpu_affinity.py
> @@ -15,7 +15,7 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname', 'vcpu',)
> +required_params = ('domain_name', 'vcpu',)
>  optional_params = ()
>  
>  def redefine_vcpu_number(domobj, domain_name, vcpu):
> @@ -195,7 +195,7 @@ def cpu_affinity(params):
>      global logger
>      logger = params['logger']
>      params.pop('logger')
> -    domain_name = params['guestname']
> +    domain_name = params['domain_name']
>      vcpu = params['vcpu']
>  
>      logger.info("the name of virtual machine is %s" % domain_name)
> diff --git a/repos/domain/cpu_topology.py b/repos/domain/cpu_topology.py
> index 9c32b6d..ddebf39 100644
> --- a/repos/domain/cpu_topology.py
> +++ b/repos/domain/cpu_topology.py
> @@ -13,7 +13,7 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname',
> +required_params = ('domain_name',
>                     'username',
>                     'password',
>                     'sockets',
> @@ -21,21 +21,21 @@ required_params = ('guestname',
>                     'threads',)
>  optional_params = ()
>  
> -def check_domain_running(conn, guestname, logger):
> +def check_domain_running(conn, domain_name, logger):
>      """check if the domain exists"""
>      defined_domain_names = conn.listDefinedDomains()
>  
> -    if guestname not in defined_domain_names:
> -        logger.error("%s doesn't exist or still in running" % guestname)
> +    if domain_name not in defined_domain_names:
> +        logger.error("%s doesn't exist or still in running" % domain_name)
>          return 1
>      else:
>          return 0
>  
> -def add_cpu_xml(domobj, guestname, sockets, cores, threads, logger):
> +def add_cpu_xml(domobj, domain_name, sockets, cores, threads, logger):
>      """edit domain xml description and insert <cpu> element"""
>  
>      domxml = domobj.XMLDesc(0)
> -    logger.debug('''original domain %s xml :\n%s''' %(guestname, domxml))
> +    logger.debug('''original domain %s xml :\n%s''' %(domain_name, domxml))
>  
>      doc = minidom.parseString(domxml)
>      cpu = doc.createElement('cpu')
> @@ -86,11 +86,11 @@ def domain_define(domobj, domxml, logger):
>  
>      return 0
>  
> -def domain_start(domobj, guestname, util, logger):
> +def domain_start(domobj, domain_name, util, logger):
>      """start domain"""
>      timeout = 600
>      ip = ''
> -    mac = utils.get_dom_mac_addr(guestname)
> +    mac = utils.get_dom_mac_addr(domain_name)
>  
>      try:
>          logger.info("start domain")
> @@ -110,12 +110,12 @@ def domain_start(domobj, guestname, util, logger):
>          if not ip:
>              logger.info(str(timeout) + "s left")
>          else:
> -            logger.info("vm %s power on successfully" % guestname)
> -            logger.info("the ip address of vm %s is %s" % (guestname, ip))
> +            logger.info("vm %s power on successfully" % domain_name)
> +            logger.info("the ip address of vm %s is %s" % (domain_name, ip))
>              break
>  
>      if timeout <= 0:
> -        logger.info("fail to power on vm %s" % guestname)
> +        logger.info("fail to power on vm %s" % domain_name)
>          return 1, ip
>  
>      return 0, ip
> @@ -164,25 +164,25 @@ def cpu_topology(params):
>          and login to the domain to check the results
>      """
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      username = params['username']
>      password = params['password']
>      sockets = params['sockets']
>      cores = params['cores']
>      threads = params['threads']
>  
> -    logger.info("guestname is %s" % guestname)
> +    logger.info("domain_name is %s" % domain_name)
>      logger.info("sockets is %s" % sockets)
>      logger.info("cores is %s" % cores)
>      logger.info("threads is %s" % threads)
>  
>      conn = sharedmod.libvirtobj['conn']
>  
> -    if check_domain_running(conn, guestname, logger):
> +    if check_domain_running(conn, domain_name, logger):
>          return 1
>  
> -    domobj = conn.lookupByName(guestname)
> -    domxml = add_cpu_xml(domobj, guestname, sockets, cores, threads, logger)
> +    domobj = conn.lookupByName(domain_name)
> +    domxml = add_cpu_xml(domobj, domain_name, sockets, cores, threads, logger)
>  
>      if domain_undefine(domobj, logger):
>          return 1
> @@ -190,7 +190,7 @@ def cpu_topology(params):
>      if domain_define(domobj, domxml, logger):
>          return 1
>  
> -    ret, ip = domain_start(domobj, guestname, util, logger)
> +    ret, ip = domain_start(domobj, domain_name, util, logger)
>      if ret:
>          return 1
>  
> diff --git a/repos/domain/create.py b/repos/domain/create.py
> index 03bf0c1..c825184 100644
> --- a/repos/domain/create.py
> +++ b/repos/domain/create.py
> @@ -16,7 +16,7 @@ from utils import xml_builder
>  NONE = 0
>  START_PAUSED = 1
>  
> -required_params = ('guestname', 'virt_type',)
> +required_params = ('domain_name', 'virt_type',)
>  optional_params = ('uuid',
>                     'memory',
>                     'vcpu',
> @@ -32,7 +32,7 @@ optional_params = ('uuid',
>  def create(params):
>      """create a domain from xml"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>  
>      flags = None
>      if params.has_key('flags'):
> @@ -61,7 +61,7 @@ def create(params):
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("fail to create domain %s" % guestname)
> +        logger.error("fail to create domain %s" % domain_name)
>          return 1
>  
>      if flags == "start_paused":
> @@ -73,9 +73,9 @@ def create(params):
>              logger.error("domain state error")
>              return 1
>  
> -    logger.info("get the mac address of vm %s" % guestname)
> -    mac = utils.get_dom_mac_addr(guestname)
> -    logger.info("the mac address of vm %s is %s" % (guestname, mac))
> +    logger.info("get the mac address of vm %s" % domain_name)
> +    mac = utils.get_dom_mac_addr(domain_name)
> +    logger.info("the mac address of vm %s is %s" % (domain_name, mac))
>  
>      timeout = 600
>  
> @@ -88,12 +88,12 @@ def create(params):
>          if not ip:
>              logger.info(str(timeout) + "s left")
>          else:
> -            logger.info("vm %s power on successfully" % guestname)
> -            logger.info("the ip address of vm %s is %s" % (guestname, ip))
> +            logger.info("vm %s power on successfully" % domain_name)
> +            logger.info("the ip address of vm %s is %s" % (domain_name, ip))
>              break
>  
>          if timeout == 0:
> -            logger.info("fail to power on vm %s" % guestname)
> +            logger.info("fail to power on vm %s" % domain_name)
>              return 1
>  
>      return 0
> diff --git a/repos/domain/define.py b/repos/domain/define.py
> index e534d35..92b9e6e 100644
> --- a/repos/domain/define.py
> +++ b/repos/domain/define.py
> @@ -14,7 +14,7 @@ from src import sharedmod
>  from utils import utils
>  from utils import xml_builder
>  
> -required_params = ('guestname', 'virt_type',)
> +required_params = ('domain_name', 'virt_type',)
>  optional_params = ('uuid',
>                     'memory',
>                     'vcpu',
> @@ -27,16 +27,16 @@ optional_params = ('uuid',
>                     'ifacetype',
>                     'source',)
>  
> -def check_define_domain(guestname, virt_type, hostname, username, \
> +def check_define_domain(domain_name, virt_type, hostname, username, \
>                          password, util, logger):
>      """Check define domain result, if define domain is successful,
> -       guestname.xml will exist under /etc/libvirt/qemu/
> +       domain_name.xml will exist under /etc/libvirt/qemu/
>         and can use virt-xml-validate tool to check the file validity
>      """
>      if "kvm" in virt_type:
> -        path = "/etc/libvirt/qemu/%s.xml" % guestname
> +        path = "/etc/libvirt/qemu/%s.xml" % domain_name
>      elif "xen" in virt_type:
> -        path = "/etc/xen/%s" % guestname
> +        path = "/etc/xen/%s" % domain_name
>      else:
>          logger.error("unknown virt type")
>  
> @@ -45,7 +45,7 @@ def check_define_domain(guestname, virt_type, hostname, username, \
>          ret, output = utils.remote_exec_pexpect(hostname, username, \
>                                                 password, cmd)
>          if ret:
> -            logger.error("domain %s xml file doesn't exsits" % guestname)
> +            logger.error("domain %s xml file doesn't exsits" % domain_name)
>              return False
>          else:
>              return True
> @@ -58,7 +58,7 @@ def check_define_domain(guestname, virt_type, hostname, username, \
>  def define(params):
>      """Define a domain from xml"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      virt_type = params['virt_type']
>      conn = sharedmod.libvirtobj['conn']
>      uri = conn.getURI()
> @@ -80,7 +80,7 @@ def define(params):
>      # Define domain from xml
>      try:
>          conn.defineXML(dom_xml)
> -        if check_define_domain(guestname, virt_type, hostname, \
> +        if check_define_domain(domain_name, virt_type, hostname, \
>                                 username, password, util, logger):
>              logger.info("define a domain form xml is successful")
>          else:
> diff --git a/repos/domain/destroy.py b/repos/domain/destroy.py
> index 5245e63..c146aa3 100644
> --- a/repos/domain/destroy.py
> +++ b/repos/domain/destroy.py
> @@ -11,16 +11,16 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ('flags',)
>  
>  def destroy(params):
>      """destroy domain
>         Argument is a dictionary with two keys:
> -       {'guestname': guestname}
> +       {'domain_name': domain_name}
>  
>         logger -- an object of utils/log.py
> -       guestname -- the domain name
> +       domain_name -- the domain name
>         flags -- optional arguments:
>                    noping: Don't do the ping test
>  
> @@ -31,7 +31,7 @@ def destroy(params):
>      global logger
>      logger = params['logger']
>      params.pop('logger')
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      flags = ""
>      if params.has_key('flags'):
>          flags = params['flags']
> @@ -45,18 +45,18 @@ def destroy(params):
>          obj = conn.lookupByID(id)
>          domain_names.append(obj.name())
>  
> -    if guestname not in domain_names:
> -        logger.error("domain %s doesn't exist or isn't running." % guestname)
> +    if domain_name not in domain_names:
> +        logger.error("domain %s doesn't exist or isn't running." % domain_name)
>          return 1
>  
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      timeout = 60
>      logger.info('destroy domain')
>  
>      if not "noping" in flags:
>          # Get domain ip
> -        mac = utils.get_dom_mac_addr(guestname)
> +        mac = utils.get_dom_mac_addr(domain_name)
>          logger.info("get ip by mac address")
>          ip = utils.mac_to_ip(mac, 180)
>          logger.info("the ip address of domain is %s" % ip)
> @@ -83,7 +83,7 @@ def destroy(params):
>                  logger.error('The domain is still active, IP: ' + str(ip))
>                  return 1
>              else:
> -                logger.info("domain %s was destroyed successfully" % guestname)
> +                logger.info("domain %s was destroyed successfully" % domain_name)
>                  break
>  
>          if timeout <= 0:
> diff --git a/repos/domain/detach_disk.py b/repos/domain/detach_disk.py
> index 303c953..93adda4 100644
> --- a/repos/domain/detach_disk.py
> +++ b/repos/domain/detach_disk.py
> @@ -13,7 +13,7 @@ from src import sharedmod
>  from utils import utils
>  from utils import xml_builder
>  
> -required_params = ('guestname', 'virt_type', 'imagename', 'hdmodel',)
> +required_params = ('domain_name', 'virt_type', 'imagename', 'hdmodel',)
>  optional_params = ()
>  
>  def check_domain_status(domobj):
> @@ -37,19 +37,19 @@ def check_detach_disk(num1, num2):
>  def detach_disk(params):
>      """Detach a disk to domain from xml"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      imagename = params['imagename']
>      disktype = params['hdmodel']
>  
>      conn = sharedmod.libvirtobj['conn']
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      # Detach disk
>      xmlobj = xml_builder.XmlBuilder()
>      diskxml = xmlobj.build_disk(params)
>      logger.debug("disk xml:\n%s" %diskxml)
>  
> -    disk_num1 = utils.dev_num(guestname, "disk")
> +    disk_num1 = utils.dev_num(domain_name, "disk")
>      logger.debug("original disk number: %s" %disk_num1)
>  
>      if disktype == "virtio":
> @@ -61,7 +61,7 @@ def detach_disk(params):
>  
>      try:
>          domobj.detachDevice(diskxml)
> -        disk_num2 = utils.dev_num(guestname, "disk")
> +        disk_num2 = utils.dev_num(domain_name, "disk")
>          logger.debug("update disk number to %s" %disk_num2)
>          if  check_detach_disk(disk_num1, disk_num2):
>              logger.info("current disk number: %s\n" %disk_num2)
> @@ -71,7 +71,7 @@ def detach_disk(params):
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("detach %s disk from domain %s" % (imagename, guestname))
> +        logger.error("detach %s disk from domain %s" % (imagename, domain_name))
>          return 1
>  
>      return 0
> diff --git a/repos/domain/detach_interface.py b/repos/domain/detach_interface.py
> index e940386..3a66e90 100644
> --- a/repos/domain/detach_interface.py
> +++ b/repos/domain/detach_interface.py
> @@ -13,7 +13,7 @@ from src import sharedmod
>  from utils import utils
>  from utils import xml_builder
>  
> -required_params = ('guestname', 'ifacetype', 'source', 'nicmodel',)
> +required_params = ('domain_name', 'ifacetype', 'source', 'nicmodel',)
>  optional_params = ()
>  
>  def check_domain_status(domobj):
> @@ -37,21 +37,21 @@ def check_detach_interface(num1, num2):
>  def detach_interface(params):
>      """Detach a interface to domain from xml"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>  
> -    macs = utils.get_dom_mac_addr(guestname)
> +    macs = utils.get_dom_mac_addr(domain_name)
>      mac_list = macs.split("\n")
>      logger.debug("mac address: \n%s" % macs)
>      params['macaddr'] = mac_list[-1]
>  
>      conn = sharedmod.libvirtobj['conn']
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      xmlobj = xml_builder.XmlBuilder()
>      ifacexml = xmlobj.build_interface(params)
>      logger.debug("interface xml:\n%s" % ifacexml)
>  
> -    iface_num1 = utils.dev_num(guestname, "interface")
> +    iface_num1 = utils.dev_num(domain_name, "interface")
>      logger.debug("original interface number: %s" % iface_num1)
>  
>      if check_domain_status(domobj):
> @@ -62,7 +62,7 @@ def detach_interface(params):
>  
>      try:
>          domobj.detachDevice(ifacexml)
> -        iface_num2 = utils.dev_num(guestname, "interface")
> +        iface_num2 = utils.dev_num(domain_name, "interface")
>          logger.debug("update interface number to %s" % iface_num2)
>          if  check_detach_interface(iface_num1, iface_num2):
>              logger.info("current interface number: %s" % iface_num2)
> @@ -73,7 +73,7 @@ def detach_interface(params):
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("detach the interface from domain %s" % guestname)
> +        logger.error("detach the interface from domain %s" % domain_name)
>          return 1
>  
>      return 0
> diff --git a/repos/domain/domain_blkinfo.py b/repos/domain/domain_blkinfo.py
> index eb946c9..8aec094 100644
> --- a/repos/domain/domain_blkinfo.py
> +++ b/repos/domain/domain_blkinfo.py
> @@ -16,7 +16,7 @@ GET_CAPACITY = "du -b %s | awk '{print $1}'"
>  GET_PHYSICAL_K = " du -B K %s | awk '{print $1}'"
>  VIRSH_DOMBLKINFO = "virsh domblkinfo %s %s"
>  
> -required_params = ('guestname', 'blockdev',)
> +required_params = ('domain_name', 'blockdev',)
>  optional_params = ()
>  
>  def get_output(command, logger):
> @@ -28,7 +28,7 @@ def get_output(command, logger):
>          logger.error(ret)
>      return status, ret
>  
> -def check_domain_exists(conn, guestname, logger):
> +def check_domain_exists(conn, domain_name, logger):
>      """ check if the domain exists, may or may not be active """
>      domain_names = []
>      ids = conn.listDomainsID()
> @@ -38,8 +38,8 @@ def check_domain_exists(conn, guestname, logger):
>  
>      domain_names += conn.listDefinedDomains()
>  
> -    if guestname not in domain_names:
> -        logger.error("%s doesn't exist" % guestname)
> +    if domain_name not in domain_names:
> +        logger.error("%s doesn't exist" % domain_name)
>          return False
>      else:
>          return True
> @@ -82,26 +82,26 @@ def domblkinfo(params):
>          in the output of virsh domblkinfo
>      """
>      logger = params['logger']
> -    guestname = params.get('guestname')
> +    domain_name = params.get('domain_name')
>      blockdev = params.get('blockdev')
>  
> -    logger.info("the name of domain is %s" % guestname)
> +    logger.info("the name of domain is %s" % domain_name)
>      logger.info("the block device is %s" % blockdev)
>  
>      conn = sharedmod.libvirtobj['conn']
>  
> -    if not check_domain_exists(conn, guestname, logger):
> +    if not check_domain_exists(conn, domain_name, logger):
>          logger.error("need a defined domain")
>          return 1
>  
>      logger.info("the output of virsh domblkinfo is:")
> -    status, output = get_output(VIRSH_DOMBLKINFO % (guestname, blockdev), logger)
> +    status, output = get_output(VIRSH_DOMBLKINFO % (domain_name, blockdev), logger)
>      if not status:
>          logger.info("\n" + output)
>      else:
>          return 1
>  
> -    status, data_str = get_output(GET_DOMBLKINFO_MAC % (guestname, blockdev), logger)
> +    status, data_str = get_output(GET_DOMBLKINFO_MAC % (domain_name, blockdev), logger)
>      if not status:
>          blkdata = data_str.rstrip().split('\n')
>          logger.info("capacity,allocation,physical list: %s" % blkdata)
> diff --git a/repos/domain/domain_id.py b/repos/domain/domain_id.py
> index 19a6227..7c86674 100644
> --- a/repos/domain/domain_id.py
> +++ b/repos/domain/domain_id.py
> @@ -10,7 +10,7 @@ import libvirt
>  from src import sharedmod
>  
>  required_params = ()
> -optional_params = ('guestname',)
> +optional_params = ('domain_name',)
>  
>  VIRSH_DOMID = "virsh domid"
>  VIRSH_IDS = "virsh --quiet list |awk '{print $1}'"
> @@ -25,7 +25,7 @@ def get_output(logger, command):
>          logger.error(ret)
>      return status, ret
>  
> -def check_domain_exists(conn, guestname, logger):
> +def check_domain_exists(conn, domain_name, logger):
>      """ check if the domain exists, may or may not be active """
>      domain_names = []
>      ids = conn.listDomainsID()
> @@ -33,8 +33,8 @@ def check_domain_exists(conn, guestname, logger):
>          obj = conn.lookupByID(id)
>          domain_names.append(obj.name())
>  
> -    if guestname not in domain_names:
> -        logger.error("%s is not running or does not exist" % guestname)
> +    if domain_name not in domain_names:
> +        logger.error("%s is not running or does not exist" % domain_name)
>          return False
>      else:
>          return True
> @@ -45,8 +45,8 @@ def domid(params):
>      logger = params['logger']
>  
>      doms = []
> -    if 'guestname' in params:
> -        doms.append(params['guestname'])
> +    if 'domain_name' in params:
> +        doms.append(params['domain_name'])
>      else:
>          status, doms_ret = get_output(logger, VIRSH_DOMS)
>          if not status:
> diff --git a/repos/domain/domain_uuid.py b/repos/domain/domain_uuid.py
> index f4fc588..6d487e8 100644
> --- a/repos/domain/domain_uuid.py
> +++ b/repos/domain/domain_uuid.py
> @@ -16,7 +16,7 @@ optional_params = ()
>  
>  VIRSH_DOMUUID = "virsh domuuid"
>  
> -def check_domain_exists(conn, guestname, logger):
> +def check_domain_exists(conn, domain_name, logger):
>      """ check if the domain exists, may or may not be active """
>      domain_names = []
>      ids = conn.listDomainsID()
> @@ -26,17 +26,17 @@ def check_domain_exists(conn, guestname, logger):
>  
>      domain_names += conn.listDefinedDomains()
>  
> -    if guestname not in domain_names:
> -        logger.error("%s doesn't exist" % guestname)
> +    if domain_name not in domain_names:
> +        logger.error("%s doesn't exist" % domain_name)
>          return False
>      else:
>          return True
>  
> -def check_domain_uuid(guestname, UUIDString, logger):
> +def check_domain_uuid(domain_name, UUIDString, logger):
>      """ check UUID String of domain """
> -    status, ret = commands.getstatusoutput(VIRSH_DOMUUID + ' %s' % guestname)
> +    status, ret = commands.getstatusoutput(VIRSH_DOMUUID + ' %s' % domain_name)
>      if status:
> -        logger.error("executing "+ "\"" +  VIRSH_DOMUUID + ' %s' % guestname + "\"" + " failed")
> +        logger.error("executing "+ "\"" +  VIRSH_DOMUUID + ' %s' % domain_name + "\"" + " failed")
>          logger.error(ret)
>          return False
>      else:
> @@ -52,21 +52,21 @@ def domuuid(params):
>      """check virsh domuuid command
>      """
>      logger = params['logger']
> -    guestname = params['guestname']
> -    logger.info("domain name is %s" % guestname)
> +    domain_name = params['domain_name']
> +    logger.info("domain name is %s" % domain_name)
>  
>      conn = sharedmod.libvirtobj['conn']
>  
> -    if not check_domain_exists(conn, guestname, logger):
> +    if not check_domain_exists(conn, domain_name, logger):
>          logger.error("need a defined domain")
>          return 1
>  
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      try:
> -        logger.info("get the UUID string of %s" % guestname)
> +        logger.info("get the UUID string of %s" % domain_name)
>          UUIDString = domobj.UUIDString()
> -        if check_domain_uuid(guestname, UUIDString, logger):
> +        if check_domain_uuid(domain_name, UUIDString, logger):
>              logger.info("UUIDString from API is the same as the one from virsh")
>              logger.info("UUID String is %s" % UUIDString)
>              return 0
> diff --git a/repos/domain/domblkinfo.py b/repos/domain/domblkinfo.py
> index 1a2007a..091a1de 100644
> --- a/repos/domain/domblkinfo.py
> +++ b/repos/domain/domblkinfo.py
> @@ -11,7 +11,7 @@ from libvirt import libvirtError
>  
>  from src import sharedmod
>  
> -required_params = ('guestname', 'blockdev',)
> +required_params = ('domain_name', 'blockdev',)
>  optional_params = ()
>  
>  GET_DOMBLKINFO_MAC = "virsh domblkinfo %s %s | awk '{print $2}'"
> @@ -28,7 +28,7 @@ def get_output(command, logger):
>          logger.error(ret)
>      return status, ret
>  
> -def check_domain_exists(conn, guestname, logger):
> +def check_domain_exists(conn, domain_name, logger):
>      """ check if the domain exists, may or may not be active """
>      domain_names = []
>      ids = conn.listDomainsID()
> @@ -38,8 +38,8 @@ def check_domain_exists(conn, guestname, logger):
>  
>      domain_names += conn.listDefinedDomains()
>  
> -    if guestname not in domain_names:
> -        logger.error("%s doesn't exist" % guestname)
> +    if domain_name not in domain_names:
> +        logger.error("%s doesn't exist" % domain_name)
>          return False
>      else:
>          return True
> @@ -82,26 +82,26 @@ def domblkinfo(params):
>          in the output of virsh domblkinfo
>      """
>      logger = params['logger']
> -    guestname = params.get('guestname')
> +    domain_name = params.get('domain_name')
>      blockdev = params.get('blockdev')
>  
> -    logger.info("the name of domain is %s" % guestname)
> +    logger.info("the name of domain is %s" % domain_name)
>      logger.info("the block device is %s" % blockdev)
>  
>      conn = sharedmod.libvirtobj['conn']
>  
> -    if not check_domain_exists(conn, guestname, logger):
> +    if not check_domain_exists(conn, domain_name, logger):
>          logger.error("need a defined domain")
>          return 1
>  
>      logger.info("the output of virsh domblkinfo is:")
> -    status, output = get_output(VIRSH_DOMBLKINFO % (guestname, blockdev), logger)
> +    status, output = get_output(VIRSH_DOMBLKINFO % (domain_name, blockdev), logger)
>      if not status:
>          logger.info("\n" + output)
>      else:
>          return 1
>  
> -    status, data_str = get_output(GET_DOMBLKINFO_MAC % (guestname, blockdev), logger)
> +    status, data_str = get_output(GET_DOMBLKINFO_MAC % (domain_name, blockdev), logger)
>      if not status:
>          blkdata = data_str.rstrip().split('\n')
>          logger.info("capacity,allocation,physical list: %s" % blkdata)
> diff --git a/repos/domain/dump.py b/repos/domain/dump.py
> index 11ad11b..4a5e398 100644
> --- a/repos/domain/dump.py
> +++ b/repos/domain/dump.py
> @@ -14,12 +14,12 @@ from src import sharedmod
>  from utils import utils
>  from utils import check
>  
> -required_params = ('guestname', 'file',)
> +required_params = ('domain_name', 'file',)
>  optional_params = ()
>  
>  def check_domain_status(*args):
>      """Check domain current status"""
> -    (guestname, domobj, logger) = args
> +    (domain_name, domobj, logger) = args
>  
>      state = domobj.info()[0]
>      if state == libvirt.VIR_DOMAIN_SHUTOFF or state == libvirt.VIR_DOMAIN_SHUTDOWN:
> @@ -33,9 +33,9 @@ def check_domain_status(*args):
>  
>  def check_domain_kernel(*args):
>      """Check domain kernel version"""
> -    (guestname, logger) = args
> +    (domain_name, logger) = args
>  
> -    mac = utils.get_dom_mac_addr(guestname)
> +    mac = utils.get_dom_mac_addr(domain_name)
>      logger.debug("domain mac address: %s" %mac)
>  
>      ipaddr = utils.mac_to_ip(mac, 15)
> @@ -55,9 +55,9 @@ def check_domain_kernel(*args):
>  
>  def check_dump(*args):
>      """Check dumpping core file validity"""
> -    (guestname, file, kernel, logger) = args
> +    (domain_name, file, kernel, logger) = args
>  
> -    kernel = check_domain_kernel(guestname, logger)
> +    kernel = check_domain_kernel(domain_name, logger)
>      (big, other) = kernel.split("-")
>      small = other.split(".")
>      arch = small[-1]
> @@ -120,19 +120,19 @@ def dump(params):
>         will be interpreted in the remote host.
>      """
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      file = params['file']
>      conn = sharedmod.libvirtobj['conn']
>  
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
> -    if check_domain_status(guestname, domobj, logger):
> -        kernel = check_domain_kernel(guestname, logger)
> +    if check_domain_status(domain_name, domobj, logger):
> +        kernel = check_domain_kernel(domain_name, logger)
>          if kernel == None:
>              logger.error("can't get domain kernel version")
>              return 1
>  
> -        logger.info("dump the core of %s to file %s\n" %(guestname, file))
> +        logger.info("dump the core of %s to file %s\n" %(domain_name, file))
>  
>      try:
>          domobj.coreDump(file, 0)
> @@ -146,7 +146,7 @@ def dump(params):
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("Error: fail to core dump %s domain" %guestname)
> +        logger.error("Error: fail to core dump %s domain" %domain_name)
>          return 1
>  
>      return 0
> diff --git a/repos/domain/eventhandler.py b/repos/domain/eventhandler.py
> index 5e4dc58..44a363a 100644
> --- a/repos/domain/eventhandler.py
> +++ b/repos/domain/eventhandler.py
> @@ -16,7 +16,7 @@ LoopThread = None
>  looping = True
>  STATE = None
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ()
>  
>  def eventToString(event):
> @@ -41,7 +41,7 @@ def detailToString(event, detail):
>          )
>      return eventStrings[event][detail]
>  
> -def check_domain_running(conn, guestname, logger):
> +def check_domain_running(conn, domain_name, logger):
>      """ check if the domain exists, may or may not be active """
>      domain_names = []
>      ids = conn.listDomainsID()
> @@ -49,8 +49,8 @@ def check_domain_running(conn, guestname, logger):
>          obj = conn.lookupByID(id)
>          domain_names.append(obj.name())
>  
> -    if guestname not in domain_names:
> -        logger.error("%s doesn't exist or not running" % guestname)
> +    if domain_name not in domain_names:
> +        logger.error("%s doesn't exist or not running" % domain_name)
>          return 1
>      else:
>          return 0
> @@ -88,17 +88,17 @@ def lifecycle_callback(conn, domain, event, detail, opaque):
>                                                               detailToString(event, detail)))
>      STATE = eventToString(event)
>  
> -def shutdown_event(domobj, guestname, timeout, logger):
> +def shutdown_event(domobj, domain_name, timeout, logger):
>      """shutdown the domain, then check the event infomation"""
>      global STATE
>      STATE = None
> -    logger.info("power off %s" % guestname)
> +    logger.info("power off %s" % domain_name)
>      try:
>          domobj.shutdown()
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("Error: fail to power off %s" % guestname)
> +        logger.error("Error: fail to power off %s" % domain_name)
>          return 1
>  
>      while timeout:
> @@ -118,17 +118,17 @@ def shutdown_event(domobj, guestname, timeout, logger):
>  
>      return 0
>  
> -def bootup_event(domobj, guestname, timeout, logger):
> +def bootup_event(domobj, domain_name, timeout, logger):
>      """bootup the domain, then check the event infomation"""
>      global STATE
>      STATE = None
> -    logger.info("boot up domain %s" % guestname)
> +    logger.info("boot up domain %s" % domain_name)
>      try:
>          domobj.create()
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("Error: fail to bootup %s " % guestname)
> +        logger.error("Error: fail to bootup %s " % domain_name)
>          return 1
>  
>      while timeout:
> @@ -148,17 +148,17 @@ def bootup_event(domobj, guestname, timeout, logger):
>  
>      return 0
>  
> -def suspend_event(domobj, guestname, timeout, logger):
> +def suspend_event(domobj, domain_name, timeout, logger):
>      """suspend the domain, then check the event infomation"""
>      global STATE
>      STATE = None
> -    logger.info("suspend domain %s" % guestname)
> +    logger.info("suspend domain %s" % domain_name)
>      try:
>          domobj.suspend()
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("Error: fail to suspend %s" % guestname)
> +        logger.error("Error: fail to suspend %s" % domain_name)
>          return 1
>  
>      while timeout:
> @@ -178,17 +178,17 @@ def suspend_event(domobj, guestname, timeout, logger):
>  
>      return 0
>  
> -def resume_event(domobj, guestname, timeout, logger):
> +def resume_event(domobj, domain_name, timeout, logger):
>      """resume the domain, then check the event infomation"""
>      global STATE
>      STATE = None
> -    logger.info("resume domain %s" % guestname)
> +    logger.info("resume domain %s" % domain_name)
>      try:
>          domobj.resume()
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("Error: fail to resume %s" % guestname)
> +        logger.error("Error: fail to resume %s" % domain_name)
>          return 1
>  
>      while timeout:
> @@ -213,30 +213,30 @@ def eventhandler(params):
>          by using domain event handler.
>      """
>      logger = params['logger']
> -    guestname = params['guestname']
> -    logger.info("the guestname is %s" % guestname)
> +    domain_name = params['domain_name']
> +    logger.info("the domain_name is %s" % domain_name)
>  
>      loop_start()
>  
>      conn = sharedmod.libvirtobj['conn']
>  
> -    if check_domain_running(conn, guestname, logger):
> +    if check_domain_running(conn, domain_name, logger):
>          return 1
>  
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>      conn.domainEventRegister(lifecycle_callback, logger)
>  
>      timeout = 600
> -    if shutdown_event(domobj, guestname, timeout, logger):
> +    if shutdown_event(domobj, domain_name, timeout, logger):
>          logger.warn("shutdown_event error")
>  
> -    if bootup_event(domobj, guestname, timeout, logger):
> +    if bootup_event(domobj, domain_name, timeout, logger):
>          logger.warn("bootup_event error")
>  
> -    if suspend_event(domobj, guestname, timeout, logger):
> +    if suspend_event(domobj, domain_name, timeout, logger):
>          logger.warn("suspend_event error")
>  
> -    if resume_event(domobj, guestname, timeout, logger):
> +    if resume_event(domobj, domain_name, timeout, logger):
>          logger.warn("resume_event error")
>  
>      loop_stop(conn)
> diff --git a/repos/domain/ifstats.py b/repos/domain/ifstats.py
> index bc8bc0b..f67a437 100644
> --- a/repos/domain/ifstats.py
> +++ b/repos/domain/ifstats.py
> @@ -13,7 +13,7 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ()
>  
>  def check_domain_status(domobj):
> @@ -32,16 +32,16 @@ def check_interface_stats():
>  def ifstats(params):
>      """Domain interface statistic"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>  
>      conn = sharedmod.libvirtobj['conn']
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      if check_domain_status(domobj):
>          pass
>      else:
>          try:
> -            logger.info("%s is not running , power on it" % guestname)
> +            logger.info("%s is not running , power on it" % domain_name)
>              domobj.create()
>          except libvirtError, e:
>              logger.error("API error message: %s, error code is %s" \
> @@ -49,7 +49,7 @@ def ifstats(params):
>              logger.error("start failed")
>              return 1
>  
> -    mac = utils.get_dom_mac_addr(guestname)
> +    mac = utils.get_dom_mac_addr(domain_name)
>      logger.info("get ip by mac address")
>      ip = utils.mac_to_ip(mac, 180)
>  
> diff --git a/repos/domain/install_image.py b/repos/domain/install_image.py
> index 64d4d91..7b43a53 100644
> --- a/repos/domain/install_image.py
> +++ b/repos/domain/install_image.py
> @@ -17,7 +17,7 @@ from utils import xml_builder
>  
>  HOME_PATH = os.getcwd()
>  
> -required_params = ('guestname', 'virt_type', 'os_type', 'os_arch',)
> +required_params = ('domain_name', 'virt_type', 'os_type', 'os_arch',)
>  optional_params = ('uuid',
>                     'memory',
>                     'vcpu',
> @@ -33,12 +33,12 @@ def install_image(params):
>      logger = params['logger']
>      params.pop('logger')
>  
> -    guestname = params.get('guestname')
> +    domain_name = params.get('domain_name')
>      virt_type = params.get('virt_type')
>      os_type = params.get('os_type')
>      os_arch = params.get('os_arch')
>  
> -    logger.info("the name of domain is %s" % guestname)
> +    logger.info("the name of domain is %s" % domain_name)
>      logger.info("the type of domain is %s" % virt_type)
>      logger.info("the os of domain is %s" % os_type)
>      logger.info("the arch of domain is %s" % os_arch)
> @@ -49,13 +49,13 @@ def install_image(params):
>      logger.info("the type of hypervisor is %s" % hypervisor)
>  
>      if params.has_key('imagepath'):
> -        imgfullpath = os.join.path(params.get('imagepath'), guestname)
> +        imgfullpath = os.join.path(params.get('imagepath'), domain_name)
>      else:
>          if hypervisor == 'xen':
> -            imgfullpath = os.path.join('/var/lib/xen/images', guestname)
> +            imgfullpath = os.path.join('/var/lib/xen/images', domain_name)
>          elif hypervisor == 'kvm':
>              imgfullpath = os.path.join('/var/lib/libvirt/images',
> -                                       guestname)
> +                                       domain_name)
>  
>      logger.info("the path of directory of disk images located on is %s" %
>                   imgfullpath)
> @@ -84,10 +84,10 @@ def install_image(params):
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("fail to define domain %s" % guestname)
> +        logger.error("fail to define domain %s" % domain_name)
>          return 1
>  
> -    logger.info("define domain %s " % guestname)
> +    logger.info("define domain %s " % domain_name)
>      logger.debug("the xml description of domain booting off harddisk is %s" %
>                    domxml)
>  
> @@ -98,13 +98,13 @@ def install_image(params):
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("fail to start domain %s" % guestname)
> +        logger.error("fail to start domain %s" % domain_name)
>          return 1
>  
>  
> -    logger.info("get the mac address of vm %s" % guestname)
> -    mac = utils.get_dom_mac_addr(guestname)
> -    logger.info("the mac address of vm %s is %s" % (guestname, mac))
> +    logger.info("get the mac address of vm %s" % domain_name)
> +    mac = utils.get_dom_mac_addr(domain_name)
> +    logger.info("the mac address of vm %s is %s" % (domain_name, mac))
>  
>      timeout = 600
>  
> @@ -117,12 +117,12 @@ def install_image(params):
>          if not ip:
>              logger.info(str(timeout) + "s left")
>          else:
> -            logger.info("vm %s power on successfully" % guestname)
> -            logger.info("the ip address of vm %s is %s" % (guestname, ip))
> +            logger.info("vm %s power on successfully" % domain_name)
> +            logger.info("the ip address of vm %s is %s" % (domain_name, ip))
>              break
>  
>          if timeout == 0:
> -            logger.info("fail to power on vm %s" % guestname)
> +            logger.info("fail to power on vm %s" % domain_name)
>              return 1
>  
>      return 0
> diff --git a/repos/domain/install_linux_cdrom.py b/repos/domain/install_linux_cdrom.py
> index 3005f2e..b9ad241 100644
> --- a/repos/domain/install_linux_cdrom.py
> +++ b/repos/domain/install_linux_cdrom.py
> @@ -18,7 +18,7 @@ from src import global_parser
>  from utils import utils
>  from utils import xml_builder
>  
> -required_params = ('guestname', 'virt_type', 'os_type', 'os_arch',)
> +required_params = ('domain_name', 'virt_type', 'os_type', 'os_arch',)
>  optional_params = ('uuid',
>                     'memory',
>                     'vcpu',
> @@ -45,10 +45,10 @@ def prepare_cdrom(*args):
>      """ to customize boot.iso file to add kickstart
>          file into it for automatic domain installation
>      """
> -    ostree, ks, guestname, logger = args
> +    ostree, ks, domain_name, logger = args
>      ks_name = os.path.basename(ks)
>  
> -    new_dir = os.path.join(HOME_PATH, guestname)
> +    new_dir = os.path.join(HOME_PATH, domain_name)
>      logger.info("creating a new folder for customizing custom.iso file in it")
>  
>      if os.path.exists(new_dir):
> @@ -91,7 +91,7 @@ def prepare_boot_domain(domobj, dict, logger, installtype):
>      if params.has_key('kickstart'):
>          params.pop('kickstart')
>  
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>  
>      xmlobj = xml_builder.XmlBuilder()
>      domain = xmlobj.add_domain(params)
> @@ -102,7 +102,7 @@ def prepare_boot_domain(domobj, dict, logger, installtype):
>  
>      if installtype != 'create':
>          domobj.undefine()
> -        logger.info("undefine %s : \n" % guestname)
> +        logger.info("undefine %s : \n" % domain_name)
>  
>      try:
>          conn = domobj._conn
> @@ -110,10 +110,10 @@ def prepare_boot_domain(domobj, dict, logger, installtype):
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("fail to define domain %s" % guestname)
> +        logger.error("fail to define domain %s" % domain_name)
>          return 1
>  
> -    logger.info("define domain %s " % guestname)
> +    logger.info("define domain %s " % domain_name)
>      logger.debug("the xml description of domain booting off harddisk is %s" %
>                   domxml)
>  
> @@ -124,12 +124,12 @@ def prepare_boot_domain(domobj, dict, logger, installtype):
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("fail to start domain %s" % guestname)
> +        logger.error("fail to start domain %s" % domain_name)
>          return 1
>  
>      return 0
>  
> -def check_domain_state(conn, guestname, logger):
> +def check_domain_state(conn, domain_name, logger):
>      """ if a domain with the same name exists, remove it """
>      running_domains = []
>      ids = conn.listDomainsID()
> @@ -137,17 +137,17 @@ def check_domain_state(conn, guestname, logger):
>          obj = conn.lookupByID(id)
>          running_domains.append(obj.name())
>  
> -    if guestname in running_domains:
> -        logger.info("A domain with the same name %s is running!" % guestname)
> +    if domain_name in running_domains:
> +        logger.info("A domain with the same name %s is running!" % domain_name)
>          logger.info("destroy it...")
> -        domobj = conn.lookupByName(guestname)
> +        domobj = conn.lookupByName(domain_name)
>          domobj.destroy()
>  
>      defined_domains = conn.listDefinedDomains()
>  
> -    if guestname in defined_domains:
> -        logger.info("undefine the domain with the same name %s" % guestname)
> -        domobj = conn.lookupByName(guestname)
> +    if domain_name in defined_domains:
> +        logger.info("undefine the domain with the same name %s" % domain_name)
> +        domobj = conn.lookupByName(domain_name)
>          domobj.undefine()
>  
>      return 0
> @@ -158,18 +158,18 @@ def install_linux_cdrom(params):
>      logger = params['logger']
>      params.pop('logger')
>  
> -    guestname = params.get('guestname')
> +    domain_name = params.get('domain_name')
>      virt_type = params.get('virt_type')
>      os_type = params.get('os_type')
>      os_arch = params.get('os_arch')
>  
> -    logger.info("the name of domain is %s" % guestname)
> +    logger.info("the name of domain is %s" % domain_name)
>      logger.info("the type of domain is %s" % virt_type)
>  
>      hypervisor = utils.get_hypervisor()
>      conn = sharedmod.libvirtobj['conn']
>  
> -    check_domain_state(conn, guestname, logger)
> +    check_domain_state(conn, domain_name, logger)
>  
>      if not params.has_key('macaddr'):
>          macaddr = utils.get_rand_mac()
> @@ -179,13 +179,13 @@ def install_linux_cdrom(params):
>      logger.info("the type of hypervisor is %s" % hypervisor)
>  
>      if params.has_key('imagepath') and not params.has_key('volumepath'):
> -        imgfullpath = os.path.join(params.get('imagepath'), guestname)
> +        imgfullpath = os.path.join(params.get('imagepath'), domain_name)
>  
>      elif not params.has_key('imagepath') and not params.has_key('volumepath'):
>          if hypervisor == 'xen':
> -            imgfullpath = os.path.join('/var/lib/xen/images', guestname)
> +            imgfullpath = os.path.join('/var/lib/xen/images', domain_name)
>          elif hypervisor == 'kvm':
> -            imgfullpath = os.path.join('/var/lib/libvirt/images', guestname)
> +            imgfullpath = os.path.join('/var/lib/libvirt/images', domain_name)
>  
>      elif not params.has_key('imagepath') and params.has_key('volumepath'):
>          imgfullpath = params['volumepath']
> @@ -250,10 +250,10 @@ def install_linux_cdrom(params):
>  
>      elif virt_type == 'xenfv' or virt_type == 'kvm':
>          params['bootcd'] = '%s/custom.iso' % \
> -                           (os.path.join(HOME_PATH, guestname))
> +                           (os.path.join(HOME_PATH, domain_name))
>          logger.debug("the bootcd path is %s" % params['bootcd'])
>          logger.info("begin to customize the custom.iso file")
> -        prepare_cdrom(ostree, ks, guestname, logger)
> +        prepare_cdrom(ostree, ks, domain_name, logger)
>      else:
>          logger.error("unknown virt type: %s" % virt_type)
>          return 1
> @@ -271,7 +271,7 @@ def install_linux_cdrom(params):
>          except libvirtError, e:
>              logger.error("API error message: %s, error code is %s" \
>                           % (e.message, e.get_error_code()))
> -            logger.error("fail to define domain %s" % guestname)
> +            logger.error("fail to define domain %s" % domain_name)
>              return 1
>  
>          logger.info('start installation domain ...')
> @@ -281,7 +281,7 @@ def install_linux_cdrom(params):
>          except libvirtError, e:
>              logger.error("API error message: %s, error code is %s" \
>                           % (e.message, e.get_error_code()))
> -            logger.error("fail to start domain %s" % guestname)
> +            logger.error("fail to start domain %s" % domain_name)
>              return 1
>      elif installtype == 'create':
>          logger.info('create domain from xml description')
> @@ -290,7 +290,7 @@ def install_linux_cdrom(params):
>          except libvirtError, e:
>              logger.error("API error message: %s, error code is %s" \
>                           % (e.message, e.get_error_code()))
> -            logger.error("fail to define domain %s" % guestname)
> +            logger.error("fail to define domain %s" % domain_name)
>              return 1
>  
>      interval = 0
> @@ -316,7 +316,7 @@ def install_linux_cdrom(params):
>                  obj = conn.lookupByID(id)
>                  domain_names.append(obj.name())
>  
> -            if guestname not in domain_names:
> +            if domain_name not in domain_names:
>                  logger.info("domain installation of create type is complete.")
>                  logger.info("define the vm and boot it up")
>                  ret = prepare_boot_domain(domobj, params, logger, installtype)
> @@ -329,7 +329,7 @@ def install_linux_cdrom(params):
>                  logger.info('%s seconds passed away...' % interval)
>  
>      if interval == 2400:
> -        if 'rhel3u9' in guestname:
> +        if 'rhel3u9' in domain_name:
>              logger.info(
>              "domain installaton will be destoryed forcelly for rhel3u9 domain")
>              domobj.destroy()
> @@ -344,9 +344,9 @@ def install_linux_cdrom(params):
>      else:
>          logger.info("domain is booting up")
>  
> -    logger.info("get the mac address of vm %s" % guestname)
> -    mac = utils.get_dom_mac_addr(guestname)
> -    logger.info("the mac address of vm %s is %s" % (guestname, mac))
> +    logger.info("get the mac address of vm %s" % domain_name)
> +    mac = utils.get_dom_mac_addr(domain_name)
> +    logger.info("the mac address of vm %s is %s" % (domain_name, mac))
>  
>      timeout = 300
>  
> @@ -359,12 +359,12 @@ def install_linux_cdrom(params):
>          if not ip:
>              logger.info(str(timeout) + "s left")
>          else:
> -            logger.info("vm %s power on successfully" % guestname)
> -            logger.info("the ip address of vm %s is %s" % (guestname, ip))
> +            logger.info("vm %s power on successfully" % domain_name)
> +            logger.info("the ip address of vm %s is %s" % (domain_name, ip))
>              break
>  
>      if timeout == 0:
> -        logger.info("fail to power on vm %s" % guestname)
> +        logger.info("fail to power on vm %s" % domain_name)
>          return 1
>  
>      time.sleep(60)
> @@ -374,35 +374,35 @@ def install_linux_cdrom(params):
>  def install_linux_cdrom_clean(params):
>      """ clean testing environment """
>      logger = params['logger']
> -    guestname = params.get('guestname')
> +    domain_name = params.get('domain_name')
>      virt_type = params.get('virt_type')
>  
>      hypervisor = utils.get_hypervisor()
>      if hypervisor == 'xen':
> -        imgfullpath = os.path.join('/var/lib/xen/images', guestname)
> +        imgfullpath = os.path.join('/var/lib/xen/images', domain_name)
>      elif hypervisor == 'kvm':
> -        imgfullpath = os.path.join('/var/lib/libvirt/images', guestname)
> +        imgfullpath = os.path.join('/var/lib/libvirt/images', domain_name)
>  
> -    (status, output) = commands.getstatusoutput(VIRSH_QUIET_LIST % guestname)
> +    (status, output) = commands.getstatusoutput(VIRSH_QUIET_LIST % domain_name)
>      if status:
>          pass
>      else:
> -        logger.info("remove domain %s, and its disk image file" % guestname)
> -        (status, output) = commands.getstatusoutput(VM_STAT % guestname)
> +        logger.info("remove domain %s, and its disk image file" % domain_name)
> +        (status, output) = commands.getstatusoutput(VM_STAT % domain_name)
>          if status:
> -            (status, output) = commands.getstatusoutput(VM_DESTROY % guestname)
> +            (status, output) = commands.getstatusoutput(VM_DESTROY % domain_name)
>              if status:
> -                logger.error("failed to destroy domain %s" % guestname)
> +                logger.error("failed to destroy domain %s" % domain_name)
>                  logger.error("%s" % output)
>              else:
> -                (status, output) = commands.getstatusoutput(VM_UNDEFINE % guestname)
> +                (status, output) = commands.getstatusoutput(VM_UNDEFINE % domain_name)
>                  if status:
> -                    logger.error("failed to undefine domain %s" % guestname)
> +                    logger.error("failed to undefine domain %s" % domain_name)
>                      logger.error("%s" % output)
>          else:
> -            (status, output) = commands.getstatusoutput(VM_UNDEFINE % guestname)
> +            (status, output) = commands.getstatusoutput(VM_UNDEFINE % domain_name)
>              if status:
> -                logger.error("failed to undefine domain %s" % guestname)
> +                logger.error("failed to undefine domain %s" % domain_name)
>                  logger.error("%s" % output)
>  
>      if os.path.exists(imgfullpath):
> @@ -416,6 +416,6 @@ def install_linux_cdrom_clean(params):
>          if os.path.exists(initrd):
>              os.remove(initrd)
>      elif virt_type == 'xenfv' or virt_type == 'kvm':
> -        domain_dir = os.path.join(HOME_PATH, guestname)
> +        domain_dir = os.path.join(HOME_PATH, domain_name)
>          if os.path.exists(domain_dir):
>              shutil.rmtree(domain_dir)
> diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py
> index 97778b3..0067136 100644
> --- a/repos/domain/install_linux_check.py
> +++ b/repos/domain/install_linux_check.py
> @@ -15,7 +15,7 @@ from src import sharedmod
>  from src import global_parser
>  from utils import utils
>  
> -required_params = ('guestname', 'virt_type', 'hdmodel', 'nicmodel',)
> +required_params = ('domain_name', 'virt_type', 'hdmodel', 'nicmodel',)
>  optional_params = ('disksize',
>                     'memory',
>                     'vcpu',
> @@ -36,10 +36,10 @@ def install_linux_check(params):
>      logger = params['logger']
>      params.pop('logger')
>  
> -    guestname = params.get('guestname')
> +    domain_name = params.get('domain_name')
>      virt_type = params.get('virt_type')
>  
> -    logger.info("the name of domain is %s" % guestname)
> +    logger.info("the name of domain is %s" % domain_name)
>  
>      # Connect to local hypervisor connection URI
>      hypervisor = utils.get_hypervisor()
> @@ -47,7 +47,7 @@ def install_linux_check(params):
>      logger.info("the type of hypervisor is %s" % hypervisor)
>  
>      conn = sharedmod.libvirtobj['conn']
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>      state = domobj.info()[0]
>  
>      if(state == libvirt.VIR_DOMAIN_SHUTOFF):
> @@ -55,9 +55,9 @@ def install_linux_check(params):
>                       domain must be started")
>          return 1
>  
> -    logger.info("get the mac address of vm %s" % guestname)
> -    mac = utils.get_dom_mac_addr(guestname)
> -    logger.info("the mac address of vm %s is %s" % (guestname, mac))
> +    logger.info("get the mac address of vm %s" % domain_name)
> +    mac = utils.get_dom_mac_addr(domain_name)
> +    logger.info("the mac address of vm %s is %s" % (domain_name, mac))
>  
>      timeout = 300
>      while timeout:
> @@ -67,18 +67,18 @@ def install_linux_check(params):
>              time.sleep(10)
>              timeout -= 10
>          else:
> -            logger.info("the ip address of vm %s is %s" % (guestname, ipaddr))
> +            logger.info("the ip address of vm %s is %s" % (domain_name, ipaddr))
>              break
>  
>      if timeout == 0:
> -        logger.info("vm %s fail to get ip address" % guestname)
> +        logger.info("vm %s fail to get ip address" % domain_name)
>          return 1
>  
>      time.sleep(120)
>  
>      logger.info("Now checking domain health after installation")
>  
> -    domain_name=guestname
> +    domain_name=domain_name
>      blk_type=params['hdmodel']
>      nic_type=params['nicmodel']
>      Test_Result = 0
> diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py
> index 81a25bf..910f086 100644
> --- a/repos/domain/install_linux_net.py
> +++ b/repos/domain/install_linux_net.py
> @@ -18,7 +18,7 @@ from src import global_parser
>  from utils import utils
>  from utils import xml_builder
>  
> -required_params = ('guestname', 'virt_type', 'os_type', 'os_arch','netmethod',)
> +required_params = ('domain_name', 'virt_type', 'os_type', 'os_arch','netmethod',)
>  optional_params = ('uuid',
>                     'memory',
>                     'vcpu',
> @@ -48,7 +48,7 @@ def prepare_boot_domain(domobj, dict, logger, installtype):
>      if params.has_key('kickstart'):
>          params.pop('kickstart')
>  
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>  
>      xmlobj = xml_builder.XmlBuilder()
>      domain = xmlobj.add_domain(params)
> @@ -59,7 +59,7 @@ def prepare_boot_domain(domobj, dict, logger, installtype):
>  
>      if installtype != 'create':
>          domobj.undefine()
> -        logger.info("undefine %s : \n" % guestname)
> +        logger.info("undefine %s : \n" % domain_name)
>  
>      try:
>          conn = domobj._conn
> @@ -67,10 +67,10 @@ def prepare_boot_domain(domobj, dict, logger, installtype):
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("fail to define domain %s" % guestname)
> +        logger.error("fail to define domain %s" % domain_name)
>          return 1
>  
> -    logger.info("define domain %s " % guestname)
> +    logger.info("define domain %s " % domain_name)
>      logger.debug("the xml description of domain booting off harddisk is %s" %
>                   domxml)
>  
> @@ -81,7 +81,7 @@ def prepare_boot_domain(domobj, dict, logger, installtype):
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("fail to start domain %s" % guestname)
> +        logger.error("fail to start domain %s" % domain_name)
>          return 1
>  
>      return 0
> @@ -90,10 +90,10 @@ def prepare_cdrom(*args):
>      """ to customize boot.iso file to add kickstart
>          file into it for automatic domain installation
>      """
> -    ostree, ks, guestname, logger = args
> +    ostree, ks, domain_name, logger = args
>      ks_name = os.path.basename(ks)
>  
> -    new_dir = os.path.join(HOME_PATH, guestname)
> +    new_dir = os.path.join(HOME_PATH, domain_name)
>      logger.info("creating a new folder for customizing custom.iso file in it")
>  
>      if os.path.exists(new_dir):
> @@ -134,13 +134,13 @@ def install_linux_net(params):
>      logger = params['logger']
>      params.pop('logger')
>  
> -    guestname = params.get('guestname')
> +    domain_name = params.get('domain_name')
>      virt_type = params.get('virt_type')
>      os_type = params.get('os_type')
>      os_arch = params.get('os_arch')
>      installmethod = params.get('netmethod')
>  
> -    logger.info("the name of domain is %s" % guestname)
> +    logger.info("the name of domain is %s" % domain_name)
>      logger.info("the type of domain is %s" % virt_type)
>      logger.info("the installation method is %s" % installmethod)
>  
> @@ -151,12 +151,12 @@ def install_linux_net(params):
>      logger.info("the type of hypervisor is %s" % hypervisor)
>  
>      if params.has_key('imagepath'):
> -        fullimagepath = os.path.join(params.get('imagepath'), guestname)
> +        fullimagepath = os.path.join(params.get('imagepath'), domain_name)
>      else:
>          if hypervisor == 'xen':
> -            fullimagepath = os.path.join('/var/lib/xen/images', guestname)
> +            fullimagepath = os.path.join('/var/lib/xen/images', domain_name)
>          elif hypervisor == 'kvm':
> -            fullimagepath = os.path.join('/var/lib/libvirt/images', guestname)
> +            fullimagepath = os.path.join('/var/lib/libvirt/images', domain_name)
>  
>      params['fullimagepath'] = fullimagepath
>  
> @@ -232,10 +232,10 @@ def install_linux_net(params):
>          logger.debug("initrd file is located in /var/lib/libvirt/boot")
>      elif virt_type == 'xenfv':
>          params['bootcd'] = '%s/custom.iso' % \
> -                           (os.path.join(HOME_PATH, guestname))
> +                           (os.path.join(HOME_PATH, domain_name))
>          logger.debug("the bootcd path is %s" % params['bootcd'])
>          logger.info("begin to customize the custom.iso file")
> -        prepare_cdrom(ostree, ks, guestname, logger)
> +        prepare_cdrom(ostree, ks, domain_name, logger)
>      else:
>          logger.error("unknown virt type %s" % virt_type)
>  
> @@ -255,7 +255,7 @@ def install_linux_net(params):
>          except libvirtError, e:
>              logger.error("API error message: %s, error code is %s" \
>                           % (e.message, e.get_error_code()))
> -            logger.error("fail to define domain %s" % guestname)
> +            logger.error("fail to define domain %s" % domain_name)
>              return 1
>  
>          logger.info('start installation domain ...')
> @@ -265,7 +265,7 @@ def install_linux_net(params):
>          except libvirtError, e:
>              logger.error("API error message: %s, error code is %s" \
>                           % (e.message, e.get_error_code()))
> -            logger.error("fail to start domain %s" % guestname)
> +            logger.error("fail to start domain %s" % domain_name)
>              return 1
>      elif installtype == 'create':
>          logger.info('create domain from xml description')
> @@ -274,7 +274,7 @@ def install_linux_net(params):
>          except libvirtError, e:
>              logger.error("API error message: %s, error code is %s" \
>                           % (e.message, e.get_error_code()))
> -            logger.error("fail to define domain %s" % guestname)
> +            logger.error("fail to define domain %s" % domain_name)
>              return 1
>  
>      if 'rhel3u9' in os_type:
> @@ -318,7 +318,7 @@ def install_linux_net(params):
>                      obj = conn.lookupByID(id)
>                      domain_names.append(obj.name())
>  
> -                if guestname not in domain_names:
> +                if domain_name not in domain_names:
>                      logger.info("domain installation of create type is complete")
>                      logger.info("define the vm and boot it up")
>                      ret = prepare_boot_domain(domobj, params, logger, \
> @@ -337,9 +337,9 @@ def install_linux_net(params):
>          else:
>              logger.info("domain is booting up")
>  
> -    logger.info("get the mac address of vm %s" % guestname)
> -    mac = utils.get_dom_mac_addr(guestname)
> -    logger.info("the mac address of vm %s is %s" % (guestname, mac))
> +    logger.info("get the mac address of vm %s" % domain_name)
> +    mac = utils.get_dom_mac_addr(domain_name)
> +    logger.info("the mac address of vm %s is %s" % (domain_name, mac))
>  
>      timeout = 300
>      while timeout:
> @@ -351,12 +351,12 @@ def install_linux_net(params):
>          if not ip:
>              logger.info(str(timeout) + "s left")
>          else:
> -            logger.info("vm %s power on successfully" % guestname)
> -            logger.info("the ip address of vm %s is %s" % (guestname, ip))
> +            logger.info("vm %s power on successfully" % domain_name)
> +            logger.info("the ip address of vm %s is %s" % (domain_name, ip))
>              break
>  
>          if timeout == 0:
> -            logger.info("fail to power on vm %s" % guestname)
> +            logger.info("fail to power on vm %s" % domain_name)
>              return 1
>  
>      return 0
> @@ -364,35 +364,35 @@ def install_linux_net(params):
>  def install_linux_net_clean(params):
>      """ clean testing environment """
>      logger = params['logger']
> -    guestname = params.get('guestname')
> +    domain_name = params.get('domain_name')
>      virt_type = params.get('virt_type')
>  
>      hypervisor = utils.get_hypervisor()
>      if hypervisor == 'xen':
> -        imgfullpath = os.path.join('/var/lib/xen/images', guestname)
> +        imgfullpath = os.path.join('/var/lib/xen/images', domain_name)
>      elif hypervisor == 'kvm':
> -        imgfullpath = os.path.join('/var/lib/libvirt/images', guestname)
> +        imgfullpath = os.path.join('/var/lib/libvirt/images', domain_name)
>  
> -    (status, output) = commands.getstatusoutput(VIRSH_QUIET_LIST % guestname)
> +    (status, output) = commands.getstatusoutput(VIRSH_QUIET_LIST % domain_name)
>      if status:
>          pass
>      else:
> -        logger.info("remove domain %s, and its disk image file" % guestname)
> -        (status, output) = commands.getstatusoutput(VM_STAT % guestname)
> +        logger.info("remove domain %s, and its disk image file" % domain_name)
> +        (status, output) = commands.getstatusoutput(VM_STAT % domain_name)
>          if status:
> -            (status, output) = commands.getstatusoutput(VM_DESTROY % guestname)
> +            (status, output) = commands.getstatusoutput(VM_DESTROY % domain_name)
>              if status:
> -                logger.error("failed to destroy domain %s" % guestname)
> +                logger.error("failed to destroy domain %s" % domain_name)
>                  logger.error("%s" % output)
>              else:
> -                (status, output) = commands.getstatusoutput(VM_UNDEFINE % guestname)
> +                (status, output) = commands.getstatusoutput(VM_UNDEFINE % domain_name)
>                  if status:
> -                    logger.error("failed to undefine domain %s" % guestname)
> +                    logger.error("failed to undefine domain %s" % domain_name)
>                      logger.error("%s" % output)
>          else:
> -            (status, output) = commands.getstatusoutput(VM_UNDEFINE % guestname)
> +            (status, output) = commands.getstatusoutput(VM_UNDEFINE % domain_name)
>              if status:
> -                logger.error("failed to undefine domain %s" % guestname)
> +                logger.error("failed to undefine domain %s" % domain_name)
>                  logger.error("%s" % output)
>  
>      if os.path.exists(imgfullpath):
> @@ -406,6 +406,6 @@ def install_linux_net_clean(params):
>          if os.path.exists(initrd):
>              os.remove(initrd)
>      elif virt_type == 'xenfv':
> -        domain_dir = os.path.join(HOME_PATH, guestname)
> +        domain_dir = os.path.join(HOME_PATH, domain_name)
>          if os.path.exists(domain_dir):
>              shutil.rmtree(domain_dir)
> diff --git a/repos/domain/install_windows_cdrom.py b/repos/domain/install_windows_cdrom.py
> index 7982391..f1dcb12 100644
> --- a/repos/domain/install_windows_cdrom.py
> +++ b/repos/domain/install_windows_cdrom.py
> @@ -26,7 +26,7 @@ FLOOPY_IMG = "/tmp/floppy.img"
>  ISO_MOUNT_POINT = "/mnt/libvirt_windows"
>  HOME_PATH = os.getcwd()
>  
> -required_params = ('guestname', 'virt_type', 'os_type', 'os_arch',)
> +required_params = ('domain_name', 'virt_type', 'os_type', 'os_arch',)
>  optional_params = ('uuid',
>                     'memory',
>                     'vcpu',
> @@ -68,9 +68,9 @@ def prepare_iso(iso_file, mount_point):
>  
>      return 0, iso_local_path
>  
> -def prepare_floppy_image(guestname, os_type, os_arch,
> +def prepare_floppy_image(domain_name, os_type, os_arch,
>                           windows_unattended_path, cdkey, FLOOPY_IMG):
> -    """Making corresponding floppy images for the given guestname
> +    """Making corresponding floppy images for the given domain_name
>      """
>      if os.path.exists(FLOOPY_IMG):
>          os.remove(FLOOPY_IMG)
> @@ -150,7 +150,7 @@ def prepare_boot_domain(domobj, dict, installtype):
>      """
>      params = copy.deepcopy(dict)
>  
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>  
>      xmlobj = xml_builder.XmlBuilder()
>      domain = xmlobj.add_domain(params)
> @@ -161,7 +161,7 @@ def prepare_boot_domain(domobj, dict, installtype):
>  
>      if installtype != 'create':
>          domobj.undefine()
> -        logger.info("undefine %s : \n" % guestname)
> +        logger.info("undefine %s : \n" % domain_name)
>  
>      try:
>          conn = domobj._conn
> @@ -169,10 +169,10 @@ def prepare_boot_domain(domobj, dict, installtype):
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("fail to define domain %s" % guestname)
> +        logger.error("fail to define domain %s" % domain_name)
>          return 1
>  
> -    logger.info("define domain %s " % guestname)
> +    logger.info("define domain %s " % domain_name)
>      logger.debug("the xml description of domain booting off harddisk is %s" %
>                   domxml)
>  
> @@ -183,7 +183,7 @@ def prepare_boot_domain(domobj, dict, installtype):
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("fail to start domain %s" % guestname)
> +        logger.error("fail to start domain %s" % domain_name)
>          return 1
>  
>      return 0
> @@ -195,12 +195,12 @@ def install_windows_cdrom(params):
>      logger = params['logger']
>      params.pop('logger')
>  
> -    guestname = params.get('guestname')
> +    domain_name = params.get('domain_name')
>      virt_type = params.get('virt_type')
>      os_type = params.get('os_type')
>      os_arch = params.get('os_arch')
>  
> -    logger.info("the name of domain is %s" % guestname)
> +    logger.info("the name of domain is %s" % domain_name)
>      logger.info("the type of domain is %s" % virt_type)
>  
>      hypervisor = utils.get_hypervisor()
> @@ -213,12 +213,12 @@ def install_windows_cdrom(params):
>      logger.info("the type of hypervisor is %s" % hypervisor)
>  
>      if params.has_key('imagepath') and not params.has_key('volumepath'):
> -        imgfullpath = os.path.join(params.get('imagepath'), guestname)
> +        imgfullpath = os.path.join(params.get('imagepath'), domain_name)
>      elif not params.has_key('imagepath') and not params.has_key('volumepath'):
>          if hypervisor == 'xen':
> -            imgfullpath = os.path.join('/var/lib/xen/images', guestname)
> +            imgfullpath = os.path.join('/var/lib/xen/images', domain_name)
>          elif hypervisor == 'kvm':
> -            imgfullpath = os.path.join('/var/lib/libvirt/images', guestname)
> +            imgfullpath = os.path.join('/var/lib/libvirt/images', domain_name)
>      elif not params.has_key('imagepath') and params.has_key('volumepath'):
>          imgfullpath = params['volumepath']
>  
> @@ -278,7 +278,7 @@ def install_windows_cdrom(params):
>          return 1
>      params['bootcd'] = iso_local_path
>  
> -    status = prepare_floppy_image(guestname, os_type, os_arch,
> +    status = prepare_floppy_image(domain_name, os_type, os_arch,
>                                    windows_unattended_path, cdkey, FLOOPY_IMG)
>      if status:
>          logger.error("making floppy image failed")
> @@ -299,7 +299,7 @@ def install_windows_cdrom(params):
>          except libvirtError, e:
>              logger.error("API error message: %s, error code is %s" \
>                           % (e.message, e.get_error_code()))
> -            logger.error("fail to define domain %s" % guestname)
> +            logger.error("fail to define domain %s" % domain_name)
>              return 1
>  
>          logger.info('start installation domain ...')
> @@ -309,7 +309,7 @@ def install_windows_cdrom(params):
>          except libvirtError, e:
>              logger.error("API error message: %s, error code is %s" \
>                           % (e.message, e.get_error_code()))
> -            logger.error("fail to start domain %s" % guestname)
> +            logger.error("fail to start domain %s" % domain_name)
>              return 1
>      elif installtype == 'create':
>          logger.info('create domain from xml description')
> @@ -318,7 +318,7 @@ def install_windows_cdrom(params):
>          except libvirtError, e:
>              logger.error("API error message: %s, error code is %s" \
>                           % (e.message, e.get_error_code()))
> -            logger.error("fail to define domain %s" % guestname)
> +            logger.error("fail to define domain %s" % domain_name)
>              return 1
>  
>      interval = 0
> @@ -344,7 +344,7 @@ def install_windows_cdrom(params):
>                  obj = conn.lookupByID(id)
>                  domain_names.append(obj.name())
>  
> -            if guestname not in domain_names:
> +            if domain_name not in domain_names:
>                  logger.info("domain installation of create type is complete.")
>                  logger.info("define the vm and boot it up")
>                  ret = prepare_boot_domain(domobj, params, installtype)
> @@ -362,9 +362,9 @@ def install_windows_cdrom(params):
>      else:
>          logger.info("domain is booting up")
>  
> -    logger.info("get the mac address of vm %s" % guestname)
> -    mac = utils.get_dom_mac_addr(guestname)
> -    logger.info("the mac address of vm %s is %s" % (guestname, mac))
> +    logger.info("get the mac address of vm %s" % domain_name)
> +    mac = utils.get_dom_mac_addr(domain_name)
> +    logger.info("the mac address of vm %s is %s" % (domain_name, mac))
>  
>      timeout = 600
>  
> @@ -377,13 +377,13 @@ def install_windows_cdrom(params):
>          if not ip:
>              logger.info(str(timeout) + "s left")
>          else:
> -            logger.info("vm %s power on successfully" % guestname)
> -            logger.info("the ip address of vm %s is %s" % (guestname, ip))
> +            logger.info("vm %s power on successfully" % domain_name)
> +            logger.info("the ip address of vm %s is %s" % (domain_name, ip))
>  
>              break
>  
>      if timeout == 0:
> -        logger.info("fail to power on vm %s" % guestname)
> +        logger.info("fail to power on vm %s" % domain_name)
>          return 1
>  
>      time.sleep(60)
> @@ -393,35 +393,35 @@ def install_windows_cdrom(params):
>  def install_windows_cdrom_clean(params):
>      """ clean testing environment """
>      logger = params['logger']
> -    guestname = params.get('guestname')
> +    domain_name = params.get('domain_name')
>      virt_type = params.get('virt_type')
>  
>      hypervisor = utils.get_hypervisor()
>      if hypervisor == 'xen':
> -        imgfullpath = os.path.join('/var/lib/xen/images', guestname)
> +        imgfullpath = os.path.join('/var/lib/xen/images', domain_name)
>      elif hypervisor == 'kvm':
> -        imgfullpath = os.path.join('/var/lib/libvirt/images', guestname)
> +        imgfullpath = os.path.join('/var/lib/libvirt/images', domain_name)
>  
> -    (status, output) = commands.getstatusoutput(VIRSH_QUIET_LIST % guestname)
> +    (status, output) = commands.getstatusoutput(VIRSH_QUIET_LIST % domain_name)
>      if status:
>          pass
>      else:
> -        logger.info("remove domain %s, and its disk image file" % guestname)
> -        (status, output) = commands.getstatusoutput(VM_STAT % guestname)
> +        logger.info("remove domain %s, and its disk image file" % domain_name)
> +        (status, output) = commands.getstatusoutput(VM_STAT % domain_name)
>          if status:
> -            (status, output) = commands.getstatusoutput(VM_DESTROY % guestname)
> +            (status, output) = commands.getstatusoutput(VM_DESTROY % domain_name)
>              if status:
> -                logger.error("failed to destroy domain %s" % guestname)
> +                logger.error("failed to destroy domain %s" % domain_name)
>                  logger.error("%s" % output)
>              else:
> -                (status, output) = commands.getstatusoutput(VM_UNDEFINE % guestname)
> +                (status, output) = commands.getstatusoutput(VM_UNDEFINE % domain_name)
>                  if status:
> -                    logger.error("failed to undefine domain %s" % guestname)
> +                    logger.error("failed to undefine domain %s" % domain_name)
>                      logger.error("%s" % output)
>          else:
> -            (status, output) = commands.getstatusoutput(VM_UNDEFINE % guestname)
> +            (status, output) = commands.getstatusoutput(VM_UNDEFINE % domain_name)
>              if status:
> -                logger.error("failed to undefine domain %s" % guestname)
> +                logger.error("failed to undefine domain %s" % domain_name)
>                  logger.error("%s" % output)
>  
>      os_type = params.get('os_type')
> diff --git a/repos/domain/migrate.py b/repos/domain/migrate.py
> index e28d08d..c9d5e4e 100644
> --- a/repos/domain/migrate.py
> +++ b/repos/domain/migrate.py
> @@ -17,7 +17,7 @@ required_params = ('transport',
>                     'target_machine',
>                     'username',
>                     'password',
> -                   'guestname',
> +                   'domain_name',
>                     'prestate',
>                     'poststate',
>                     'presrcconfig',
> @@ -60,14 +60,14 @@ def exec_command(logger, command, flag):
>      return status, ret
>  
>  
> -def env_clean(srcconn, dstconn, target_machine, guestname, logger):
> +def env_clean(srcconn, dstconn, target_machine, domain_name, logger):
>  
> -    logger.info("destroy and undefine %s on both side if it exsits", guestname)
> -    exec_command(logger, "virsh destroy %s" % guestname, 1)
> -    exec_command(logger, "virsh undefine %s" % guestname, 1)
> -    REMOTE_DESTROY = "ssh %s \"virsh destroy %s\"" % (target_machine, guestname)
> +    logger.info("destroy and undefine %s on both side if it exsits", domain_name)
> +    exec_command(logger, "virsh destroy %s" % domain_name, 1)
> +    exec_command(logger, "virsh undefine %s" % domain_name, 1)
> +    REMOTE_DESTROY = "ssh %s \"virsh destroy %s\"" % (target_machine, domain_name)
>      exec_command(logger, REMOTE_DESTROY, 1)
> -    REMOTE_UNDEFINE = "ssh %s \"virsh undefine %s\"" % (target_machine, guestname)
> +    REMOTE_UNDEFINE = "ssh %s \"virsh undefine %s\"" % (target_machine, domain_name)
>      exec_command(logger, REMOTE_UNDEFINE, 1)
>  
>      dstconn.close()
> @@ -146,7 +146,7 @@ def migrate(params):
>      target_machine = params['target_machine']
>      username = params['username']
>      password = params['password']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      poststate = params['poststate']
>      presrcconfig = params['presrcconfig']
>      postsrcconfig = params['postsrcconfig']
> @@ -197,15 +197,15 @@ def migrate(params):
>      srcconn = sharedmod.libvirtobj['conn']
>      dstconn = libvirt.open(dsturi)
>  
> -    srcdom = srcconn.lookupByName(guestname)
> +    srcdom = srcconn.lookupByName(domain_name)
>  
>      if predstconfig == "true":
>          domain_names = dstconn.listDefinedDomains()
> -        if guestname in domain_names:
> +        if domain_name in domain_names:
>              logger.info("Dst VM exists")
>          else:
>              logger.error("Dst VM missing config, should define VM on Dst first")
> -            env_clean(srcconn, dstconn, target_machine, guestname, logger)
> +            env_clean(srcconn, dstconn, target_machine, domain_name, logger)
>              return 1
>  
>      try:
> @@ -219,17 +219,17 @@ def migrate(params):
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
>          logger.error("Migration Failed")
> -        env_clean(srcconn, dstconn, target_machine, guestname, logger)
> +        env_clean(srcconn, dstconn, target_machine, domain_name, logger)
>          return 1
>  
>      if postsrcconfig == "true":
>          if srcdom.isActive():
>              logger.error("Source VM is still active")
> -            env_clean(srcconn, dstconn, target_machine, guestname, logger)
> +            env_clean(srcconn, dstconn, target_machine, domain_name, logger)
>              return 1
>          if not srcdom.isPersistent():
>              logger.error("Source VM missing config")
> -            env_clean(srcconn, dstconn, target_machine, guestname, logger)
> +            env_clean(srcconn, dstconn, target_machine, domain_name, logger)
>              return 1
>      else:
>          domain_names = []
> @@ -239,29 +239,29 @@ def migrate(params):
>              domain_names.append(obj.name())
>          domain_names += srcconn.listDefinedDomains()
>  
> -        if guestname in domain_names:
> +        if domain_name in domain_names:
>              logger.error("Source VM still exists")
> -            env_clean(srcconn, dstconn, target_machine, guestname, logger)
> +            env_clean(srcconn, dstconn, target_machine, domain_name, logger)
>              return 1
>  
> -    dstdom = dstconn.lookupByName(guestname)
> +    dstdom = dstconn.lookupByName(domain_name)
>      if not dstdom.isActive():
>          logger.error("Dst VM is not active")
> -        env_clean(srcconn, dstconn, target_machine, guestname, logger)
> +        env_clean(srcconn, dstconn, target_machine, domain_name, logger)
>          return 1
>  
>      if postdstconfig == "true":
>          if not dstdom.isPersistent():
>              logger.error("Dst VM missing config")
> -            env_clean(srcconn, dstconn, target_machine, guestname, logger)
> +            env_clean(srcconn, dstconn, target_machine, domain_name, logger)
>              return 1
>  
>      dstdom_state = dstdom.info()[0]
>      if get_state(dstdom_state) != poststate:
>          logger.error("Dst VM wrong state %s, should be %s", get_state(dstdom_state), poststate)
> -        env_clean(srcconn, dstconn, target_machine, guestname, logger)
> +        env_clean(srcconn, dstconn, target_machine, domain_name, logger)
>          return 1
>  
>      logger.info("Migration PASS")
> -    env_clean(srcconn, dstconn, target_machine, guestname, logger)
> +    env_clean(srcconn, dstconn, target_machine, domain_name, logger)
>      return 0
> diff --git a/repos/domain/ownership_test.py b/repos/domain/ownership_test.py
> index 3ee7d85..2ae5d72 100644
> --- a/repos/domain/ownership_test.py
> +++ b/repos/domain/ownership_test.py
> @@ -14,14 +14,14 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname', 'dynamic_ownership', 'use_nfs',)
> +required_params = ('domain_name', 'dynamic_ownership', 'use_nfs',)
>  optional_params = ()
>  
>  QEMU_CONF = "/etc/libvirt/qemu.conf"
>  SAVE_FILE = "/mnt/test.save"
>  TEMP_FILE = "/tmp/test.save"
>  
> -def check_domain_running(conn, guestname, logger):
> +def check_domain_running(conn, domain_name, logger):
>      """ check if the domain exists, may or may not be active """
>      domain_names = []
>      ids = conn.listDomainsID()
> @@ -29,8 +29,8 @@ def check_domain_running(conn, guestname, logger):
>          obj = conn.lookupByID(id)
>          domain_names.append(obj.name())
>  
> -    if guestname not in domain_names:
> -        logger.error("%s doesn't exist or not running" % guestname)
> +    if domain_name not in domain_names:
> +        logger.error("%s doesn't exist or not running" % domain_name)
>          return 1
>      else:
>          return 0
> @@ -169,7 +169,7 @@ def ownership_test(params):
>         the file after save and restore
>      """
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      dynamic_ownership = params['dynamic_ownership']
>      use_nfs = params['use_nfs']
>  
> @@ -183,18 +183,18 @@ def ownership_test(params):
>      conn = sharedmod.libvirtobj['conn']
>  
>      # save domain to the file
> -    logger.info("save domain %s to the file %s" % (guestname, SAVE_FILE))
> +    logger.info("save domain %s to the file %s" % (domain_name, SAVE_FILE))
>  
>      logger.info("check the domain state")
> -    ret = check_domain_running(conn, guestname, logger)
> +    ret = check_domain_running(conn, domain_name, logger)
>      if ret:
>          return 1
>  
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      try:
>          domobj.save(SAVE_FILE)
> -        logger.info("Success save domain %s to %s" % (guestname, SAVE_FILE))
> +        logger.info("Success save domain %s to %s" % (domain_name, SAVE_FILE))
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> @@ -230,12 +230,12 @@ def ownership_test(params):
>      try:
>          conn.restore(SAVE_FILE)
>          logger.info("Success restore domain %s from %s" % \
> -                     (guestname, SAVE_FILE))
> +                     (domain_name, SAVE_FILE))
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
>          logger.error("Error: fail to restore domain %s from %s" % \
> -                      (guestname, SAVE_FILE))
> +                      (domain_name, SAVE_FILE))
>          return 1
>  
>      logger.info("check the ownership of %s after restore" % SAVE_FILE)
> diff --git a/repos/domain/reboot.py b/repos/domain/reboot.py
> index afc1e9f..da4f385 100644
> --- a/repos/domain/reboot.py
> +++ b/repos/domain/reboot.py
> @@ -11,7 +11,7 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ()
>  
>  def reboot(params):
> @@ -22,7 +22,7 @@ def reboot(params):
>      global logger
>      logger = params['logger']
>      params.pop('logger')
> -    domain_name = params['guestname']
> +    domain_name = params['domain_name']
>  
>      # Connect to local hypervisor connection URI
>      hypervisor = utils.get_hypervisor()
> diff --git a/repos/domain/restore.py b/repos/domain/restore.py
> index b221c9f..6dfe165 100644
> --- a/repos/domain/restore.py
> +++ b/repos/domain/restore.py
> @@ -11,14 +11,14 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname', 'filepath',)
> +required_params = ('domain_name', 'filepath',)
>  optional_params = ()
>  
>  def get_domain_ipaddr(*args):
>      """Get domain ip address"""
> -    (guestname, util, logger) = args
> +    (domain_name, util, logger) = args
>  
> -    mac = utils.get_dom_mac_addr(guestname)
> +    mac = utils.get_dom_mac_addr(domain_name)
>      logger.debug("domain mac address: %s" % mac)
>  
>      ipaddr = utils.mac_to_ip(mac, 15)
> @@ -47,10 +47,10 @@ def check_domain_restore(*args):
>      """Check restore domain result, if restore domain is successful,
>         domain status will not be paused and can be ping
>      """
> -    (guestname, domobj, util, logger) = args
> +    (domain_name, domobj, util, logger) = args
>  
>      if check_domain_status(domobj, logger):
> -        if get_domain_ipaddr(guestname, util, logger):
> +        if get_domain_ipaddr(domain_name, util, logger):
>              return True
>          else:
>              return False
> @@ -60,11 +60,11 @@ def check_domain_restore(*args):
>  def restore(params):
>      """Save domain to a disk file"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      filepath = params['filepath']
>      conn = sharedmod.libvirtobj['conn']
>  
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      if check_domain_status(domobj, logger):
>          logger.error("Error: current domain status is not shutoff or shutdown,\
> @@ -73,15 +73,15 @@ def restore(params):
>  
>      try:
>          conn.restore(filepath)
> -        if check_domain_restore(guestname, domobj, util, logger):
> -            logger.info("restore %s domain successful" % guestname)
> +        if check_domain_restore(domain_name, domobj, util, logger):
> +            logger.info("restore %s domain successful" % domain_name)
>          else:
>              logger.error("Error: fail to check restore domain")
>              return 1
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("Error: fail to restore %s domain" % guestname)
> +        logger.error("Error: fail to restore %s domain" % domain_name)
>          return 1
>  
>      return 0
> diff --git a/repos/domain/resume.py b/repos/domain/resume.py
> index 339a1b9..412abb1 100644
> --- a/repos/domain/resume.py
> +++ b/repos/domain/resume.py
> @@ -10,21 +10,21 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ()
>  
>  def resume(params):
>      """Resume domain
>  
>          Argument is a dictionary with two keys:
> -        {'logger': logger, 'guestname': guestname}
> +        {'logger': logger, 'domain_name': domain_name}
>  
>          logger -- an object of utils/log.py
> -        guestname -- same as the domain name
> +        domain_name -- same as the domain name
>  
>          Return 0 on SUCCESS or 1 on FAILURE
>      """
> -    domname = params['guestname']
> +    domname = params['domain_name']
>      logger = params['logger']
>  
>      # Resume domain
> diff --git a/repos/domain/save.py b/repos/domain/save.py
> index b91bb3a..db68f58 100644
> --- a/repos/domain/save.py
> +++ b/repos/domain/save.py
> @@ -11,14 +11,14 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname', 'filepath',)
> +required_params = ('domain_name', 'filepath',)
>  optional_params = ()
>  
>  def get_domain_ipaddr(*args):
>      """Get domain ip address"""
> -    (guestname, util, logger) = args
> +    (domain_name, util, logger) = args
>  
> -    mac = utils.get_dom_mac_addr(guestname)
> +    mac = utils.get_dom_mac_addr(domain_name)
>      logger.debug("domain mac address: %s" %mac)
>  
>      ipaddr = utils.mac_to_ip(mac, 15)
> @@ -47,13 +47,13 @@ def check_domain_status(*args):
>  
>  def check_domain_save(*args):
>      """Check save domain result, if save domain is successful,
> -       guestname.save will exist under /tmp directory and domain
> +       domain_name.save will exist under /tmp directory and domain
>         can't be ping and status is paused
>      """
> -    (guestname, domobj, util, logger) = args
> +    (domain_name, domobj, util, logger) = args
>  
>      if not check_domain_status(domobj, logger):
> -        if not get_domain_ipaddr(guestname, util, logger):
> +        if not get_domain_ipaddr(domain_name, util, logger):
>              return True
>          else:
>              return False
> @@ -63,14 +63,14 @@ def check_domain_save(*args):
>  def save(params):
>      """Save domain to a disk file"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      filepath = params['filepath']
>  
>      conn = sharedmod.libvirtobj['conn']
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      # Save domain
> -    ipaddr = get_domain_ipaddr(guestname, util, logger)
> +    ipaddr = get_domain_ipaddr(domain_name, util, logger)
>  
>      if not check_domain_status(domobj, logger):
>          logger.error("Error: current domain status is shutoff")
> @@ -82,15 +82,15 @@ def save(params):
>  
>      try:
>          domobj.save(filepath)
> -        if check_domain_save(guestname, domobj, util, logger):
> -            logger.info("save %s domain successful" %guestname)
> +        if check_domain_save(domain_name, domobj, util, logger):
> +            logger.info("save %s domain successful" %domain_name)
>          else:
>              logger.error("Error: fail to check save domain")
>              return 1
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("Error: fail to save %s domain" %guestname)
> +        logger.error("Error: fail to save %s domain" %domain_name)
>          return 1
>  
>      return 0
> diff --git a/repos/domain/sched_params.py b/repos/domain/sched_params.py
> index ffc7670..5c844f0 100644
> --- a/repos/domain/sched_params.py
> +++ b/repos/domain/sched_params.py
> @@ -11,7 +11,7 @@ import libvirt
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname', 'capshares',)
> +required_params = ('domain_name', 'capshares',)
>  optional_params = ()
>  
>  def check_domain_status(domobj):
> @@ -27,11 +27,11 @@ def check_domain_status(domobj):
>  
>  def check_sched_params(*args):
>      """Check scheduler parameters validity after setting"""
> -    hypervisor, dicts, guestname, domobj = args
> +    hypervisor, dicts, domain_name, domobj = args
>      sched_dict = {}
>      if hypervisor == "xen":
>          sched_dict = eval(commands.getoutput('xm sched-credit -d %s'
> -                          % guestname))
> +                          % domain_name))
>          if sched_dict['weight'] == dicts['weight'] and \
>            sched_dict['cap'] == dicts['cap']:
>              return 0
> @@ -53,10 +53,10 @@ def sched_params(params):
>      hypervisor = utils.get_hypervisor()
>  
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      conn = sharedmod.libvirtobj['conn']
>  
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      if check_domain_status(domobj):
>          sched_params = domobj.schedulerParameters()
> @@ -74,7 +74,7 @@ def sched_params(params):
>                  logger.info("current scheduler parameters: %s\n" % sched_params)
>  
>                  retval = check_sched_params(hypervisor, dicts,
> -                                            guestname, domobj)
> +                                            domain_name, domobj)
>                  if retval != 0:
>                      return 1
>      elif 'kvm' in hypervisor:
> @@ -85,7 +85,7 @@ def sched_params(params):
>          sched_params = domobj.schedulerParameters()
>          logger.info("current scheduler parameters: %s\n" % sched_params)
>          retval = check_sched_params(hypervisor, dicts,
> -                                    guestname, domobj)
> +                                    domain_name, domobj)
>          if retval != 0:
>              return 1
>      else:
> diff --git a/repos/domain/screenshot.py b/repos/domain/screenshot.py
> index eb5d0e2..1fc117c 100644
> --- a/repos/domain/screenshot.py
> +++ b/repos/domain/screenshot.py
> @@ -7,7 +7,7 @@ import mimetypes
>  
>  import libvirt
>  
> -required_params = ('guestname', 'filename',)
> +required_params = ('domain_name', 'filename',)
>  optional_params = ('screen',)
>  
>  last_filename = None
> @@ -22,7 +22,7 @@ def screenshot(params):
>      logger = params['logger']
>  
>      conn = sharedmod.libvirtobj['conn']
> -    dom = conn.lookupByName(params['guestname'])
> +    dom = conn.lookupByName(params['domain_name'])
>  
>      st = conn.newStream(0)
>      screen = params.get('screen', 0)
> diff --git a/repos/domain/shutdown.py b/repos/domain/shutdown.py
> index 802ddec..7044194 100644
> --- a/repos/domain/shutdown.py
> +++ b/repos/domain/shutdown.py
> @@ -11,21 +11,21 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ()
>  
>  def shutdown(params):
>      """Shutdown domain
>  
>          Argument is a dictionary with two keys:
> -        {'logger': logger, 'guestname': guestname}
> +        {'logger': logger, 'domain_name': domain_name}
>  
>          logger -- an object of utils/log.py
> -        guestname -- same as the domain name
> +        domain_name -- same as the domain name
>  
>          Return 0 on SUCCESS or 1 on FAILURE
>      """
> -    domname = params['guestname']
> +    domname = params['domain_name']
>      logger = params['logger']
>  
>      conn = sharedmod.libvirtobj['conn']
> diff --git a/repos/domain/start.py b/repos/domain/start.py
> index 3ef0d90..fbda945 100644
> --- a/repos/domain/start.py
> +++ b/repos/domain/start.py
> @@ -11,7 +11,7 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ('flags',)
>  
>  NONE = 0
> @@ -21,15 +21,15 @@ def start(params):
>      """Start domain
>  
>          Argument is a dictionary with two keys:
> -        {'logger': logger, 'guestname': guestname}
> +        {'logger': logger, 'domain_name': domain_name}
>  
>          logger -- an object of utils/log.py
> -        mandatory arguments : guestname -- same as the domain name
> +        mandatory arguments : domain_name -- same as the domain name
>          optional arguments : flags -- domain create flags <none|start_paused|noping>
>  
>          Return 0 on SUCCESS or 1 on FAILURE
>      """
> -    domname = params['guestname']
> +    domname = params['domain_name']
>      logger = params['logger']
>      flags = params.get('flags', '')
>  
> diff --git a/repos/domain/suspend.py b/repos/domain/suspend.py
> index 0f58c23..6d743a4 100644
> --- a/repos/domain/suspend.py
> +++ b/repos/domain/suspend.py
> @@ -10,21 +10,21 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ()
>  
>  def suspend(params):
>      """Suspend domain
>  
>          Argument is a dictionary with two keys:
> -        {'logger': logger, 'guestname': guestname}
> +        {'logger': logger, 'domain_name': domain_name}
>  
>          logger -- an object of utils/log.py
> -        guestname -- same as the domain name
> +        domain_name -- same as the domain name
>  
>          Return 0 on SUCCESS or 1 on FAILURE
>      """
> -    domname = params['guestname']
> +    domname = params['domain_name']
>      logger = params['logger']
>  
>      conn = sharedmod.libvirtobj['conn']
> diff --git a/repos/domain/undefine.py b/repos/domain/undefine.py
> index 9cf8c55..bd8bac5 100644
> --- a/repos/domain/undefine.py
> +++ b/repos/domain/undefine.py
> @@ -9,14 +9,14 @@ from libvirt import libvirtError
>  
>  from src import sharedmod
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ()
>  
> -def check_undefine_domain(guestname):
> +def check_undefine_domain(domain_name):
>      """Check undefine domain result, if undefine domain is successful,
> -       guestname.xml will don't exist under /etc/libvirt/qemu/
> +       domain_name.xml will don't exist under /etc/libvirt/qemu/
>      """
> -    path = "/etc/libvirt/qemu/%s.xml" % guestname
> +    path = "/etc/libvirt/qemu/%s.xml" % domain_name
>      if not os.access(path, os.R_OK):
>          return True
>      else:
> @@ -25,14 +25,14 @@ def check_undefine_domain(guestname):
>  def undefine(params):
>      """Undefine a domain"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      conn = sharedmod.libvirtobj['conn']
>  
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      try:
>          domobj.undefine()
> -        if check_undefine_domain(guestname):
> +        if check_undefine_domain(domain_name):
>              logger.info("undefine the domain is successful")
>          else:
>              logger.error("fail to check domain undefine")
> diff --git a/repos/domain/update_devflag.py b/repos/domain/update_devflag.py
> index 6a6641a..fba347a 100644
> --- a/repos/domain/update_devflag.py
> +++ b/repos/domain/update_devflag.py
> @@ -14,7 +14,7 @@ from src import sharedmod
>  from utils import utils
>  from utils import xml_builder
>  
> -required_params = ('guestname', 'devtype', 'username', 'password',)
> +required_params = ('domain_name', 'devtype', 'username', 'password',)
>  optional_params = ()
>  
>  def create_image(params, util, img_name):
> @@ -144,12 +144,12 @@ def update_devflag(params):
>      """Update virtual device to a domain from xml"""
>  
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      devtype = params['devtype']
>  
>      if devtype == 'cdrom':
>          xmlargs = {}
> -        xmlargs['guestname'] = guestname
> +        xmlargs['domain_name'] = domain_name
>          xmlargs['virt_type'] = 'kvm'
>          xmlargs['hdmodel'] = 'ide'
>          xmlargs['bootcd'] = '/var/lib/libvirt/boot/cdrom.img'
> @@ -158,7 +158,7 @@ def update_devflag(params):
>              return 1
>      elif devtype == 'floppy':
>          xmlargs = {}
> -        xmlargs['guestname'] = guestname
> +        xmlargs['domain_name'] = domain_name
>          xmlargs['floppysource'] = '/var/lib/libvirt/boot/floppy.img'
>          srcfile = xmlargs['floppysource']
>          if not create_image(params, util, srcfile):
> @@ -171,18 +171,18 @@ def update_devflag(params):
>      if not params.has_key('flag'):
>          flag = libvirt.VIR_DOMAIN_AFFECT_CONFIG
>  
> -    mac = utils.get_dom_mac_addr(guestname)
> +    mac = utils.get_dom_mac_addr(domain_name)
>      domip = utils.mac_to_ip(mac, 180)
>      logger.debug("ip address: %s" % domip)
>  
>      conn = sharedmod.libvirtobj['conn']
>  
>      try:
> -        if guestname not in conn.listDefinedDomains():
> -            logger.error("%s doesn't exist or in running state." % guestname)
> +        if domain_name not in conn.listDefinedDomains():
> +            logger.error("%s doesn't exist or in running state." % domain_name)
>              return 1
>          else:
> -            domobj = conn.lookupByName(guestname)
> +            domobj = conn.lookupByName(domain_name)
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> diff --git a/repos/libvirtd/qemu_hang.py b/repos/libvirtd/qemu_hang.py
> index b764802..ac4f6dd 100644
> --- a/repos/libvirtd/qemu_hang.py
> +++ b/repos/libvirtd/qemu_hang.py
> @@ -13,13 +13,13 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ()
>  
>  VIRSH_LIST = "virsh list --all"
>  RESTART_CMD = "service libvirtd restart"
>  
> -def check_domain_running(conn, guestname, logger):
> +def check_domain_running(conn, domain_name, logger):
>      """ check if the domain exists, may or may not be active """
>      domain_names = []
>      ids = conn.listDomainsID()
> @@ -27,8 +27,8 @@ def check_domain_running(conn, guestname, logger):
>          obj = conn.lookupByID(id)
>          domain_names.append(obj.name())
>  
> -    if guestname not in domain_names:
> -        logger.error("%s doesn't exist or not running" % guestname)
> +    if domain_name not in domain_names:
> +        logger.error("%s doesn't exist or not running" % domain_name)
>          return 1
>      else:
>          return 0
> @@ -55,29 +55,29 @@ def libvirtd_check(util, logger):
>  
>      return 0
>  
> -def get_domain_pid(util, logger, guestname):
> +def get_domain_pid(util, logger, domain_name):
>      """get the pid of running domain"""
> -    logger.info("get the pid of running domain %s"  % guestname)
> -    get_pid_cmd = "cat /var/run/libvirt/qemu/%s.pid" % guestname
> +    logger.info("get the pid of running domain %s"  % domain_name)
> +    get_pid_cmd = "cat /var/run/libvirt/qemu/%s.pid" % domain_name
>      ret, pid = utils.exec_cmd(get_pid_cmd, shell=True)
>      if ret:
>          logger.error("fail to get the pid of runnings domain %s" % \
> -                     guestname)
> +                     domain_name)
>          return 1, ""
>      else:
>          logger.info("the pid of domain %s is %s" % \
> -                    (guestname, pid[0]))
> +                    (domain_name, pid[0]))
>          return 0, pid[0]
>  
>  def qemu_hang(params):
>      """Hang qemu process, check libvirtd status"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>  
>      conn = sharedmod.libvirtobj['conn']
>  
>      logger.info("check the domain state")
> -    ret = check_domain_running(conn, guestname, logger)
> +    ret = check_domain_running(conn, domain_name, logger)
>      if ret:
>          return 1
>  
> @@ -86,7 +86,7 @@ def qemu_hang(params):
>      if ret:
>          return 1
>  
> -    ret, pid = get_domain_pid(util, logger, guestname)
> +    ret, pid = get_domain_pid(util, logger, domain_name)
>      if ret:
>          return 1
>  
> @@ -94,7 +94,7 @@ def qemu_hang(params):
>      logger.info(cmd)
>      ret, out = utils.exec_cmd(cmd, shell=True)
>      if ret:
> -        logger.error("failed to stop qemu process of %s" % guestname)
> +        logger.error("failed to stop qemu process of %s" % domain_name)
>          return 1
>  
>      logger.info("recheck libvirtd status:")
> @@ -107,12 +107,12 @@ def qemu_hang(params):
>  def qemu_hang_clean(params):
>      """ clean testing environment """
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>  
> -    ret = get_domain_pid(util, logger, guestname)
> +    ret = get_domain_pid(util, logger, domain_name)
>      cmd = "kill -CONT %s" % ret[1]
>      ret = utils.exec_cmd(cmd, shell=True)
>      if ret[0]:
> -        logger.error("failed to resume qemu process of %s" % guestname)
> +        logger.error("failed to resume qemu process of %s" % domain_name)
>  
>      return 0
> diff --git a/repos/libvirtd/restart.py b/repos/libvirtd/restart.py
> index 7afbb21..2015efb 100644
> --- a/repos/libvirtd/restart.py
> +++ b/repos/libvirtd/restart.py
> @@ -13,13 +13,13 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ()
>  
>  VIRSH_LIST = "virsh list --all"
>  RESTART_CMD = "service libvirtd restart"
>  
> -def check_domain_running(conn, guestname, logger):
> +def check_domain_running(conn, domain_name, logger):
>      """ check if the domain exists, may or may not be active """
>      domain_names = []
>      ids = conn.listDomainsID()
> @@ -27,8 +27,8 @@ def check_domain_running(conn, guestname, logger):
>          obj = conn.lookupByID(id)
>          domain_names.append(obj.name())
>  
> -    if guestname not in domain_names:
> -        logger.error("%s doesn't exist or not running" % guestname)
> +    if domain_name not in domain_names:
> +        logger.error("%s doesn't exist or not running" % domain_name)
>          return 1
>      else:
>          return 0
> @@ -55,29 +55,29 @@ def libvirtd_check(util, logger):
>  
>      return 0
>  
> -def get_domain_pid(util, logger, guestname):
> +def get_domain_pid(util, logger, domain_name):
>      """get the pid of running domain"""
> -    logger.info("get the pid of running domain %s"  % guestname)
> -    get_pid_cmd = "cat /var/run/libvirt/qemu/%s.pid" % guestname
> +    logger.info("get the pid of running domain %s"  % domain_name)
> +    get_pid_cmd = "cat /var/run/libvirt/qemu/%s.pid" % domain_name
>      ret, pid = utils.exec_cmd(get_pid_cmd, shell=True)
>      if ret:
>          logger.error("fail to get the pid of runnings domain %s" % \
> -                     guestname)
> +                     domain_name)
>          return 1, ""
>      else:
>          logger.info("the pid of domain %s is %s" % \
> -                    (guestname, pid[0]))
> +                    (domain_name, pid[0]))
>          return 0, pid[0]
>  
>  def restart(params):
>      """restart libvirtd test"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>  
>      conn = sharedmod.libvirtobj['conn']
>  
>      logger.info("check the domain state")
> -    ret = check_domain_running(conn, guestname, logger)
> +    ret = check_domain_running(conn, domain_name, logger)
>      if ret:
>          return 1
>  
> @@ -87,22 +87,22 @@ def restart(params):
>          return 1
>  
>      # Get domain ip
> -    logger.info("get the mac address of domain %s" % guestname)
> -    mac = utils.get_dom_mac_addr(guestname)
> -    logger.info("the mac address of domain %s is %s" % (guestname, mac))
> +    logger.info("get the mac address of domain %s" % domain_name)
> +    mac = utils.get_dom_mac_addr(domain_name)
> +    logger.info("the mac address of domain %s is %s" % (domain_name, mac))
>      logger.info("get ip by mac address")
>      ip = utils.mac_to_ip(mac, 180)
> -    logger.info("the ip address of domain %s is %s" % (guestname, ip))
> +    logger.info("the ip address of domain %s is %s" % (domain_name, ip))
>  
>  
> -    logger.info("ping to domain %s" % guestname)
> +    logger.info("ping to domain %s" % domain_name)
>      if utils.do_ping(ip, 0):
> -        logger.info("Success ping domain %s" % guestname)
> +        logger.info("Success ping domain %s" % domain_name)
>      else:
> -        logger.error("fail to ping domain %s" % guestname)
> +        logger.error("fail to ping domain %s" % domain_name)
>          return 1
>  
> -    ret, pid_before = get_domain_pid(util, logger, guestname)
> +    ret, pid_before = get_domain_pid(util, logger, domain_name)
>      if ret:
>          return 1
>  
> @@ -122,23 +122,23 @@ def restart(params):
>      if ret:
>          return 1
>  
> -    logger.info("ping to domain %s again" % guestname)
> +    logger.info("ping to domain %s again" % domain_name)
>      if utils.do_ping(ip, 0):
> -        logger.info("Success ping domain %s" % guestname)
> +        logger.info("Success ping domain %s" % domain_name)
>      else:
> -        logger.error("fail to ping domain %s" % guestname)
> +        logger.error("fail to ping domain %s" % domain_name)
>          return 1
>  
> -    ret, pid_after = get_domain_pid(util, logger, guestname)
> +    ret, pid_after = get_domain_pid(util, logger, domain_name)
>      if ret:
>          return 1
>  
>      if pid_before != pid_after:
>          logger.error("%s pid changed during libvirtd restart" % \
> -                     guestname)
> +                     domain_name)
>          return 1
>      else:
>          logger.info("domain pid not change, %s keeps running during \
> -                     libvirtd restart" % guestname)
> +                     libvirtd restart" % domain_name)
>  
>      return 0
> diff --git a/repos/regression/multiple_thread_block_on_domain_create.py b/repos/regression/multiple_thread_block_on_domain_create.py
> index ab36961..dc91c68 100644
> --- a/repos/regression/multiple_thread_block_on_domain_create.py
> +++ b/repos/regression/multiple_thread_block_on_domain_create.py
> @@ -63,7 +63,7 @@ class domain_install(Thread):
>      def run(self):
>          domain_params = {};
>          domain_params['virt_type'] = self.type
> -        domain_params['guestname'] = self.name
> +        domain_params['domain_name'] = self.name
>          domain_params['kickstart'] = self.ks
>          macaddr = self.utils.get_rand_mac()
>          domain_params['macaddr'] = macaddr
> @@ -86,7 +86,7 @@ class domain_install(Thread):
>          except libvirtError, e:
>              logger.error("API error message: %s, error code is %s" \
>                           % (e.message, e.get_error_code()))
> -            self.logger.error("fail to define domain %s" % guestname)
> +            self.logger.error("fail to define domain %s" % domain_name)
>              return 1
>  
>          return 0
> @@ -135,8 +135,8 @@ def multiple_thread_block_on_domain_create(params):
>      end_num = num.split('-')[1]
>      thread_pid = []
>      for i in range(int(start_num), int(end_num)):
> -        guestname =  name + str(i)
> -        thr = domain_install(guestname, os_type, arch, type, ks, conn, util, logger)
> +        domain_name =  name + str(i)
> +        thr = domain_install(domain_name, os_type, arch, type, ks, conn, util, logger)
>          thread_pid.append(thr)
>  
>      for id in thread_pid:
> diff --git a/repos/sVirt/domain_nfs_start.py b/repos/sVirt/domain_nfs_start.py
> index 5f5a117..cfb5524 100644
> --- a/repos/sVirt/domain_nfs_start.py
> +++ b/repos/sVirt/domain_nfs_start.py
> @@ -17,7 +17,7 @@ from src import sharedmod
>  from utils import utils
>  from shutil import copy
>  
> -required_params = ('guestname',
> +required_params = ('domain_name',
>                     'dynamic_ownership',
>                     'virt_use_nfs',
>                     'root_squash',)
> @@ -55,7 +55,7 @@ def nfs_setup(util, root_squash, logger):
>  
>      return 0
>  
> -def prepare_env(util, d_ownership, virt_use_nfs, guestname, root_squash, \
> +def prepare_env(util, d_ownership, virt_use_nfs, domain_name, root_squash, \
>                  disk_file, img_dir, logger):
>      """set virt_use_nfs SElinux boolean, configure
>         dynamic_ownership in /etc/libvirt/qemu.conf
> @@ -101,7 +101,7 @@ def prepare_env(util, d_ownership, virt_use_nfs, guestname, root_squash, \
>      if os.path.exists(filepath):
>          os.remove(filepath)
>  
> -    logger.info("copy %s img file to nfs path" % guestname)
> +    logger.info("copy %s img file to nfs path" % domain_name)
>      copy(disk_file, "/tmp")
>  
>      logger.info("set up nfs service on localhost")
> @@ -123,174 +123,174 @@ def prepare_env(util, d_ownership, virt_use_nfs, guestname, root_squash, \
>  def domain_nfs_start(params):
>      """start domain with img on nfs"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      dynamic_ownership = params['dynamic_ownership']
>      virt_use_nfs = params['virt_use_nfs']
>      root_squash = params['root_squash']
>  
>      conn = sharedmod.libvirtobj['conn']
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      logger.info("get the domain state")
>      try:
>          state = domobj.info()[0]
> -        logger.info("domain %s is %s" % (guestname, state))
> +        logger.info("domain %s is %s" % (domain_name, state))
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("Error: fail to get domain %s state" % guestname)
> +        logger.error("Error: fail to get domain %s state" % domain_name)
>          return 1
>  
>      if state != libvirt.VIR_DOMAIN_SHUTOFF:
> -        logger.info("shut down the domain %s" % guestname)
> +        logger.info("shut down the domain %s" % domain_name)
>          try:
>              domobj.destroy()
>          except libvirtError, e:
>              logger.error("API error message: %s, error code is %s" \
>                           % (e.message, e.get_error_code()))
> -            logger.error("Error: fail to destroy domain %s" % guestname)
> +            logger.error("Error: fail to destroy domain %s" % domain_name)
>              return 1
>  
>      logger.info("get domain img file path")
>      try:
>          dom_xml = domobj.XMLDesc(0)
>          disk_file = utils.get_disk_path(dom_xml)
> -        logger.info("%s disk file path is %s" % (guestname, disk_file))
> +        logger.info("%s disk file path is %s" % (domain_name, disk_file))
>          img_dir = os.path.dirname(disk_file)
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("Error: fail to get domain %s xml" % guestname)
> +        logger.error("Error: fail to get domain %s xml" % domain_name)
>          return 1
>  
>      # set env
>      logger.info("prepare the environment")
> -    ret = prepare_env(util, dynamic_ownership, virt_use_nfs, guestname, \
> +    ret = prepare_env(util, dynamic_ownership, virt_use_nfs, domain_name, \
>                        root_squash, disk_file, img_dir, logger)
>      if ret:
>          logger.error("failed to prepare the environment")
>          return 1
>  
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      logger.info("begin to test start domain from nfs storage")
>      logger.info("First, start the domain without chown the img file to qemu")
> -    logger.info("start domain %s" % guestname)
> +    logger.info("start domain %s" % domain_name)
>      if root_squash == "yes":
>          if virt_use_nfs == "on":
>              if dynamic_ownership == "enable":
>                  try:
>                      domobj.create()
>                      logger.error("Domain %s started, this is not expected" % \
> -                                  guestname)
> +                                  domain_name)
>                      return 1
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
>                      logger.info("Fail to start domain %s, this is expected" % \
> -                                 guestname)
> +                                 domain_name)
>  
>              elif dynamic_ownership == "disable":
>                  try:
>                      domobj.create()
>                      logger.error("Domain %s started, this is not expected" % \
> -                                  guestname)
> +                                  domain_name)
>                      return 1
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
>                      logger.info("Fail to start domain %s, this is expected" % \
> -                                 guestname)
> +                                 domain_name)
>          elif virt_use_nfs == "off":
>              if dynamic_ownership == "enable":
>                  try:
>                      domobj.create()
>                      logger.error("Domain %s started, this is not expected" % \
> -                                  guestname)
> +                                  domain_name)
>                      return 1
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
>                      logger.info("Fail to start domain %s, this is expected" % \
> -                                 guestname)
> +                                 domain_name)
>  
>              elif dynamic_ownership == "disable":
>                  try:
>                      domobj.create()
>                      logger.error("Domain %s started, this is not expected" % \
> -                                  guestname)
> +                                  domain_name)
>                      return 1
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
>                      logger.info("Fail to start domain %s, this is expected" % \
> -                                 guestname)
> +                                 domain_name)
>      elif root_squash == "no":
>          if virt_use_nfs == "on":
>              if dynamic_ownership == "enable":
>                  try:
>                      domobj.create()
> -                    logger.info("Success start domain %s" % guestname)
> +                    logger.info("Success start domain %s" % domain_name)
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
> -                    logger.error("Fail to start domain %s" % guestname)
> +                    logger.error("Fail to start domain %s" % domain_name)
>                      return 1
>  
>              elif dynamic_ownership == "disable":
>                  try:
>                      domobj.create()
>                      logger.error("Domain %s started, this is not expected" % \
> -                                  guestname)
> +                                  domain_name)
>                      return 1
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
>                      logger.info("Fail to start domain %s, this is expected" % \
> -                                 guestname)
> +                                 domain_name)
>          elif virt_use_nfs == "off":
>              if dynamic_ownership == "enable":
>                  try:
>                      domobj.create()
>                      logger.error("Domain %s started, this is not expected" % \
> -                                  guestname)
> +                                  domain_name)
>                      return 1
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
>                      logger.info("Fail to start domain %s, this is expected" % \
> -                                 guestname)
> +                                 domain_name)
>  
>              elif dynamic_ownership == "disable":
>                  try:
>                      domobj.create()
>                      logger.error("Domain %s started, this is not expected" % \
> -                                  guestname)
> +                                  domain_name)
>                      return 1
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
>                      logger.info("Fail to start domain %s, this is expected" % \
> -                                 guestname)
> +                                 domain_name)
>  
>      logger.info("get the domain state")
>      try:
>          state = domobj.info()[0]
> -        logger.info("domain %s is %s" % (guestname, state))
> +        logger.info("domain %s is %s" % (domain_name, state))
>      except libvirtError, e:
>          logger.error("API error message: %s, error code is %s" \
>                       % (e.message, e.get_error_code()))
> -        logger.error("Error: fail to get domain %s state" % guestname)
> +        logger.error("Error: fail to get domain %s state" % domain_name)
>          return 1
>  
>      if state != "shutoff":
> -        logger.info("shut down the domain %s" % guestname)
> +        logger.info("shut down the domain %s" % domain_name)
>          try:
>              domobj.destroy()
>          except libvirtError, e:
>              logger.error("API error message: %s, error code is %s" \
>                           % (e.message, e.get_error_code()))
> -            logger.error("Error: fail to destroy domain %s" % guestname)
> +            logger.error("Error: fail to destroy domain %s" % domain_name)
>              return 1
>  
>      logger.info("Second, start the domain after chown the img file to qemu")
> @@ -304,27 +304,27 @@ def domain_nfs_start(params):
>          logger.error("failed to chown %s to qemu:qemu" % filepath)
>          return 1
>  
> -    logger.info("start domain %s" % guestname)
> +    logger.info("start domain %s" % domain_name)
>      if root_squash == "yes":
>          if virt_use_nfs == "on":
>              if dynamic_ownership == "enable":
>                  try:
>                      domobj.create()
> -                    logger.info("Success start domain %s" % guestname)
> +                    logger.info("Success start domain %s" % domain_name)
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
> -                    logger.error("Fail to start domain %s" % guestname)
> +                    logger.error("Fail to start domain %s" % domain_name)
>                      return 1
>  
>              elif dynamic_ownership == "disable":
>                  try:
>                      domobj.create()
> -                    logger.info("Success start domain %s" % guestname)
> +                    logger.info("Success start domain %s" % domain_name)
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
> -                    logger.error("Fail to start domain %s" % guestname)
> +                    logger.error("Fail to start domain %s" % domain_name)
>                      return 1
>  
>          elif virt_use_nfs == "off":
> @@ -332,45 +332,45 @@ def domain_nfs_start(params):
>                  try:
>                      domobj.create()
>                      logger.error("Domain %s started, this is not expected" % \
> -                                  guestname)
> +                                  domain_name)
>                      return 1
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
>                      logger.info("Fail to start domain %s, this is expected" % \
> -                                 guestname)
> +                                 domain_name)
>  
>              elif dynamic_ownership == "disable":
>                  try:
>                      domobj.create()
>                      logger.error("Domain %s started, this is not expected" % \
> -                                  guestname)
> +                                  domain_name)
>                      return 1
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
>                      logger.info("Fail to start domain %s, this is expected" % \
> -                                 guestname)
> +                                 domain_name)
>      elif root_squash == "no":
>          if virt_use_nfs == "on":
>              if dynamic_ownership == "enable":
>                  try:
>                      domobj.create()
> -                    logger.info("Success start domain %s" % guestname)
> +                    logger.info("Success start domain %s" % domain_name)
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
> -                    logger.error("Fail to start domain %s" % guestname)
> +                    logger.error("Fail to start domain %s" % domain_name)
>                      return 1
>  
>              elif dynamic_ownership == "disable":
>                  try:
>                      domobj.create()
> -                    logger.info("Success start Domain %s" % guestname)
> +                    logger.info("Success start Domain %s" % domain_name)
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
> -                    logger.error("Fail to start domain %s" % guestname)
> +                    logger.error("Fail to start domain %s" % domain_name)
>                      return 1
>  
>          elif virt_use_nfs == "off":
> @@ -378,37 +378,37 @@ def domain_nfs_start(params):
>                  try:
>                      domobj.create()
>                      logger.error("Domain %s started, this is not expected" % \
> -                                  guestname)
> +                                  domain_name)
>                      return 1
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
>                      logger.info("Fail to start domain %s, this is expected" % \
> -                                 guestname)
> +                                 domain_name)
>  
>              elif dynamic_ownership == "disable":
>                  try:
>                      domobj.create()
>                      logger.error("Domain %s started, this is not expected" % \
> -                                  guestname)
> +                                  domain_name)
>                      return 1
>                  except libvirtError, e:
>                      logger.error("API error message: %s, error code is %s" \
>                                   % (e.message, e.get_error_code()))
>                      logger.info("Fail to start domain %s, this is expected" % \
> -                                 guestname)
> +                                 domain_name)
>  
>      return 0
>  
>  def domain_nfs_start_clean(params):
>      """clean testing environment"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>  
>  
>      # Connect to local hypervisor connection URI
>      conn = sharedmod.libvirtobj['conn']
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      if domobj.info()[0] != libvirt.VIR_DOMAIN_SHUTOFF:
>          domobj.destroy()
> diff --git a/repos/snapshot/delete.py b/repos/snapshot/delete.py
> index 8e6150f..fec723b 100644
> --- a/repos/snapshot/delete.py
> +++ b/repos/snapshot/delete.py
> @@ -9,24 +9,24 @@ from libvirt import libvirtError
>  
>  from src import sharedmod
>  
> -required_params = ('guestname', 'snapshotname',)
> +required_params = ('domain_name', 'snapshotname',)
>  optional_params = ()
>  
>  SNAPSHOT_DIR = "/var/lib/libvirt/qemu/snapshot"
>  
> -def check_domain_state(conn, guestname, logger):
> +def check_domain_state(conn, domain_name, logger):
>      """ check if the domain exists and in shutdown state as well """
>      domain_names = conn.listDefinedDomains()
>  
> -    if guestname not in domain_names:
> -        logger.error("%s is running or does not exist" % guestname)
> +    if domain_name not in domain_names:
> +        logger.error("%s is running or does not exist" % domain_name)
>          return False
>      else:
>          return True
>  
> -def delete_check(guestname, snapshotname, expected_flag, logger):
> +def delete_check(domain_name, snapshotname, expected_flag, logger):
>      """ after deleting, check if appropriate xml file exists or not"""
> -    domain_snapshot_dir = os.path.join(SNAPSHOT_DIR, guestname)
> +    domain_snapshot_dir = os.path.join(SNAPSHOT_DIR, domain_name)
>      snapshot_entries = os.listdir(domain_snapshot_dir)
>      if snapshotname + ".xml" in snapshot_entries and expected_flag == "exist":
>          return True
> @@ -44,27 +44,27 @@ def delete(params):
>          check the functionality of snapshot
>      """
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      snapshotname = params['snapshotname']
>  
>      conn = sharedmod.libvirtobj['conn']
>  
>      logger.info("checking if the domain is poweroff")
> -    if not check_domain_state(conn, guestname, logger):
> +    if not check_domain_state(conn, domain_name, logger):
>          logger.error("checking failed")
>          return 1
>  
> -    if not delete_check(guestname, snapshotname, "exist", logger):
> +    if not delete_check(domain_name, snapshotname, "exist", logger):
>          logger.error("no snapshot %s exists" % snapshotname)
>          logger.debug("not corresponding xml file in %s" % SNAPSHOT_DIR)
>          return 1
>  
>      try:
> -        logger.info("delete a snapshot for %s" % guestname)
> -        domobj = conn.lookupByName(guestname)
> +        logger.info("delete a snapshot for %s" % domain_name)
> +        domobj = conn.lookupByName(domain_name)
>          snapobj = domobj.snapshotLookupByName(snapshotname, 0)
>          snapobj.delete(0)
> -        if not delete_check(guestname, snapshotname, "noexist", logger):
> +        if not delete_check(domain_name, snapshotname, "noexist", logger):
>              logger.error("after deleting, the corresponding \
>                           xmlfile still exists in %s" % SNAPSHOT_DIR)
>              return 1
> diff --git a/repos/snapshot/file_flag.py b/repos/snapshot/file_flag.py
> index d2777f8..f088cf2 100644
> --- a/repos/snapshot/file_flag.py
> +++ b/repos/snapshot/file_flag.py
> @@ -12,13 +12,13 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname', 'username', 'password',)
> +required_params = ('domain_name', 'username', 'password',)
>  optional_params = ()
>  
>  FLAG_FILE = "snapshot_flag"
>  MAKE_FLAG = "rm -f /tmp/%s; touch /tmp/%s " % (FLAG_FILE, FLAG_FILE)
>  
> -def check_domain_running(conn, guestname, logger):
> +def check_domain_running(conn, domain_name, logger):
>      """ check if the domain exists and in running state as well """
>      domain_names = []
>      ids = conn.listDomainsID()
> @@ -26,8 +26,8 @@ def check_domain_running(conn, guestname, logger):
>          obj = conn.lookupByID(id)
>          domain_names.append(obj.name())
>  
> -    if guestname not in domain_names:
> -        logger.error("%s is not running or does not exist" % guestname)
> +    if domain_name not in domain_names:
> +        logger.error("%s is not running or does not exist" % domain_name)
>          return False
>      else:
>          return True
> @@ -50,19 +50,19 @@ def file_flag(params):
>          as a flag
>      """
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      username = params['username']
>      password = params['password']
>  
>      conn = sharedmod.libvirtobj['conn']
>  
> -    if not check_domain_running(conn, guestname, logger):
> +    if not check_domain_running(conn, domain_name, logger):
>          logger.error("need a running domain")
>          return 1
>  
> -    logger.info("get the mac address of vm %s" % guestname)
> -    mac = utils.get_dom_mac_addr(guestname)
> -    logger.info("the mac address of vm %s is %s" % (guestname, mac))
> +    logger.info("get the mac address of vm %s" % domain_name)
> +    mac = utils.get_dom_mac_addr(domain_name)
> +    logger.info("the mac address of vm %s is %s" % (domain_name, mac))
>  
>      timeout = 300
>      while timeout:
> @@ -72,17 +72,17 @@ def file_flag(params):
>              time.sleep(10)
>              timeout -= 10
>          else:
> -            logger.info("the ip address of vm %s is %s" % (guestname, ipaddr))
> +            logger.info("the ip address of vm %s is %s" % (domain_name, ipaddr))
>              break
>  
>      if timeout == 0:
> -        logger.info("vm %s failed to get ip address" % guestname)
> +        logger.info("vm %s failed to get ip address" % domain_name)
>          return 1
>  
>      if not make_flag(ipaddr, username, password, logger):
> -        logger.error("making flag in domain %s failed" % guestname)
> +        logger.error("making flag in domain %s failed" % domain_name)
>          return 1
>      else:
> -        logger.info("making flag in domain %s succeeded" % guestname)
> +        logger.info("making flag in domain %s succeeded" % domain_name)
>  
>      return 0
> diff --git a/repos/snapshot/flag_check.py b/repos/snapshot/flag_check.py
> index 4699a67..19bc310 100644
> --- a/repos/snapshot/flag_check.py
> +++ b/repos/snapshot/flag_check.py
> @@ -11,13 +11,13 @@ from libvirt import libvirtError
>  from src import sharedmod
>  from utils import utils
>  
> -required_params = ('guestname', 'username', 'password',)
> +required_params = ('domain_name', 'username', 'password',)
>  optional_params = ('expectedret')
>  
>  FLAG_FILE = "/tmp/snapshot_flag"
>  FLAG_CHECK = "ls %s" % FLAG_FILE
>  
> -def check_domain_running(conn, guestname, logger):
> +def check_domain_running(conn, domain_name, logger):
>      """ check if the domain exists and in running state as well """
>      domain_names = []
>      ids = conn.listDomainsID()
> @@ -25,8 +25,8 @@ def check_domain_running(conn, guestname, logger):
>          obj = conn.lookupByID(id)
>          domain_names.append(obj.name())
>  
> -    if guestname not in domain_names:
> -        logger.error("%s is not running or does not exist" % guestname)
> +    if domain_name not in domain_names:
> +        logger.error("%s is not running or does not exist" % domain_name)
>          return False
>      else:
>          return True
> @@ -34,7 +34,7 @@ def check_domain_running(conn, guestname, logger):
>  def flag_check(params):
>      """ check if the flag file is present or not"""
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      username = params['username']
>      password = params['password']
>  
> @@ -45,13 +45,13 @@ def flag_check(params):
>  
>      conn = sharedmod.libvirtobj['conn']
>  
> -    if not check_domain_running(conn, guestname, logger):
> +    if not check_domain_running(conn, domain_name, logger):
>          logger.error("need a running domain")
>          return 1
>  
> -    logger.info("get the mac address of vm %s" % guestname)
> -    mac = utils.get_dom_mac_addr(guestname)
> -    logger.info("the mac address of vm %s is %s" % (guestname, mac))
> +    logger.info("get the mac address of vm %s" % domain_name)
> +    mac = utils.get_dom_mac_addr(domain_name)
> +    logger.info("the mac address of vm %s is %s" % (domain_name, mac))
>  
>      timeout = 300
>      while timeout:
> @@ -61,11 +61,11 @@ def flag_check(params):
>              time.sleep(10)
>              timeout -= 10
>          else:
> -            logger.info("the ip address of vm %s is %s" % (guestname, ipaddr))
> +            logger.info("the ip address of vm %s is %s" % (domain_name, ipaddr))
>              break
>  
>      if timeout == 0:
> -        logger.info("vm %s failed to get ip address" % guestname)
> +        logger.info("vm %s failed to get ip address" % domain_name)
>          return 1
>  
>      ret = utils.remote_exec_pexpect(ipaddr, username, password, FLAG_CHECK)
> @@ -79,7 +79,7 @@ def flag_check(params):
>          logger.error("flag %s still exist, FAILED." % FLAG_FILE)
>          return 1
>      elif ret != None and expected_result == "exist":
> -        logger.error("no flag %s exists in the domain %s " % (FLAG_FILE,guestname))
> +        logger.error("no flag %s exists in the domain %s " % (FLAG_FILE,domain_name))
>          return 1
>      elif ret != None and expected_result == 'noexist':
>          logger.info("flag %s is not present, checking succeeded" % FLAG_FILE)
> diff --git a/repos/snapshot/internal_create.py b/repos/snapshot/internal_create.py
> index 335e2a0..27875ab 100644
> --- a/repos/snapshot/internal_create.py
> +++ b/repos/snapshot/internal_create.py
> @@ -13,12 +13,12 @@ from src import sharedmod
>  from utils import utils
>  from utils import xml_builder
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ('snapshotname',)
>  
>  QEMU_IMAGE_FORMAT = "qemu-img info %s |grep format |awk -F': ' '{print $2}'"
>  
> -def check_domain_image(domobj, util, guestname, logger):
> +def check_domain_image(domobj, util, domain_name, logger):
>      """ensure that the state of domain is poweroff
>         and its disk image is the type of qcow2
>      """
> @@ -26,7 +26,7 @@ def check_domain_image(domobj, util, guestname, logger):
>      disk_path = utils.get_disk_path(dom_xml)
>      status, ret = commands.getstatusoutput(QEMU_IMAGE_FORMAT % disk_path)
>      if status:
> -        logger.error("executing "+ "\"" + QEMU_IMAGE_FORMAT % guestname + "\"" + " failed")
> +        logger.error("executing "+ "\"" + QEMU_IMAGE_FORMAT % domain_name + "\"" + " failed")
>          logger.error(ret)
>          return False
>      else:
> @@ -36,7 +36,7 @@ def check_domain_image(domobj, util, guestname, logger):
>          else:
>              logger.error("%s has a disk %s with type %s, \
>                            only qcow2 supports internal snapshot" % \
> -                          (guestname, disk_path, format))
> +                          (domain_name, disk_path, format))
>              return False
>  
>  def internal_create(params):
> @@ -45,30 +45,30 @@ def internal_create(params):
>          check the functionality of snapshot
>      """
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>  
>      if not params.has_key('snapshotname'):
>          params['snapshotname'] = str(int(time.time()))
>  
>      conn = sharedmod.libvirtobj['conn']
>      domain_names = conn.listDefinedDomains()
> -    if guestname not in domain_names:
> -        logger.error("%s is not poweroff or doesn't exist" % guestname)
> +    if domain_name not in domain_names:
> +        logger.error("%s is not poweroff or doesn't exist" % domain_name)
>          return 1
>  
> -    domobj = conn.lookupByName(guestname)
> +    domobj = conn.lookupByName(domain_name)
>  
>      logger.info("checking the format of its disk")
> -    if not check_domain_image(domobj, util, guestname, logger):
> +    if not check_domain_image(domobj, util, domain_name, logger):
>          logger.error("checking failed")
>          return 1
>  
>      xmlobj = xml_builder.XmlBuilder()
>      snapshot_xml = xmlobj.build_domain_snapshot(params)
> -    logger.debug("%s snapshot xml:\n%s" % (guestname, snapshot_xml))
> +    logger.debug("%s snapshot xml:\n%s" % (domain_name, snapshot_xml))
>  
>      try:
> -        logger.info("create a snapshot for %s" % guestname)
> +        logger.info("create a snapshot for %s" % domain_name)
>          domobj.snapshotCreateXML(snapshot_xml, 0)
>          logger.info("creating snapshot succeeded")
>      except libvirtError, e:
> diff --git a/repos/snapshot/revert.py b/repos/snapshot/revert.py
> index 94d7e85..4b9a5c8 100644
> --- a/repos/snapshot/revert.py
> +++ b/repos/snapshot/revert.py
> @@ -9,15 +9,15 @@ from libvirt import libvirtError
>  
>  from src import sharedmod
>  
> -required_params = ('guestname', 'snapshotname',)
> +required_params = ('domain_name', 'snapshotname',)
>  optional_params = ()
>  
> -def check_domain_state(conn, guestname, logger):
> +def check_domain_state(conn, domain_name, logger):
>      """ check if the domain exists and in shutdown state as well """
>      domain_names = conn.listDefinedDomains()
>  
> -    if guestname not in domain_names:
> -        logger.error("%s is running or does not exist" % guestname)
> +    if domain_name not in domain_names:
> +        logger.error("%s is running or does not exist" % domain_name)
>          return False
>      else:
>          return True
> @@ -28,19 +28,19 @@ def revert(params):
>          check the functionality of snapshot
>      """
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>      snapshotname = params['snapshotname']
>  
>      conn = sharedmod.libvirtobj['conn']
>  
>      logger.info("checking if the domain is poweroff")
> -    if not check_domain_state(conn, guestname, logger):
> +    if not check_domain_state(conn, domain_name, logger):
>          logger.error("checking failed")
>          return 1
>  
>      try:
> -        logger.info("revert a snapshot for %s" % guestname)
> -        domobj = conn.lookupByName(guestname)
> +        logger.info("revert a snapshot for %s" % domain_name)
> +        domobj = conn.lookupByName(domain_name)
>          snap = domobj.snapshotLookupByName(snapshotname, 0)
>          domobj.revertToSnapshot(snap, 0)
>          logger.info("revert snapshot succeeded")
> diff --git a/repos/snapshot/snapshot_list.py b/repos/snapshot/snapshot_list.py
> index 9d3423c..2479e60 100644
> --- a/repos/snapshot/snapshot_list.py
> +++ b/repos/snapshot/snapshot_list.py
> @@ -5,7 +5,7 @@ import sys
>  import re
>  import commands
>  
> -required_params = ('guestname',)
> +required_params = ('domain_name',)
>  optional_params = ()
>  
>  SNAPSHOT_DIR = "/var/lib/libvirt/qemu/snapshot"
> @@ -16,10 +16,10 @@ def snapshot_list(params):
>         the files under /var/lib/libvirt/qemu/snapshot folder
>      """
>      logger = params['logger']
> -    guestname = params['guestname']
> +    domain_name = params['domain_name']
>  
>      snapshot_list = []
> -    status, ret = commands.getstatusoutput(SNAPSHOT_LIST % guestname)
> +    status, ret = commands.getstatusoutput(SNAPSHOT_LIST % domain_name)
>      if status:
>          logger.error("executing "+ "\"" +  VIRSH_QUIET_LIST % " " + "\"" + " failed")
>          logger.error(ret)
> @@ -28,10 +28,10 @@ def snapshot_list(params):
>          snapshot_list = ret.split('\n')
>          logger.info("snapshot list is %s" % snapshot_list)
>  
> -    domain_snapshot_dir = os.path.join(SNAPSHOT_DIR, guestname)
> +    domain_snapshot_dir = os.path.join(SNAPSHOT_DIR, domain_name)
>      if (not os.path.isdir(domain_snapshot_dir) or not os.listdir(domain_snapshot_dir)) \
>          and snapshot_list == ['']:
> -        logger.info("domain %s has no snapshot records" % guestname)
> +        logger.info("domain %s has no snapshot records" % domain_name)
>          return 0
>      elif (not os.path.isdir(domain_snapshot_dir) or not os.listdir(domain_snapshot_dir)) \
>          and snapshot_list != ['']:
> @@ -45,7 +45,7 @@ def snapshot_list(params):
>          return 1
>  
>      logger.info("the path of snapshot for domain %s is %s" % \
> -                  (guestname, domain_snapshot_dir))
> +                  (domain_name, domain_snapshot_dir))
>  
>      snapshot_entries = os.listdir(domain_snapshot_dir)
>      logger.info("%s in %s" % (snapshot_entries, domain_snapshot_dir))
> diff --git a/utils/dev_num.sh b/utils/dev_num.sh
> index 5e79313..de20fa6 100755
> --- a/utils/dev_num.sh
> +++ b/utils/dev_num.sh
> @@ -1,14 +1,14 @@
>  #!/bin/sh
>  # counting disk and interface numbers
>  
> -guestname=$1
> +domain_name=$1
>  device=$2
> -if [[ -z $guestname ]] || [[ -z $device ]]; then
> -    echo "need guestname and device element as the parameter."
> +if [[ -z $domain_name ]] || [[ -z $device ]]; then
> +    echo "need domain_name and device element as the parameter."
>      exit 1
>  fi
>  
> -virsh dumpxml $guestname > guestdump.xml
> +virsh dumpxml $domain_name > guestdump.xml
>  if [ -f guestdump.xml ]; then
>     num=$(grep "</$device>" guestdump.xml | wc -l )
>     if [[ -z $num ]]; then
> @@ -19,7 +19,7 @@ if [ -f guestdump.xml ]; then
>         rm -f guestdump.xml
>     fi
>  else
> -   echo "failed to dump the xml description of the domain $guestname."
> +   echo "failed to dump the xml description of the domain $domain_name."
>     rm -f guestdump.xml
>     exit 1
>  fi
> diff --git a/utils/disk_num.sh b/utils/disk_num.sh
> index 8c10e52..b9cf907 100755
> --- a/utils/disk_num.sh
> +++ b/utils/disk_num.sh
> @@ -1,12 +1,12 @@
>  #!/bin/sh
>  
> -guestname=$1
> -if [[ -z $guestname ]]; then
> -    echo "need guestname as the parameter."
> +domain_name=$1
> +if [[ -z $domain_name ]]; then
> +    echo "need domain_name as the parameter."
>      exit 1
>  fi
>  
> -virsh dumpxml $guestname > guestdump.xml
> +virsh dumpxml $domain_name > guestdump.xml
>  if [ -f guestdump.xml ]; then
>     num=$(grep "</disk>" guestdump.xml | wc -l )
>     if [[ -z $num ]]; then
> @@ -17,7 +17,7 @@ if [ -f guestdump.xml ]; then
>         rm -f guestdump.xml
>     fi
>  else
> -   echo "failed to dump the xml description of the domain $guestname."
> +   echo "failed to dump the xml description of the domain $domain_name."
>     rm -f guestdump.xml
>     exit 1
>  fi
> diff --git a/utils/utils.py b/utils/utils.py
> index 5cd3ed2..0fd1ce0 100644
> --- a/utils/utils.py
> +++ b/utils/utils.py
> @@ -245,10 +245,10 @@ def get_capacity_suffix_size(capacity):
>              int(dicts['capacity']) * change_to_byte[suffix]
>      return dicts
>  
> -def dev_num(guestname, device):
> +def dev_num(domain_name, device):
>      """Get disk or interface number in the domain"""
>      cur = commands.getoutput("pwd")
> -    cmd = "sh %s/utils/dev_num.sh %s %s" % (cur, guestname, device)
> +    cmd = "sh %s/utils/dev_num.sh %s %s" % (cur, domain_name, device)
>      num = int(commands.getoutput(cmd))
>      if num:
>          return num
> diff --git a/utils/xml_builder.py b/utils/xml_builder.py
> index a41ab72..2cf09f5 100644
> --- a/utils/xml_builder.py
> +++ b/utils/xml_builder.py
> @@ -203,7 +203,7 @@ if __name__ == "__main__":
>      #---------------------
>      print '=' * 30, 'disk xml', '=' * 30
>      params['virt_type'] = 'kvm'
> -    params['guestname'] = 'foo'
> +    params['domain_name'] = 'foo'
>      params['hdmodel'] = 'virtio'
>  
>      diskxml = xmlobj.build_disk(params)
> @@ -213,7 +213,7 @@ if __name__ == "__main__":
>      #---------------------
>      print '=' * 30, 'cdrom xml', '=' * 30
>      params['virt_type'] = 'kvm'
> -    params['guestname'] = 'foo'
> +    params['domain_name'] = 'foo'
>      params['hdmodel'] = 'ide'
>      params['bootcd'] = '/tmp/cdrom.img'
>  
> @@ -293,7 +293,7 @@ if __name__ == "__main__":
>      #-----------------------
>      print '=' * 30, 'domain xml', '=' * 30
>      params['virt_type'] = 'kvm'
> -    params['guestname'] = 'rhel5u4'
> +    params['domain_name'] = 'rhel5u4'
>      params['memory'] = '1048576'
>      params['vcpu'] = '2'
>      params['inputbus'] = 'usb'
> @@ -322,7 +322,7 @@ if __name__ == "__main__":
>      #----------------------------------------
>      print '=' * 30, 'install domain xml', '=' * 30
>      params['virt_type'] = 'kvm'
> -    params['guestname'] = 'rhel5u4'
> +    params['domain_name'] = 'rhel5u4'
>      params['memory'] = '1048576'
>      params['vcpu'] = '2'
>      params['kickstart'] = 'http://10.66.70.201/libvirt.ks.cfg'
> diff --git a/utils/xml_generator.py b/utils/xml_generator.py
> index e173543..80a9807 100644
> --- a/utils/xml_generator.py
> +++ b/utils/xml_generator.py
> @@ -40,7 +40,7 @@ def domain_xml(params, install = False):
>  
>      # <name>
>      name_element = domain.createElement('name')
> -    name_node = domain.createTextNode(params['guestname'])
> +    name_node = domain.createTextNode(params['domain_name'])
>      name_element.appendChild(name_node)
>      domain_element.appendChild(name_element)
>  
> @@ -311,11 +311,11 @@ def disk_xml(params, cdrom = False):
>          if hypertype == 'kvm':
>              params['imagepath'] = '/var/lib/libvirt/images'
>              params['fullimagepath'] = params['imagepath'] + '/' + \
> -                                      params['guestname']
> +                                      params['domain_name']
>          elif hypertype == 'xen':
>              params['imagepath'] = '/var/lib/xen/images'
>              params['fullimagepath'] = params['imagepath'] + '/' + \
> -                                      params['guestname']
> +                                      params['domain_name']
>          else:
>              print 'DO NOT supported hypervisor.'
>              sys.exit(1)

Sorry for being so negative now, but I see we have some code that
doesn't look very good now. For example:

if guestname not in domain_names:

Also some test cases use 'guestname' and some use 'domain_name'. I
didn't see it when I first searched for 'guest' when sending this mail:
https://www.redhat.com/archives/libvir-list/2012-April/msg01162.html

This should definitely be fixed.

Martin


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]