diff --git a/ompi/runtime/help-mpi-runtime.txt b/ompi/runtime/help-mpi-runtime.txt
index c4ab70e0cb..927087f5c3 100644
--- a/ompi/runtime/help-mpi-runtime.txt
+++ b/ompi/runtime/help-mpi-runtime.txt
@@ -50,11 +50,6 @@ You may wish to try to narrow down the problem;
 WARNING: The MCA parameter mpi_param_check has been set to true, but
 parameter checking has been compiled out of Open MPI.  The
 mpi_param_check value has therefore been ignored.
-[mpi-params:leave-pinned-and-pipeline-selected]
-WARNING: Cannot set both the MCA parameters mpi_leave_pinned and
-mpi_leave_pinned_pipeline to "true".  Defaulting to mpi_leave_pinned
-ONLY.
-#
 [mpi_finalize:invoked_multiple_times]
 The function MPI_FINALIZE was invoked multiple times in a single
 process on host %s, PID %d.  
diff --git a/opal/runtime/help-opal-runtime.txt b/opal/runtime/help-opal-runtime.txt
index cd29c940ce..481f9597a0 100644
--- a/opal/runtime/help-opal-runtime.txt
+++ b/opal/runtime/help-opal-runtime.txt
@@ -60,3 +60,9 @@ The process that invoked fork was:
 If you are *absolutely sure* that your application will successfully
 and correctly survive a call to fork(), you may disable this warning
 by setting the mpi_warn_on_fork MCA parameter to 0.
+#
+[mpi-params:leave-pinned-and-pipeline-selected]
+WARNING: Cannot set both the MCA parameters opal_leave_pinned (a.k.a.,
+mpi_leave_pinned) and opal_leave_pinned_pipeline (a.k.a.,
+mpi_leave_pinned_pipeline) to "true".  Defaulting to mpi_leave_pinned
+ONLY.
diff --git a/opal/runtime/opal_params.c b/opal/runtime/opal_params.c
index 05cb6f0b04..5669ee778a 100644
--- a/opal/runtime/opal_params.c
+++ b/opal/runtime/opal_params.c
@@ -219,7 +219,7 @@ int opal_register_params(void)
 
     if (opal_leave_pinned > 0 && opal_leave_pinned_pipeline) {
         opal_leave_pinned_pipeline = 0;
-        opal_show_help("help-mpi-runtime.txt",
+        opal_show_help("help-opal-runtime.txt",
                        "mpi-params:leave-pinned-and-pipeline-selected",
                        true);
     }