diff --git a/libvirt/controller.xml b/libvirt/controller.xml
index 0352bcd..b2b79eb 100644
--- a/libvirt/controller.xml
+++ b/libvirt/controller.xml
@@ -1,5 +1,5 @@
 <domain type='kvm' id='164'>
-  <name>NAME</name>
+  <name>%NAME%</name>
   <memory unit='GiB'>%MEM%</memory>
   <currentMemory unit='GiB'>%MEM%</currentMemory>
   <vcpu placement='static'>%CPU%</vcpu>
@@ -28,20 +28,20 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source file='DISK0'/>
+      <source file='%DISK0%'/>
       <backingStore/>
       <target dev='sda' bus='sata'/>
       <boot order='1'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source file='DISK1'/>
+      <source file='%DISK1%'/>
       <backingStore/>
       <target dev='sdb' bus='sata'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
-      <source file='ISO'/>
+      <source file='%ISO%'/>
       <backingStore/>
       <target dev='sdc' bus='sata'/>
       <readonly/>
diff --git a/libvirt/controller_allinone.xml b/libvirt/controller_allinone.xml
index 6a1cc25..56054b1 100644
--- a/libvirt/controller_allinone.xml
+++ b/libvirt/controller_allinone.xml
@@ -1,5 +1,5 @@
 <domain type='kvm' id='164'>
-  <name>NAME</name>
+  <name>%NAME%</name>
   <memory unit='GiB'>%MEM%</memory>
   <currentMemory unit='GiB'>%MEM%</currentMemory>
   <vcpu placement='static'>%CPU%</vcpu>
@@ -28,26 +28,26 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source file='DISK0'/>
+      <source file='%DISK0%'/>
       <backingStore/>
       <target dev='sda' bus='sata'/>
       <boot order='1'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source file='DISK1'/>
+      <source file='%DISK1%'/>
       <backingStore/>
       <target dev='sdb' bus='sata'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source file='DISK2'/>
+      <source file='%DISK2%'/>
       <backingStore/>
       <target dev='sdc' bus='sata'/>
     </disk>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw'/>
-      <source file='ISO'/>
+      <source file='%ISO%'/>
       <backingStore/>
       <target dev='sdd' bus='sata'/>
       <readonly/>
diff --git a/libvirt/functions.sh b/libvirt/functions.sh
index fa38806..ef9ccc5 100644
--- a/libvirt/functions.sh
+++ b/libvirt/functions.sh
@@ -173,11 +173,11 @@ create_controller() {
             cp controller.xml ${DOMAIN_FILE}
         fi
         sed -i -e "
-            s,NAME,${CONTROLLER_NODE},
+            s,%NAME%,${CONTROLLER_NODE},
             s,%CPU%,${CPU},
             s,%MEM%,${MEM},
-            s,DISK0,${DISK_LOCATION}/${CONTROLLER_NODE}-0.img,
-            s,DISK1,${DISK_LOCATION}/${CONTROLLER_NODE}-1.img,
+            s,%DISK0%,${DISK_LOCATION}/${CONTROLLER_NODE}-0.img,
+            s,%DISK1%,${DISK_LOCATION}/${CONTROLLER_NODE}-1.img,
             s,%BR1%,${BRIDGE_INTERFACE}1,
             s,%BR2%,${BRIDGE_INTERFACE}2,
             s,%BR3%,${BRIDGE_INTERFACE}3,
@@ -187,14 +187,14 @@ create_controller() {
         sudo qemu-img create -f qcow2 ${DISK_LOCATION}/${CONTROLLER_NODE}-1.img 200G
         if ([ "$CONFIGURATION" == "simplex" ] || [ "$CONFIGURATION" == "duplex" ]); then
             sed -i -e "
-                s,DISK2,${DISK_LOCATION}/${CONTROLLER_NODE}-2.img,
+                s,%DISK2%,${DISK_LOCATION}/${CONTROLLER_NODE}-2.img,
             " ${DOMAIN_FILE}
             sudo qemu-img create -f qcow2 ${DISK_LOCATION}/${CONTROLLER_NODE}-2.img 200G
         fi
         if [ $i -eq 0 ]; then
-            sed -i -e "s,ISO,${ISOIMAGE}," ${DOMAIN_FILE}
+            sed -i -e "s,%ISO%,${ISOIMAGE}," ${DOMAIN_FILE}
         else
-            sed -i -e "s,ISO,," ${DOMAIN_FILE}
+            sed -i -e "s,%ISO%,," ${DOMAIN_FILE}
         fi
         sudo virsh define ${DOMAIN_FILE}
         if [ $i -eq 0 ]; then
@@ -267,11 +267,11 @@ create_node() {
     sudo qemu-img create -f qcow2 ${DISK_LOCATION}/${NODE}-1.img 200G
     cp ${IDENTITY}.xml ${DOMAIN_FILE}
     sed -i -e "
-        s,NAME,${NODE},
+        s,%NAME%,${NODE},
         s,%CPU%,${CPU},
         s,%MEM%,${MEM},
-        s,DISK0,${DISK_LOCATION}/${NODE}-0.img,;
-        s,DISK1,${DISK_LOCATION}/${NODE}-1.img,
+        s,%DISK0%,${DISK_LOCATION}/${NODE}-0.img,;
+        s,%DISK1%,${DISK_LOCATION}/${NODE}-1.img,
         s,%BR1%,${BRIDGE_INTERFACE}1,
         s,%BR2%,${BRIDGE_INTERFACE}2,
         s,%BR3%,${BRIDGE_INTERFACE}3,
diff --git a/libvirt/storage.xml b/libvirt/storage.xml
index b4bd1e1..76247e6 100644
--- a/libvirt/storage.xml
+++ b/libvirt/storage.xml
@@ -1,5 +1,5 @@
 <domain type='kvm' id='187'>
-  <name>NAME</name>
+  <name>%NAME%</name>
   <memory unit='GiB'>%MEM%</memory>
   <currentMemory unit='GiB'>%MEM%</currentMemory>
   <vcpu placement='static'>%CPU%</vcpu>
@@ -28,14 +28,14 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source file='DISK0'/>
+      <source file='%DISK0%'/>
       <backingStore/>
       <target dev='sda' bus='sata'/>
       <boot order='1'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source file='DISK1'/>
+      <source file='%DISK1%'/>
       <backingStore/>
       <target dev='sdb' bus='sata'/>
     </disk>
diff --git a/libvirt/worker.xml b/libvirt/worker.xml
index 0f45f50..d50f8fd 100644
--- a/libvirt/worker.xml
+++ b/libvirt/worker.xml
@@ -1,5 +1,5 @@
 <domain type='kvm' id='187'>
-  <name>NAME</name>
+  <name>%NAME%</name>
   <memory unit='GiB'>%MEM%</memory>
   <currentMemory unit='GiB'>%MEM%</currentMemory>
   <vcpu placement='static'>%CPU%</vcpu>
@@ -28,14 +28,14 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source file='DISK0'/>
+      <source file='%DISK0%'/>
       <backingStore/>
       <target dev='sda' bus='sata'/>
       <boot order='1'/>
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='qcow2'/>
-      <source file='DISK1'/>
+      <source file='%DISK1%'/>
       <backingStore/>
       <target dev='sdb' bus='sata'/>
     </disk>