diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 6d9386faf04eb3edfb8e7bc8cf2472ac16556454..8124d4b2902aeb2d45bc7b274e52ea60404c18da 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2583,6 +2583,8 @@ class LURenameCluster(LogicalUnit):
         self.LogWarning("Could not re-enable the master role on"
                         " the master, please restart manually: %s", msg)
 
+    return clustername
+
 
 class LUSetClusterParams(LogicalUnit):
   """Change the parameters of the cluster.
@@ -4965,6 +4967,8 @@ class LURenameInstance(LogicalUnit):
     finally:
       _ShutdownInstanceDisks(self, inst)
 
+    return inst.name
+
 
 class LURemoveInstance(LogicalUnit):
   """Remove an instance.
diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index d5c2c191cc7a7f6c437878db605e65191fae0b47..f5ad94210fc094a4728995f1fc792d66f01864bf 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -162,17 +162,25 @@ def RenameCluster(opts, args):
   @return: the desired exit code
 
   """
-  name = args[0]
+  cl = GetClient()
+
+  (cluster_name, ) = cl.QueryConfigValues(["cluster_name"])
+
+  new_name = args[0]
   if not opts.force:
-    usertext = ("This will rename the cluster to '%s'. If you are connected"
-                " over the network to the cluster name, the operation is very"
-                " dangerous as the IP address will be removed from the node"
-                " and the change may not go through. Continue?") % name
+    usertext = ("This will rename the cluster from '%s' to '%s'. If you are"
+                " connected over the network to the cluster name, the"
+                " operation is very dangerous as the IP address will be"
+                " removed from the node and the change may not go through."
+                " Continue?") % (cluster_name, new_name)
     if not AskUser(usertext):
       return 1
 
-  op = opcodes.OpRenameCluster(name=name)
-  SubmitOpCode(op, opts=opts)
+  op = opcodes.OpRenameCluster(name=new_name)
+  result = SubmitOpCode(op, opts=opts, cl=cl)
+
+  ToStdout("Cluster renamed from '%s' to '%s'", cluster_name, result)
+
   return 0
 
 
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index 7d72dfd090dec503537adc51e7b221a6e9345eb5..ec19602cab7355b5141e5d9a0a59d9e37ffa3e56 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -636,7 +636,10 @@ def RenameInstance(opts, args):
                                 new_name=args[1],
                                 ip_check=opts.ip_check,
                                 name_check=opts.name_check)
-  SubmitOrSend(op, opts)
+  result = SubmitOrSend(op, opts)
+
+  ToStdout("Instance '%s' renamed to '%s'", args[0], result)
+
   return 0