diff --git a/tools/move-instance b/tools/move-instance
index 8c77dc67f40974122f5d0d43c99013a36b6559a4..1e3d494b189faed3853348e30121b84d04054a7e 100755
--- a/tools/move-instance
+++ b/tools/move-instance
@@ -460,15 +460,15 @@ class MoveDestExecutor(object):
     disk_template = instance["disk_template"]
 
     disks = [{
-      "size": i["size"],
-      "mode": i["mode"],
+      constants.IDISK_SIZE: i["size"],
+      constants.IDISK_MODE: i["mode"],
       } for i in instance["disks"]]
 
     nics = [{
-      "ip": ip,
-      "mac": mac,
-      "mode": mode,
-      "link": link,
+      constants.INIC_IP: ip,
+      constants.INIC_MAC: mac,
+      constants.INIC_MODE: mode,
+      constants.INIC_LINK: link,
       } for ip, mac, mode, link in instance["nics"]]
 
     # TODO: Should this be the actual up/down status? (run_state)