From e8593cf7cd90a9e35da132e421d9b5da831fa122 Mon Sep 17 00:00:00 2001
From: Michael Ryan Peter <mipeter@redhat.com>
Date: Fri, 3 Oct 2025 16:45:09 -0400
Subject: [PATCH] OSDOCS#16398: OperatorHub: change filenames, includes, xrefs,
 etc

Change `operatorhub` to `software-catalog` in filenames, includes,
xrefs, and topic map files
---
 _topic_maps/_topic_map.yml                             |  2 +-
 _topic_maps/_topic_map_osd.yml                         |  2 +-
 _topic_maps/_topic_map_rosa.yml                        |  2 +-
 _topic_maps/_topic_map_rosa_hcp.yml                    |  2 +-
 architecture/control-plane.adoc                        |  2 +-
 .../aws-sts/oadp-aws-sts.adoc                          |  2 +-
 .../backing-up-applications.adoc                       |  2 +-
 .../oadp-rosa/oadp-rosa-backing-up-applications.adoc   |  2 +-
 cicd/pipelines/installing-pipelines.adoc               |  2 +-
 ...lm-installing-from-software-catalog-using-cli.adoc} |  3 ++-
 ...lling-from-software-catalog-using-web-console.adoc} |  3 ++-
 ...ing-operators-from-software-catalog-configure.adoc} |  2 +-
 ...lm-installing-operators-from-software-catalog.adoc} |  3 ++-
 ...ure.adoc => olm-software-catalog-architecture.adoc} |  8 +++++---
 ...verview.adoc => olm-software-catalog-overview.adoc} |  5 +++--
 .../distr_tracing/distr-tracing-tempo-installing.adoc  |  2 +-
 observability/otel/otel-installing.adoc                |  2 +-
 operators/admin/olm-adding-operators-to-cluster.adoc   |  8 ++++----
 operators/admin/olm-cs-podsched.adoc                   |  2 +-
 operators/index.adoc                                   |  2 +-
 .../operator_sdk/token_auth/osdk-cco-aws-sts.adoc      |  6 +++---
 operators/operator_sdk/token_auth/osdk-cco-azure.adoc  |  6 +++---
 operators/operator_sdk/token_auth/osdk-cco-gcp.adoc    |  6 +++---
 ...ub.adoc => olm-understanding-software-catalog.adoc} | 10 +++++-----
 operators/understanding/olm/olm-understanding-olm.adoc |  2 +-
 .../user/olm-installing-operators-in-namespace.adoc    |  9 +++++----
 osd_cluster_admin/dedicated-admin-role.adoc            |  2 +-
 .../multiarch-tuning-operator.adoc                     |  2 +-
 .../preparing-for-users.adoc                           |  8 ++++----
 rosa_architecture/index.adoc                           |  2 +-
 serverless/install/preparing-serverless-install.adoc   |  2 +-
 web_console/capabilities_products-web-console.adoc     |  2 +-
 welcome/learn_more_about_openshift.adoc                |  2 +-
 whats_new/new-features.adoc                            |  2 +-
 34 files changed, 63 insertions(+), 56 deletions(-)
 rename modules/{olm-installing-from-operatorhub-using-cli.adoc => olm-installing-from-software-catalog-using-cli.adoc} (99%)
 rename modules/{olm-installing-from-operatorhub-using-web-console.adoc => olm-installing-from-software-catalog-using-web-console.adoc} (99%)
 rename modules/{olm-installing-operators-from-operatorhub-configure.adoc => olm-installing-operators-from-software-catalog-configure.adoc} (91%)
 rename modules/{olm-installing-operators-from-operatorhub.adoc => olm-installing-operators-from-software-catalog.adoc} (98%)
 rename modules/{olm-operatorhub-architecture.adoc => olm-software-catalog-architecture.adoc} (85%)
 rename modules/{olm-operatorhub-overview.adoc => olm-software-catalog-overview.adoc} (94%)
 rename operators/understanding/{olm-understanding-operatorhub.adoc => olm-understanding-software-catalog.adoc} (66%)

diff --git a/_topic_maps/_topic_map.yml b/_topic_maps/_topic_map.yml
index 45f17c4c1a3c..3c7f6ae1b812 100644
--- a/_topic_maps/_topic_map.yml
+++ b/_topic_maps/_topic_map.yml
@@ -1969,7 +1969,7 @@ Topics:
       File: olm-webhooks
   - Name: Software catalog
     Distros: openshift-enterprise,openshift-origin
-    File: olm-understanding-operatorhub
+    File: olm-understanding-software-catalog
   - Name: Red Hat-provided Operator catalogs
     Distros: openshift-enterprise
     File: olm-rh-catalogs
diff --git a/_topic_maps/_topic_map_osd.yml b/_topic_maps/_topic_map_osd.yml
index ebe68a18d876..620dd3ea35d9 100644
--- a/_topic_maps/_topic_map_osd.yml
+++ b/_topic_maps/_topic_map_osd.yml
@@ -690,7 +690,7 @@ Topics:
     - Name: Webhooks
       File: olm-webhooks
   - Name: Software catalog
-    File: olm-understanding-operatorhub
+    File: olm-understanding-software-catalog
   - Name: Red Hat-provided Operator catalogs
     File: olm-rh-catalogs
   - Name: Operators in multitenant clusters
