diff --git a/src/Cluster.hs b/src/Cluster.hs
index 48f72a1ef68897e8991b0d8f3dbaef3721b824d3..284904693bc5a636044f82becd586d26cc8ad045 100644
--- a/src/Cluster.hs
+++ b/src/Cluster.hs
@@ -543,27 +543,27 @@ computeMoves i a b c d =
     else
         if c == b then {- Failover and ... -}
             if d == a then {- that's all -}
-                ("f", [printf "failover %s" i])
+                ("f", [printf "migrate %s" i])
             else
                 (printf "f r:%s" d,
-                 [printf "failover %s" i,
+                 [printf "migrate %s" i,
                   printf "replace-disks -n %s %s" d i])
         else
             if d == a then {- ... and keep primary as secondary -}
                 (printf "r:%s f" c,
                  [printf "replace-disks -n %s %s" c i,
-                  printf "failover %s" i])
+                  printf "migrate %s" i])
             else
                 if d == b then {- ... keep same secondary -}
                     (printf "f r:%s f" c,
-                     [printf "failover %s" i,
+                     [printf "migrate %s" i,
                       printf "replace-disks -n %s %s" c i,
-                      printf "failover %s" i])
+                      printf "migrate %s" i])
 
                 else {- Nothing in common -}
                     (printf "r:%s f r:%s" c d,
                      [printf "replace-disks -n %s %s" c i,
-                      printf "failover %s" i,
+                      printf "migrate %s" i,
                       printf "replace-disks -n %s %s" d i])
 
 {-| Converts a placement to string format -}
@@ -597,7 +597,7 @@ formatCmds :: [[String]] -> String
 formatCmds cmd_strs =
     unlines $ map ("  echo " ++) $
     concat $ map (\(a, b) ->
-        (printf "step %d" (a::Int)):(map ("gnt-instance" ++) b)) $
+        (printf "step %d" (a::Int)):(map ("gnt-instance " ++) b)) $
         zip [1..] cmd_strs
 
 {-| Converts a solution to string format -}