diff --git a/config/ompi_check_psm2.m4 b/config/ompi_check_psm2.m4
index 2f5322d2b9e..4870e433b06 100644
--- a/config/ompi_check_psm2.m4
+++ b/config/ompi_check_psm2.m4
@@ -17,7 +17,8 @@
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2016      Los Alamos National Security, LLC. All rights
 #                         reserved.
-#  Copyright (c) 2021     Triad National Security, LLC. All rights
+# Copyright (c) 2020      Cornelis Network, Inc. All rights reserved.
+# Copyright (c) 2021      Triad National Security, LLC. All rights
 #                         reserved.
 # Copyright (c) 2022      Amazon.com, Inc. or its affiliates.  All Rights reserved.
 # $COPYRIGHT$
@@ -37,10 +38,10 @@ AC_DEFUN([OMPI_CHECK_PSM2],[
 
     AC_ARG_WITH([psm2],
                 [AS_HELP_STRING([--with-psm2(=DIR)],
-                    [Build PSM2 (Intel PSM2) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
+                    [Build PSM2 (Cornelis PSM2) support, optionally adding DIR/include, DIR/lib, and DIR/lib64 to the search path for headers and libraries])])
     AC_ARG_WITH([psm2-libdir],
                 [AS_HELP_STRING([--with-psm2-libdir=DIR],
-                    [Search for PSM (Intel PSM2) libraries in DIR])])
+                    [Search for PSM (Cornelis PSM2) libraries in DIR])])
 
     AC_ARG_ENABLE([psm2-version-check],
                   [AS_HELP_STRING([--disable-psm2-version-check],
@@ -81,7 +82,7 @@ AC_DEFUN([OMPI_CHECK_PSM2],[
 
     CPPFLAGS="${opal_psm2_CPPFLAGS_save}"
 
-    OPAL_SUMMARY_ADD([Transports], [Intel Omnipath (PSM2)], [], [${$1_SUMMARY}])
+    OPAL_SUMMARY_ADD([Transports], [Cornelis Omnipath (PSM2)], [], [${$1_SUMMARY}])
 
     AS_IF([test "$ompi_check_psm2_happy" = "yes"],
           [$2],
diff --git a/docs/installing-open-mpi/configure-cli-options/networking.rst b/docs/installing-open-mpi/configure-cli-options/networking.rst
index cabb723a482..85bc5a7d637 100644
--- a/docs/installing-open-mpi/configure-cli-options/networking.rst
+++ b/docs/installing-open-mpi/configure-cli-options/networking.rst
@@ -41,7 +41,7 @@ can be used with ``configure``:
   compiler/linker search paths.
 
   Libfabric is the support library for OpenFabrics Interfaces-based
-  network adapters, such as Cisco usNIC, Intel True Scale PSM, etc.
+  network adapters, such as Cisco usNIC, Cornelis Networks True Scale PSM, etc.
 
 * ``--with-libfabric-libdir=DIR``:
   Look in directory for the libfabric libraries.  By default, Open MPI
@@ -68,12 +68,12 @@ can be used with ``configure``:
   Set configuration values for Portals 4
 
 * ``--with-psm=<directory>``:
-  Specify the directory where the QLogic InfiniPath / Intel True Scale
+  Specify the directory where the QLogic InfiniPath / Cornelis Netorks True Scale
   PSM library and header files are located.  This option is generally
   only necessary if the PSM headers and libraries are not in default
   compiler/linker search paths.
 
-  PSM is the support library for QLogic InfiniPath and Intel True Scale
+  PSM is the support library for QLogic InfiniPath and Cornelis Netorks True Scale
   network adapters.
 
 * ``--with-psm-libdir=DIR``:
@@ -82,12 +82,12 @@ can be used with ``configure``:
   option is only needed for special configurations.
 
 * ``--with-psm2=DIR``:
-  Specify the directory where the Intel Omni-Path PSM2 library and
+  Specify the directory where the Cornelis Networks Omni-Path PSM2 library and
   header files are located.  This option is generally only necessary
   if the PSM2 headers and libraries are not in default compiler/linker
   search paths.
 
-  PSM is the support library for Intel Omni-Path network adapters.
+  PSM is the support library for Cornelis Networks Omni-Path network adapters.
 
 * ``--with-psm2-libdir=DIR``:
   Look in directory for the PSM2 libraries.  By default, Open MPI will