diff --git a/_topic_maps/_topic_map_rosa.yml b/_topic_maps/_topic_map_rosa.yml
index 81ad194ac4b2..1d710e4ec229 100644
--- a/_topic_maps/_topic_map_rosa.yml
+++ b/_topic_maps/_topic_map_rosa.yml
@@ -896,7 +896,7 @@ Topics:
     - Name: Webhooks
       File: olm-webhooks
   - Name: Software catalog
-    File: olm-understanding-operatorhub
+    File: olm-understanding-software-catalog
   - Name: Red Hat-provided Operator catalogs
     File: olm-rh-catalogs
   - Name: Operators in multitenant clusters
diff --git a/_topic_maps/_topic_map_rosa_hcp.yml b/_topic_maps/_topic_map_rosa_hcp.yml
index 3d3da2711f1d..70caaf3fb52e 100644
--- a/_topic_maps/_topic_map_rosa_hcp.yml
+++ b/_topic_maps/_topic_map_rosa_hcp.yml
@@ -758,7 +758,7 @@ Topics:
     - Name: Webhooks
       File: olm-webhooks
   - Name: Software catalog
-    File: olm-understanding-operatorhub
+    File: olm-understanding-software-catalog
   - Name: Red Hat-provided Operator catalogs
     File: olm-rh-catalogs
   - Name: Operators in multitenant clusters
diff --git a/architecture/control-plane.adoc b/architecture/control-plane.adoc
index 25e3a9417837..123a02a277cf 100644
--- a/architecture/control-plane.adoc
+++ b/architecture/control-plane.adoc
@@ -55,7 +55,7 @@ include::modules/arch-olm-operators.adoc[leveloffset=+2]
 [role="_additional-resources"]
 .Additional resources
 * xref:../operators/understanding/olm/olm-understanding-olm.adoc#olm-understanding-olm[Operator Lifecycle Manager (OLM) concepts and resources]
-* xref:../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Understanding the software catalog].
+* xref:../operators/understanding/olm-understanding-software-catalog.adoc#olm-understanding-software-catalog[Understanding the software catalog].
 
 include::modules/etcd-overview.adoc[leveloffset=+1]
 
diff --git a/backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc b/backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc
index b67364572306..4db523d5340b 100644
--- a/backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc
+++ b/backup_and_restore/application_backup_and_restore/aws-sts/oadp-aws-sts.adoc
@@ -33,7 +33,7 @@ include::modules/installing-oadp-aws-sts.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../../operators/user/olm-installing-operators-in-namespace.adoc#olm-installing-from-operatorhub-using-web-console_olm-installing-operators-in-namespace[Installing from the software catalog using the web console]
+* xref:../../../operators/user/olm-installing-operators-in-namespace.adoc#olm-installing-from-software-catalog-using-web-console_olm-installing-operators-in-namespace[Installing from the software catalog using the web console]
 * xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc#backing-up-applications[Backing up applications]
 
 [id="oadp-aws-sts-backing-up-and-cleaning"]
diff --git a/backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc b/backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc
index 55ef28d2d0ea..e21f8bb9f207 100644
--- a/backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc
+++ b/backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc
@@ -63,7 +63,7 @@ endif::openshift-rosa,openshift-rosa-hcp[]
 [role="_additional-resources"]
 .Additional resources
 ifndef::openshift-rosa-hcp[]
-* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-operators-from-operatorhub_olm-adding-operators-to-a-cluster[Installing Operators on clusters for administrators]
+* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-operators-from-software-catalog_olm-adding-operators-to-a-cluster[Installing Operators on clusters for administrators]
 endif::openshift-rosa-hcp[]
 // This xref is not included in the ROSA classic docs.
 ifndef::openshift-rosa,openshift-rosa-hcp[]
diff --git a/backup_and_restore/application_backup_and_restore/oadp-rosa/oadp-rosa-backing-up-applications.adoc b/backup_and_restore/application_backup_and_restore/oadp-rosa/oadp-rosa-backing-up-applications.adoc
index 66cdeef8111a..eb2755a65948 100644
--- a/backup_and_restore/application_backup_and_restore/oadp-rosa/oadp-rosa-backing-up-applications.adoc
+++ b/backup_and_restore/application_backup_and_restore/oadp-rosa/oadp-rosa-backing-up-applications.adoc
@@ -47,7 +47,7 @@ include::modules/updating-role-arn-oadp-rosa-sts.adoc[leveloffset=+1]
 .Additional resources
 // This xref points to a topic that is not published in the ROSA docs.
 ifndef::openshift-rosa,openshift-rosa-hcp[]
-* xref:../../../operators/user/olm-installing-operators-in-namespace.adoc#olm-installing-from-operatorhub-using-web-console_olm-installing-operators-in-namespace[Installing from the software catalog using the web console].
+* xref:../../../operators/user/olm-installing-operators-in-namespace.adoc#olm-installing-from-software-catalog-using-web-console_olm-installing-operators-in-namespace[Installing from the software catalog using the web console].
 endif::openshift-rosa,openshift-rosa-hcp[]
 * xref:../../../backup_and_restore/application_backup_and_restore/backing_up_and_restoring/backing-up-applications.adoc#backing-up-applications[Backing up applications]
 
