diff --git a/lib/cli.py b/lib/cli.py
index f79738118545d7f2a7f9d7720a966a4661724bcb..eff591ef4236ddcb1d52e3c1f19d8c2d8745c52d 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -821,8 +821,8 @@ TIMEOUT_OPT = cli_option("--timeout", dest="timeout", type="int",
                          default=constants.DEFAULT_SHUTDOWN_TIMEOUT,
                          help="Maximum time to wait")
 
-SHUTDOWN_TIMEOUT_OPT = cli_option("--shutdown-timeout", dest="timeout",
-                         type="int",
+SHUTDOWN_TIMEOUT_OPT = cli_option("--shutdown-timeout",
+                         dest="shutdown_timeout", type="int",
                          default=constants.DEFAULT_SHUTDOWN_TIMEOUT,
                          help="Maximum time to wait for instance shutdown")
 
diff --git a/scripts/gnt-backup b/scripts/gnt-backup
index dc381dc0f1322fed027c67eb87873b565cbe5fd2..a07335651a668ebb3cc019df11a41626580f35fc 100755
--- a/scripts/gnt-backup
+++ b/scripts/gnt-backup
@@ -73,7 +73,7 @@ def ExportInstance(opts, args):
   op = opcodes.OpExportInstance(instance_name=args[0],
                                 target_node=opts.node,
                                 shutdown=opts.shutdown,
-                                timeout=opts.timeout)
+                                shutdown_timeout=opts.shutdown_timeout)
 
   fin_resu, dlist = SubmitOpCode(op)
   if not isinstance(dlist, list):
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index a0941c200d3a6addba774e757dc3a706e6e2d511..ed0fa8daac2c1ded19a1638e56c93629b894b144 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -564,7 +564,7 @@ def RemoveInstance(opts, args):
 
   op = opcodes.OpRemoveInstance(instance_name=instance_name,
                                 ignore_failures=opts.ignore_failures,
-                                timeout=opts.timeout)
+                                shutdown_timeout=opts.shutdown_timeout)
   SubmitOrSend(op, opts, cl=cl)
   return 0
 
@@ -715,7 +715,7 @@ def _RebootInstance(name, opts):
   return opcodes.OpRebootInstance(instance_name=name,
                                   reboot_type=opts.reboot_type,
                                   ignore_secondaries=opts.ignore_secondaries,
-                                  timeout=opts.timeout)
+                                  shutdown_timeout=opts.shutdown_timeout)
 
 
 def _ShutdownInstance(name, opts):
@@ -806,7 +806,7 @@ def FailoverInstance(opts, args):
 
   op = opcodes.OpFailoverInstance(instance_name=instance_name,
                                   ignore_consistency=opts.ignore_consistency,
-                                  timeout=opts.timeout)
+                                  shutdown_timeout=opts.shutdown_timeout)
   SubmitOrSend(op, opts, cl=cl)
   return 0
 
@@ -872,7 +872,7 @@ def MoveInstance(opts, args):
 
   op = opcodes.OpMoveInstance(instance_name=instance_name,
                               target_node=opts.node,
-                              timeout=opts.timeout)
+                              shutdown_timeout=opts.shutdown_timeout)
   SubmitOrSend(op, opts, cl=cl)
   return 0