diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index e68f186a710..f68a486616f 100644
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -42,7 +42,8 @@
       lock remove (lock rm)       Release a lock on an image.
       map                         Map image to a block device using the kernel.
       merge-diff                  Merge two diff exports together.
-      mirror image demote         Demote an image to secondary for RBD mirroring.
+      mirror image demote         Demote an image to non-primary for RBD
+                                  mirroring.
       mirror image disable        Disable RBD mirroring for an image.
       mirror image enable         Enable RBD mirroring for an image.
       mirror image promote        Promote an image to primary for RBD mirroring.
@@ -755,7 +756,7 @@
   usage: rbd mirror image demote [--pool <pool>] [--image <image>] 
                                  <image-spec> 
   
-  Demote an image to secondary for RBD mirroring.
+  Demote an image to non-primary for RBD mirroring.
   
   Positional arguments
     <image-spec>         image specification
diff --git a/src/tools/rbd/action/MirrorImage.cc b/src/tools/rbd/action/MirrorImage.cc
index d3a322cf8ae..ecb838fe0c8 100644
--- a/src/tools/rbd/action/MirrorImage.cc
+++ b/src/tools/rbd/action/MirrorImage.cc
@@ -121,7 +121,7 @@ int execute_promote(const po::variables_map &vm) {
     return r;
   }
 
-  std::cout << "" << std::endl;
+  std::cout << "Image promoted to primary" << std::endl;
   return 0;
 }
 
@@ -148,11 +148,11 @@ int execute_demote(const po::variables_map &vm) {
 
   r = image.mirror_image_demote();
   if (r < 0) {
-    std::cerr << "rbd: error demoting image to secondary" << std::endl;
+    std::cerr << "rbd: error demoting image to non-primary" << std::endl;
     return r;
   }
 
-  std::cout << "Image demoted to secondary" << std::endl;
+  std::cout << "Image demoted to non-primary" << std::endl;
   return 0;
 }
 
@@ -201,7 +201,7 @@ Shell::Action action_promote(
   &get_arguments_promote, &execute_promote);
 Shell::Action action_demote(
   {"mirror", "image", "demote"}, {},
-  "Demote an image to secondary for RBD mirroring.", "",
+  "Demote an image to non-primary for RBD mirroring.", "",
   &get_arguments, &execute_demote);
 Shell::Action action_resync(
   {"mirror", "image", "resync"}, {},