diff --git a/cicd/pipelines/installing-pipelines.adoc b/cicd/pipelines/installing-pipelines.adoc
index 96aa660e88b8..dc9955b6c15a 100644
--- a/cicd/pipelines/installing-pipelines.adoc
+++ b/cicd/pipelines/installing-pipelines.adoc
@@ -21,7 +21,7 @@ This guide walks cluster administrators through the process of installing the {p
 ifdef::openshift-origin[]
 * Ensure that you have downloaded the {cluster-manager-url-pull} as shown in the xref:../../installing/installing_gcp/installing-gcp-customizations.adoc#installation-obtaining-installer_installing-gcp-customizations[Obtaining the installation program] to install this Operator.
 +
-If you have the pull secret, add the `redhat-operators` catalog to the OperatorHub custom resource (CR) as shown in xref:../../post_installation_configuration/preparing-for-users.adoc#olm-installing-operators-from-operatorhub-configure_post-install-preparing-for-users[Configuring {product-title} to use Red Hat Operators].
+If you have the pull secret, add the `redhat-operators` catalog to the OperatorHub custom resource (CR) as shown in xref:../../post_installation_configuration/preparing-for-users.adoc#olm-installing-operators-from-software-catalog-configure_post-install-preparing-for-users[Configuring {product-title} to use Red Hat Operators].
 endif::[]
 
 
diff --git a/modules/olm-installing-from-operatorhub-using-cli.adoc b/modules/olm-installing-from-software-catalog-using-cli.adoc
similarity index 99%
rename from modules/olm-installing-from-operatorhub-using-cli.adoc
rename to modules/olm-installing-from-software-catalog-using-cli.adoc
index a3d894ffd682..e851cb6adfcd 100644
--- a/modules/olm-installing-from-operatorhub-using-cli.adoc
+++ b/modules/olm-installing-from-software-catalog-using-cli.adoc
@@ -12,7 +12,8 @@ ifeval::["{context}" == "olm-installing-operators-in-namespace"]
 endif::[]
 
 :_mod-docs-content-type: PROCEDURE
-[id="olm-installing-operator-from-operatorhub-using-cli_{context}"]
+
+[id="olm-installing-operator-from-software-catalog-using-cli_{context}"]
 = Installing from the software catalog by using the CLI
 
 Instead of using the {product-title} web console, you can install an Operator from the software catalog by using the CLI. Use the `oc` command to create or update a `Subscription` object.
diff --git a/modules/olm-installing-from-operatorhub-using-web-console.adoc b/modules/olm-installing-from-software-catalog-using-web-console.adoc
similarity index 99%
rename from modules/olm-installing-from-operatorhub-using-web-console.adoc
rename to modules/olm-installing-from-software-catalog-using-web-console.adoc
index 5b6e0118c7c1..5f4bcd35c23c 100644
--- a/modules/olm-installing-from-operatorhub-using-web-console.adoc
+++ b/modules/olm-installing-from-software-catalog-using-web-console.adoc
@@ -29,7 +29,8 @@ ifeval::["{context}" == "olm-adding-operators-to-a-cluster"]
 endif::[]
 
 :_mod-docs-content-type: PROCEDURE
-[id="olm-installing-from-operatorhub-using-web-console_{context}"]
+
+[id="olm-installing-from-software-catalog-using-web-console_{context}"]
 = Installing from the software catalog by using the web console
 
 You can install and subscribe to an Operator from software catalog by using the {product-title} web console.
diff --git a/modules/olm-installing-operators-from-operatorhub-configure.adoc b/modules/olm-installing-operators-from-software-catalog-configure.adoc
similarity index 91%
rename from modules/olm-installing-operators-from-operatorhub-configure.adoc
rename to modules/olm-installing-operators-from-software-catalog-configure.adoc
index c53590c74ccd..8fc016f037df 100644
--- a/modules/olm-installing-operators-from-operatorhub-configure.adoc
+++ b/modules/olm-installing-operators-from-software-catalog-configure.adoc
@@ -7,7 +7,7 @@
 
 
 :_mod-docs-content-type: CONCEPT
-[id="olm-installing-operators-from-operatorhub-configure_{context}"]
+[id="olm-installing-operators-from-software-catalog-configure_{context}"]
 = About Operator Catalogs in {product-title}
 
 Out of the box {product-title} provides a catalog source for community operators.
diff --git a/modules/olm-installing-operators-from-operatorhub.adoc b/modules/olm-installing-operators-from-software-catalog.adoc
similarity index 98%
rename from modules/olm-installing-operators-from-operatorhub.adoc
rename to modules/olm-installing-operators-from-software-catalog.adoc
index 166e1c9a3502..d9b576853067 100644
--- a/modules/olm-installing-operators-from-operatorhub.adoc
+++ b/modules/olm-installing-operators-from-software-catalog.adoc
@@ -12,7 +12,8 @@ ifeval::["{context}" == "olm-installing-operators-in-namespace"]
 endif::[]
 
 :_mod-docs-content-type: CONCEPT
-[id="olm-installing-operators-from-operatorhub_{context}"]
+
+[id="olm-installing-operators-from-software-catalog_{context}"]
 = About Operator installation from the software catalog
 
 The software catalog is a user interface for discovering Operators; it works in conjunction with Operator Lifecycle Manager (OLM), which installs and manages Operators on a cluster.
diff --git a/modules/olm-operatorhub-architecture.adoc b/modules/olm-software-catalog-architecture.adoc
similarity index 85%
rename from modules/olm-operatorhub-architecture.adoc
rename to modules/olm-software-catalog-architecture.adoc
index 9f60f2e3d4d5..7acbe91318bf 100644
--- a/modules/olm-operatorhub-architecture.adoc
+++ b/modules/olm-software-catalog-architecture.adoc
@@ -1,13 +1,15 @@
 // Module included in the following assemblies:
 //
-// * operators/understanding/olm-understanding-operatorhub.adoc
+// * operators/understanding/olm-understanding-software-catalog.adoc
 
-[id="olm-operatorhub-arch_{context}"]
+:_mod-docs-content-type: CONCEPT
+
+[id="olm-software-catalog-arch_{context}"]
 = Software catalog architecture
 
 The software catalog UI component is driven by the Marketplace Operator by default on {product-title} in the `openshift-marketplace` namespace.
 
-[id="olm-operatorhub-arch-operatorhub_crd_{context}"]
+[id="olm-software-catalog-arch-operatorhub-crd_{context}"]
 == OperatorHub custom resource
 
 The Marketplace Operator manages an `OperatorHub` custom resource (CR) named `cluster` that manages the default `CatalogSource` objects provided with the software catalog.
diff --git a/modules/olm-operatorhub-overview.adoc b/modules/olm-software-catalog-overview.adoc
similarity index 94%
rename from modules/olm-operatorhub-overview.adoc
rename to modules/olm-software-catalog-overview.adoc
index 912c952e65f5..9705b8aa5da4 100644
--- a/modules/olm-operatorhub-overview.adoc
+++ b/modules/olm-software-catalog-overview.adoc
@@ -1,9 +1,10 @@
 // Module included in the following assemblies:
 //
-// * operators/understanding/olm-understanding-operatorhub.adoc
+// * operators/understanding/olm-understanding-software-catalog.adoc
 
 :_mod-docs-content-type: CONCEPT
-[id="olm-operatorhub-overview_{context}"]
+
+[id="olm-software-catalog-overview_{context}"]
 = About the software catalog
 
 The _software catalog_ is the web console interface in {product-title} that cluster administrators use to discover and install Operators. With one click, an Operator can be pulled from its off-cluster source, installed and subscribed on the cluster, and made ready for engineering teams to self-service manage the product across deployment environments using Operator Lifecycle Manager (OLM).
diff --git a/observability/distr_tracing/distr-tracing-tempo-installing.adoc b/observability/distr_tracing/distr-tracing-tempo-installing.adoc
index 21de535c2d36..703e640c9606 100644
--- a/observability/distr_tracing/distr-tracing-tempo-installing.adoc
+++ b/observability/distr_tracing/distr-tracing-tempo-installing.adoc
@@ -148,6 +148,6 @@ include::modules/distr-tracing-tempo-install-tempomonolithic-cli.adoc[leveloffse
 * xref:../../post_installation_configuration/preparing-for-users.adoc#creating-cluster-admin_post-install-preparing-for-users[Creating a cluster admin]
 * link:https://operatorhub.io/[OperatorHub.io]
 * xref:../../web_console/web-console.adoc#web-console[Accessing the web console]
-* xref:../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-operatorhub-using-web-console_olm-adding-operators-to-a-cluster[Installing from the software catalog using the web console]
+* xref:../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-software-catalog-using-web-console_olm-adding-operators-to-a-cluster[Installing from the software catalog using the web console]
 * xref:../../operators/user/olm-creating-apps-from-installed-operators.adoc#olm-creating-apps-from-installed-operators[Creating applications from installed Operators]
 * xref:../../cli_reference/openshift_cli/getting-started-cli.adoc#getting-started-cli[Getting started with the OpenShift CLI]
diff --git a/observability/otel/otel-installing.adoc b/observability/otel/otel-installing.adoc
index 8e78842f37d7..b1acee15ad77 100644
--- a/observability/otel/otel-installing.adoc
+++ b/observability/otel/otel-installing.adoc
@@ -29,6 +29,6 @@ include::modules/otel-creating-required-RBAC-resources-automatically.adoc[levelo
 * xref:../../post_installation_configuration/preparing-for-users.adoc#creating-cluster-admin_post-install-preparing-for-users[Creating a cluster admin]
 * link:https://operatorhub.io/[OperatorHub.io]
 * xref:../../web_console/web-console.adoc#web-console[Accessing the web console]
-* xref:../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-operatorhub-using-web-console_olm-adding-operators-to-a-cluster[Installing from the software catalog using the web console]
+* xref:../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-software-catalog-using-web-console_olm-adding-operators-to-a-cluster[Installing from the software catalog using the web console]
 * xref:../../operators/user/olm-creating-apps-from-installed-operators.adoc#olm-creating-apps-from-installed-operators[Creating applications from installed Operators]
 * xref:../../cli_reference/openshift_cli/getting-started-cli.adoc#getting-started-cli[Getting started with the OpenShift CLI]
diff --git a/operators/admin/olm-adding-operators-to-cluster.adoc b/operators/admin/olm-adding-operators-to-cluster.adoc
index 2ed6e481bf3e..16d11da4c14f 100644
--- a/operators/admin/olm-adding-operators-to-cluster.adoc
+++ b/operators/admin/olm-adding-operators-to-cluster.adoc
@@ -31,14 +31,14 @@ ifdef::openshift-origin[]
 If you have the pull secret, add the `redhat-operators` catalog to the `OperatorHub` custom resource (CR) as shown in _Configuring {product-title} to use Red Hat Operators_.
 endif::[]
 
-include::modules/olm-installing-operators-from-operatorhub.adoc[leveloffset=+1]
+include::modules/olm-installing-operators-from-software-catalog.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Understanding the software catalog]
+* xref:../../operators/understanding/olm-understanding-software-catalog.adoc#olm-understanding-software-catalog[Understanding the software catalog]
 
 // Installing from OperatorHub by using the CLI
-include::modules/olm-installing-from-operatorhub-using-web-console.adoc[leveloffset=+1]
+include::modules/olm-installing-from-software-catalog-using-web-console.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 .Additional resources
@@ -48,7 +48,7 @@ include::modules/olm-installing-from-operatorhub-using-web-console.adoc[leveloff
 ifdef::openshift-enterprise,openshift-webscale,openshift-origin,openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 
 // Installing from OperatorHub by using the CLI
-include::modules/olm-installing-from-operatorhub-using-cli.adoc[leveloffset=+1]
+include::modules/olm-installing-from-software-catalog-using-cli.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 .Additional resources
diff --git a/operators/admin/olm-cs-podsched.adoc b/operators/admin/olm-cs-podsched.adoc
index d85ab74faecc..3bcf9d59830e 100644
--- a/operators/admin/olm-cs-podsched.adoc
+++ b/operators/admin/olm-cs-podsched.adoc
@@ -31,7 +31,7 @@ include::modules/disabling-catalogsource-objects.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../operators/understanding/olm-understanding-operatorhub.adoc#olm-operatorhub-arch-operatorhub_crd_olm-understanding-operatorhub[OperatorHub custom resource]
+* xref:../../operators/understanding/olm-understanding-software-catalog.adoc#olm-software-catalog-arch-operatorhub-crd_olm-understanding-software-catalog[OperatorHub custom resource]
 
 ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 * xref:../../disconnected/using-olm.adoc#olm-restricted-networks-operatorhub_olm-restricted-networks[Disabling the default OperatorHub catalog sources]
diff --git a/operators/index.adoc b/operators/index.adoc
index 9fe97e8e8f28..6ed6a520be38 100644
--- a/operators/index.adoc
+++ b/operators/index.adoc
@@ -44,7 +44,7 @@ ifndef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 ** xref:../operators/user/olm-installing-operators-in-namespace.adoc#olm-installing-operators-in-namespace[Install an Operator from the software catalog].
 endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 ifdef::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
-** xref:../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-operators-from-operatorhub_olm-adding-operators-to-a-cluster[Install an Operator from the software catalog].
+** xref:../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-operators-from-software-catalog_olm-adding-operators-to-a-cluster[Install an Operator from the software catalog].
 endif::openshift-dedicated,openshift-rosa,openshift-rosa-hcp[]
 ** xref:../operators/admin/olm-status.adoc#olm-status[View Operator status].
 ** xref:../operators/admin/olm-managing-operatorconditions.adoc#olm-managing-operatorconditions[Manage Operator conditions].
diff --git a/operators/operator_sdk/token_auth/osdk-cco-aws-sts.adoc b/operators/operator_sdk/token_auth/osdk-cco-aws-sts.adoc
index adf100235c5f..1e08c96526f4 100644
--- a/operators/operator_sdk/token_auth/osdk-cco-aws-sts.adoc
+++ b/operators/operator_sdk/token_auth/osdk-cco-aws-sts.adoc
@@ -37,10 +37,10 @@ Your code should check for secrets that never appear and warn users to follow th
 .Additional resources
 
 * xref:../../../authentication/managing_cloud_provider_credentials/cco-short-term-creds.adoc#cco-short-term-creds-aws-olm_cco-short-term-creds[OLM-managed Operator support for authentication with AWS STS]
-* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-operatorhub-using-web-console_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the web console]
-* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-operator-from-operatorhub-using-cli_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the CLI]
+* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-software-catalog-using-web-console_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the web console]
+* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-operator-from-software-catalog-using-cli_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the CLI]
 
 include::modules/osdk-cco-aws-sts-enabling.adoc[leveloffset=+1]
 include::modules/osdk-cco-aws-sts-role.adoc[leveloffset=+1]
 include::modules/osdk-cco-aws-sts-tshooting.adoc[leveloffset=+1]
