diff --git a/modules/installation-and-upgrade/pages/connect-payg.adoc b/modules/installation-and-upgrade/pages/connect-payg.adoc
index 0bd955b35ed..192fc2ada23 100644
--- a/modules/installation-and-upgrade/pages/connect-payg.adoc
+++ b/modules/installation-and-upgrade/pages/connect-payg.adoc
@@ -17,9 +17,12 @@ Before using the {payg} feature ensure:
 
 * {productname} Server has connectivity to the {payg} instance (ideally in the same region) either directly or via a bastion
 
-* A basic {scclongform} account is required. Enter your valid {scclongform} credentials in menu:Admin[Setup Wizard > Organization Credentials]. This account is required for accessing the {productname} client tools for boostrapping regardless of {payg} instances.
+* A basic {scclongform} account is required. Enter your valid {scclongform} credentials in menu:Admin[Setup Wizard > Organization Credentials]. 
+  This account is required for accessing the {productname} client tools for boostrapping regardless of {payg} instances.
 
-* If you bootstrap the {payg} instance to SUSE Manager, SUSE Manager will disable its {payg} repositories then add repositories from where it mirrored the data from the RMT server. The final result will be {payg} instances acquiring the same repositories from the RMT servers but through the SUSE Manager server itself. Of course repositories can still be setup primarily from {scc}.
+* If you bootstrap the {payg} instance to {productname}, {productname} will disable its {payg} repositories then add repositories from where it mirrored the data from the RMT server. 
+  The final result will be {payg} instances acquiring the same repositories from the RMT servers but through the {productname} server itself. 
+  Of course repositories can still be setup primarily from {scc}.
 
 
 
diff --git a/modules/installation-and-upgrade/pages/container-deployment/suma/server-deployment-vmdk-suma.adoc b/modules/installation-and-upgrade/pages/container-deployment/suma/server-deployment-vmdk-suma.adoc
index d723deb7070..8fcfa334af6 100644
--- a/modules/installation-and-upgrade/pages/container-deployment/suma/server-deployment-vmdk-suma.adoc
+++ b/modules/installation-and-upgrade/pages/container-deployment/suma/server-deployment-vmdk-suma.adoc
@@ -83,7 +83,7 @@ This sections describes VMware configurations, focusing on the creation of an ex
 [[minimal.susemgr.prep]]
 == Register {sl-micro} and {productname} {productnumber} Server
 
-Before starting obtain your SUSE Manager Registration Code from {scclongform} - https://scc.suse.com.
+Before starting obtain your {productname} Registration Code from {scclongform} - https://scc.suse.com.
 
 [NOTE]
 ====
@@ -93,7 +93,7 @@ The {sl-micro} {microversion} entitlement is included within the {productname} e
 .Procedure: Registering {sl-micro} and {productname} {productnumber}
 . Boot the virtual machine.
 . Log in as `root`.
-. Register {sl-micro} with SCC.
+. Register {sl-micro} with {scc}.
 +
 
 ----
diff --git a/modules/installation-and-upgrade/pages/install-proxy.adoc b/modules/installation-and-upgrade/pages/install-proxy.adoc
index 7fd31b54de2..a406417e03a 100644
--- a/modules/installation-and-upgrade/pages/install-proxy.adoc
+++ b/modules/installation-and-upgrade/pages/install-proxy.adoc
@@ -73,7 +73,7 @@ link:{sles-base-os-documentation}/article-installation.html[].
 
 
 [[installation-proxy-sles]]
-== Change SLES for SUSE Manager Proxy
+== Change SLES for {productname} Proxy
 
 
 [[proc-installation-proxy-sles]]
diff --git a/modules/installation-and-upgrade/pages/proxy-registration.adoc b/modules/installation-and-upgrade/pages/proxy-registration.adoc
index 9bc7ecb810a..e3a3e5a4649 100644
--- a/modules/installation-and-upgrade/pages/proxy-registration.adoc
+++ b/modules/installation-and-upgrade/pages/proxy-registration.adoc
@@ -1,5 +1,5 @@
 [[proxy-register]]
-= SUSE Manager Proxy Registration
+= {productname} Proxy Registration
 
 // needs to be updated for container use
 
@@ -35,7 +35,7 @@ The [systemitem]``SLE-Product-SUSE-Manager-Proxy-4.3-Updates`` channel is mandat
 . To bootstrap a proxy, use the bootstrap script.
     For more information about bootstrap scripts, see xref:client-configuration:registration-bootstrap.adoc[].
 +
-. Alternatively, in the SUSE Manager Web UI, navigate to menu:System[Bootstrapping].
+. Alternatively, in the {productname} {webui}, navigate to menu:System[Bootstrapping].
 +
 . Navigate to menu:System Details[Software > Software Channels], and check that the four proxy channels ([systemitem]``Pool`` and [systemitem]``Updates`` for [systemitem]``SLE-PRODUCT`` and [systemitem]``SLE-MODULE``) plus the recommended channels are selected.
     [systemitem]``SLE-PRODUCT-Pool`` must be the base channel and the others are child channels.