diff --git a/opal/mca/pmix/ext3x/ext3x.c b/opal/mca/pmix/ext3x/ext3x.c
index 51edf9e11e..85b3602947 100644
--- a/opal/mca/pmix/ext3x/ext3x.c
+++ b/opal/mca/pmix/ext3x/ext3x.c
@@ -1,8 +1,8 @@
 /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
 /*
  * Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
- * Copyright (c) 2014-2017 Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014-2018 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2014-2015 Mellanox Technologies, Inc.
  *                         All rights reserved.
  * Copyright (c) 2016      Cisco Systems, Inc.  All rights reserved.
@@ -1257,7 +1257,7 @@ static void errreg_cbfunc (pmix_status_t status,
     OPAL_ACQUIRE_OBJECT(op);
     op->event->index = errhandler_ref;
     opal_output_verbose(5, opal_pmix_base_framework.framework_output,
-                        "PMIX2x errreg_cbfunc - error handler registered status=%d, reference=%lu",
+                        "PMIX3x errreg_cbfunc - error handler registered status=%d, reference=%lu",
                         status, (unsigned long)errhandler_ref);
     if (NULL != op->evregcbfunc) {
         op->evregcbfunc(pmix3x_convert_rc(status), errhandler_ref, op->cbdata);
diff --git a/opal/mca/pmix/ext3x/ext3x.h b/opal/mca/pmix/ext3x/ext3x.h
index d7e0444b3c..a2f5fc5700 100644
--- a/opal/mca/pmix/ext3x/ext3x.h
+++ b/opal/mca/pmix/ext3x/ext3x.h
@@ -3,8 +3,8 @@
  * Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
  * Copyright (c) 2014-2015 Mellanox Technologies, Inc.
  *                         All rights reserved.
- * Copyright (c) 2016      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2016-2018 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * Copyright (c) 2017      Los Alamos National Security, LLC. All rights
  *                         reserved.
  * $COPYRIGHT$
@@ -14,8 +14,8 @@
  * $HEADER$
  */
 
-#ifndef MCA_PMIX_PMIX2X_H
-#define MCA_PMIX_PMIX2X_H
+#ifndef MCA_PMIX_PMIX3X_H
+#define MCA_PMIX_PMIX3X_H
 
 #include "opal_config.h"
 
@@ -348,4 +348,4 @@ OPAL_MODULE_DECLSPEC pmix_proc_state_t ext3x_convert_opalstate(int state);
 
 END_C_DECLS
 
-#endif /* MCA_PMIX_EXTERNAL_H */
+#endif /* MCA_PMIX_PMIX3X_H */