-include::modules/osdk-cco-aws-sts-alt.adoc[leveloffset=+1]
\ No newline at end of file
+include::modules/osdk-cco-aws-sts-alt.adoc[leveloffset=+1]
diff --git a/operators/operator_sdk/token_auth/osdk-cco-azure.adoc b/operators/operator_sdk/token_auth/osdk-cco-azure.adoc
index faae904af50c..63619bd6da9f 100644
--- a/operators/operator_sdk/token_auth/osdk-cco-azure.adoc
+++ b/operators/operator_sdk/token_auth/osdk-cco-azure.adoc
@@ -45,7 +45,7 @@ The *Install Operator* page in the web console allows cluster administrators to
 .Additional resources
 
 * xref:../../../authentication/managing_cloud_provider_credentials/cco-short-term-creds.adoc#cco-short-term-creds-azure-olm_cco-short-term-creds[OLM-managed Operator support for authentication with {entra-first}]
-* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-operatorhub-using-web-console_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the web console]
-* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-operator-from-operatorhub-using-cli_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the CLI]
+* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-software-catalog-using-web-console_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the web console]
+* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-operator-from-software-catalog-using-cli_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the CLI]
 
-include::modules/osdk-cco-azure-enabling.adoc[leveloffset=+1]
\ No newline at end of file
+include::modules/osdk-cco-azure-enabling.adoc[leveloffset=+1]
diff --git a/operators/operator_sdk/token_auth/osdk-cco-gcp.adoc b/operators/operator_sdk/token_auth/osdk-cco-gcp.adoc
index afe1f12c0ac1..9a3e04b8b126 100644
--- a/operators/operator_sdk/token_auth/osdk-cco-gcp.adoc
+++ b/operators/operator_sdk/token_auth/osdk-cco-gcp.adoc
@@ -56,7 +56,7 @@ The *Install Operator* page in the web console allows cluster administrators to
 .Additional resources
 
 * xref:../../../authentication/managing_cloud_provider_credentials/cco-short-term-creds.adoc#cco-short-term-creds-gcp-olm_cco-short-term-creds[OLM-managed Operator support for authentication with {gcp-wid-short}]
-* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-operatorhub-using-web-console_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the web console]
-* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-operator-from-operatorhub-using-cli_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the CLI]
+* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-from-software-catalog-using-web-console_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the web console]
+* xref:../../../operators/admin/olm-adding-operators-to-cluster.adoc#olm-installing-operator-from-software-catalog-using-cli_olm-adding-operators-to-a-cluster[Installing from OperatorHub using the CLI]
 
-include::modules/osdk-cco-gcp-enabling.adoc[leveloffset=+1]
\ No newline at end of file
+include::modules/osdk-cco-gcp-enabling.adoc[leveloffset=+1]
diff --git a/operators/understanding/olm-understanding-operatorhub.adoc b/operators/understanding/olm-understanding-software-catalog.adoc
similarity index 66%
rename from operators/understanding/olm-understanding-operatorhub.adoc
rename to operators/understanding/olm-understanding-software-catalog.adoc
index 4e2ec9afd7f3..2b96b7106a54 100644
--- a/operators/understanding/olm-understanding-operatorhub.adoc
+++ b/operators/understanding/olm-understanding-software-catalog.adoc
@@ -1,15 +1,15 @@
 :_mod-docs-content-type: ASSEMBLY
-[id="olm-understanding-operatorhub"]
+[id="olm-understanding-software-catalog"]
 = Understanding the software catalog
 include::_attributes/common-attributes.adoc[]
