diff --git a/lib/opcodes.py b/lib/opcodes.py
index 6848c4e85fd88177c491e4bfb41e363749df4bc8..36939d42e06670e8fedfd2d1004f6e34678d3b07 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -419,7 +419,7 @@ class OpMigrateInstance(OpCode):
   This migrates (without shutting down an instance) to its secondary
   node.
 
-  @var instance_name: the name of the instance
+  @ivar instance_name: the name of the instance
 
   """
   OP_ID = "OP_INSTANCE_MIGRATE"
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index f1063d8b4ae74abc58b95a08f384e64164ccc5ff..369ae347d6c6ccf2ae0638f0f05a14673d0baa54 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -826,11 +826,11 @@ def MigrateInstance(opts, args):
 
   The migrate is done without shutdown.
 
-  Args:
-    opts - class with options as members
-    args - list with a single element, the instance name
-  Opts used:
-    force - whether to migrate without asking questions.
+  @param opts: the command line options selected by the user
+  @type args: list
+  @param args: should contain only one element, the instance name
+  @rtype: int
+  @return: the desired exit code
 
   """
   instance_name = args[0]