-:context: olm-understanding-operatorhub
+:context: olm-understanding-software-catalog
 
 toc::[]
 
-include::modules/olm-operatorhub-overview.adoc[leveloffset=+1]
-include::modules/olm-operatorhub-architecture.adoc[leveloffset=+1]
+include::modules/olm-software-catalog-overview.adoc[leveloffset=+1]
+include::modules/olm-software-catalog-architecture.adoc[leveloffset=+1]
 
-[id="olm-understanding-operatorhub-resources"]
+[id="olm-understanding-software-catalog-resources"]
 [role="_additional-resources"]
 == Additional resources
 
diff --git a/operators/understanding/olm/olm-understanding-olm.adoc b/operators/understanding/olm/olm-understanding-olm.adoc
index 1cdf8f595772..8f0098ad8ef8 100644
--- a/operators/understanding/olm/olm-understanding-olm.adoc
+++ b/operators/understanding/olm/olm-understanding-olm.adoc
@@ -15,7 +15,7 @@ include::modules/olm-catalogsource.adoc[leveloffset=+2]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Understanding the software catalog]
+* xref:../../../operators/understanding/olm-understanding-software-catalog.adoc#olm-understanding-software-catalog[Understanding the software catalog]
 * xref:../../../operators/understanding/olm-rh-catalogs.adoc#olm-rh-catalogs[Red Hat-provided Operator catalogs]
 * xref:../../../operators/admin/olm-managing-custom-catalogs.adoc#olm-creating-catalog-from-index_olm-managing-custom-catalogs[Adding a catalog source to a cluster]
 * xref:../../../operators/understanding/olm/olm-understanding-dependency-resolution.adoc#olm-dependency-catalog-priority_olm-understanding-dependency-resolution[Catalog priority]
diff --git a/operators/user/olm-installing-operators-in-namespace.adoc b/operators/user/olm-installing-operators-in-namespace.adoc
index e4c9e6673af5..cc983105a97c 100644
--- a/operators/user/olm-installing-operators-in-namespace.adoc
+++ b/operators/user/olm-installing-operators-in-namespace.adoc
@@ -19,12 +19,13 @@ ifdef::openshift-origin[]
 If you have the pull secret, add the `redhat-operators` catalog to the `OperatorHub` custom resource (CR) as shown in _Configuring {product-title} to use Red Hat Operators_.
 endif::[]
 
-include::modules/olm-installing-operators-from-operatorhub.adoc[leveloffset=+1]
-* xref:../../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Understanding the software catalog]
 
-include::modules/olm-installing-from-operatorhub-using-web-console.adoc[leveloffset=+1]
+include::modules/olm-installing-operators-from-software-catalog.adoc[leveloffset=+1]
+* xref:../../operators/understanding/olm-understanding-software-catalog.adoc#olm-understanding-software-catalog[Understanding the software catalog]
+
+include::modules/olm-installing-from-software-catalog-using-web-console.adoc[leveloffset=+1]
 ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
-include::modules/olm-installing-from-operatorhub-using-cli.adoc[leveloffset=+1]
+include::modules/olm-installing-from-software-catalog-using-cli.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 .Additional resources
diff --git a/osd_cluster_admin/dedicated-admin-role.adoc b/osd_cluster_admin/dedicated-admin-role.adoc
index 26c7fd01ba8b..54548ec5d856 100644
--- a/osd_cluster_admin/dedicated-admin-role.adoc
+++ b/osd_cluster_admin/dedicated-admin-role.adoc
@@ -32,7 +32,7 @@ include::modules/dedicated-managing-service-accounts.adoc[leveloffset=+1]
 
 include::modules/dedicated-managing-quotas-and-limit-ranges.adoc[leveloffset=+1]
 
-[id="osd-installing-operators-from-operatorhub_{context}"]
+[id="osd-installing-operators-from-software-catalog_{context}"]
 == Installing Operators from the software catalog
 
 {product-title} administrators can install Operators from a curated list
diff --git a/post_installation_configuration/configuring-multi-arch-compute-machines/multiarch-tuning-operator.adoc b/post_installation_configuration/configuring-multi-arch-compute-machines/multiarch-tuning-operator.adoc
index 03a7a1469896..9e36e549d2b5 100644
--- a/post_installation_configuration/configuring-multi-arch-compute-machines/multiarch-tuning-operator.adoc
+++ b/post_installation_configuration/configuring-multi-arch-compute-machines/multiarch-tuning-operator.adoc
@@ -46,7 +46,7 @@ include::modules/multi-arch-installing-using-cli.adoc[leveloffset=+1]
 [role="_additional-resources"]
 .Additional resources
 
-* xref:../../operators/user/olm-installing-operators-in-namespace.adoc#olm-installing-operator-from-operatorhub-using-cli_olm-installing-operators-in-namespace[Installing from the software catalog using the CLI]
+* xref:../../operators/user/olm-installing-operators-in-namespace.adoc#olm-installing-operator-from-software-catalog-using-cli_olm-installing-operators-in-namespace[Installing from the software catalog using the CLI]
 
 include::modules/multi-arch-installing-using-web-console.adoc[leveloffset=+1]
 
diff --git a/post_installation_configuration/preparing-for-users.adoc b/post_installation_configuration/preparing-for-users.adoc
index 632650dcdd35..14903a921f22 100644
--- a/post_installation_configuration/preparing-for-users.adoc
+++ b/post_installation_configuration/preparing-for-users.adoc
@@ -141,13 +141,13 @@ include::modules/olm-creating-catalog-from-index.adoc[leveloffset=+3]
 * xref:../operators/understanding/olm/olm-understanding-olm.adoc#olm-catalogsource-image-template_olm-understanding-olm[Image template for custom catalog sources]
 * xref:../openshift_images/managing_images/image-pull-policy.adoc#image-pull-policy[Image pull policy]
 
-include::modules/olm-installing-operators-from-operatorhub.adoc[leveloffset=+1]
+include::modules/olm-installing-operators-from-software-catalog.adoc[leveloffset=+1]
 ifdef::openshift-origin[]
-include::modules/olm-installing-operators-from-operatorhub-configure.adoc[leveloffset=+2]
+include::modules/olm-installing-operators-from-software-catalog-configure.adoc[leveloffset=+2]
 endif::[]
-include::modules/olm-installing-from-operatorhub-using-web-console.adoc[leveloffset=+2]
+include::modules/olm-installing-from-software-catalog-using-web-console.adoc[leveloffset=+2]
 ifdef::openshift-enterprise,openshift-webscale,openshift-origin[]
-include::modules/olm-installing-from-operatorhub-using-cli.adoc[leveloffset=+2]
+include::modules/olm-installing-from-software-catalog-using-cli.adoc[leveloffset=+2]
 
 [role="_additional-resources"]
 .Additional resources
diff --git a/rosa_architecture/index.adoc b/rosa_architecture/index.adoc
index 4151c6987d44..74c57a63cdaf 100644
--- a/rosa_architecture/index.adoc
+++ b/rosa_architecture/index.adoc
@@ -244,7 +244,7 @@ Manage machines, provide services to users, and follow monitoring and logging re
 - **xref:../networking/understanding-networking.adoc#understanding-networking[Manage networking]**: The cluster network in {product-title} is managed by the xref:../networking/networking_operators/cluster-network-operator.adoc#nw-cluster-network-operator_cluster-network-operator[Cluster Network Operator] (CNO). The Multus Container Network Interface adds the capability to attach xref:../networking/multiple_networks/understanding-multiple-networks.adoc#understanding-multiple-networks[multiple network interfaces] to a pod. By using
 xref:../networking/network_security/network_policy/about-network-policy.adoc#about-network-policy[network policy] features, you can isolate your pods or permit selected traffic.
 
-- **xref:../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Manage Operators]**: Lists of Red Hat, ISV, and community Operators can be reviewed by cluster administrators and xref:../operators/admin/olm-adding-operators-to-cluster.adoc#olm-adding-operators-to-a-cluster[installed on their clusters]. After you install them, you can xref:../operators/user/olm-creating-apps-from-installed-operators.adoc#olm-creating-apps-from-installed-operators[run], xref:../operators/admin/olm-upgrading-operators.adoc#olm-upgrading-operators[upgrade], back up, or otherwise manage the Operator on your cluster.
+- **xref:../operators/understanding/olm-understanding-software-catalog.adoc#olm-understanding-software-catalog[Manage Operators]**: Lists of Red Hat, ISV, and community Operators can be reviewed by cluster administrators and xref:../operators/admin/olm-adding-operators-to-cluster.adoc#olm-adding-operators-to-a-cluster[installed on their clusters]. After you install them, you can xref:../operators/user/olm-creating-apps-from-installed-operators.adoc#olm-creating-apps-from-installed-operators[run], xref:../operators/admin/olm-upgrading-operators.adoc#olm-upgrading-operators[upgrade], back up, or otherwise manage the Operator on your cluster.
 
 - **xref:../windows_containers/understanding-windows-container-workloads.adoc#understanding-windows-container-workloads_understanding-windows-container-workloads[Understanding Windows container workloads]**. You can use the {productwinc} feature to run Windows compute nodes in an {product-title} cluster. This is possible by using the Red Hat Windows Machine Config Operator (WMCO) to install and manage Windows nodes.
 
diff --git a/serverless/install/preparing-serverless-install.adoc b/serverless/install/preparing-serverless-install.adoc
index ca28eb86a509..8615c70c69ae 100644
--- a/serverless/install/preparing-serverless-install.adoc
+++ b/serverless/install/preparing-serverless-install.adoc
@@ -61,6 +61,6 @@ endif::[]
 == Additional resources
 ifdef::openshift-enterprise[]
 * xref:../../disconnected/using-olm.adoc#olm-restricted-networks[Using Operator Lifecycle Manager in disconnected environments]
-* xref:../../operators/understanding/olm-understanding-operatorhub.adoc#olm-operatorhub-overview[Understanding the software catalog]
+* xref:../../operators/understanding/olm-understanding-software-catalog.adoc#olm-software-catalog-overview[Understanding the software catalog]
 * xref:../../installing/overview/cluster-capabilities.adoc#cluster-capabilities[Cluster capabilities]
 endif::[]
diff --git a/web_console/capabilities_products-web-console.adoc b/web_console/capabilities_products-web-console.adoc
index b8dbab5c6544..4ffb22bce9ad 100644
--- a/web_console/capabilities_products-web-console.adoc
+++ b/web_console/capabilities_products-web-console.adoc
@@ -15,7 +15,7 @@ include::modules/optional-capabilities-operators.adoc[leveloffset=+1]
 
 [role="_additional-resources"]
 .Additional resources
-* xref:../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Understanding the software catalog]
+* xref:../operators/understanding/olm-understanding-software-catalog.adoc#olm-understanding-software-catalog[Understanding the software catalog]
 * xref:../web_console/web_terminal/installing-web-terminal.adoc#installing-web-terminal[Installing the web terminal]
 
 //OpenShift LightSpeed
diff --git a/welcome/learn_more_about_openshift.adoc b/welcome/learn_more_about_openshift.adoc
index 3a78dc865288..12d2883deea1 100644
--- a/welcome/learn_more_about_openshift.adoc
+++ b/welcome/learn_more_about_openshift.adoc
@@ -167,7 +167,7 @@ a|* xref:../networking/networking_operators/cluster-network-operator.adoc#nw-clu
 * xref:../networking/multiple_networks/understanding-multiple-networks.adoc#understanding-multiple-networks[Multiple network interfaces]
 * xref:../networking/network_security/network_policy/about-network-policy.adoc#about-network-policy[Network policy]
 
-| xref:../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Manage Operators]
+| xref:../operators/understanding/olm-understanding-software-catalog.adoc#olm-understanding-software-catalog[Manage Operators]
 | xref:../operators/user/olm-creating-apps-from-installed-operators.adoc#olm-creating-apps-from-installed-operators[Creating applications from installed Operators]
 
 |===
diff --git a/whats_new/new-features.adoc b/whats_new/new-features.adoc
index 8d36dbebe12c..ea005df54fc4 100644
--- a/whats_new/new-features.adoc
+++ b/whats_new/new-features.adoc
@@ -114,7 +114,7 @@ from Red Hat products, Red Hat partners, and the community.
 |===
 
 See
-xref:../operators/understanding/olm-understanding-operatorhub.adoc#olm-understanding-operatorhub[Understanding the software catalog] for more information.
+xref:../operators/understanding/olm-understanding-software-catalog.adoc#olm-understanding-software-catalog[Understanding the software catalog] for more information.
 
 [id="ocp-storage"]
 == Storage