From 929788fe8c356a494d061341b809003752ef47e8 Mon Sep 17 00:00:00 2001
From: Maximilian Kolb <kolb@atix.de>
Date: Thu, 9 Jul 2026 14:58:25 +0200
Subject: [PATCH] Use dashes in module names for platform servers

This patch reduces the number of variants how to say "Foreman server" or
"Smart Proxy server" in file names.
This helps contributors to navigate the source trees and GHA to identify
wrong file names.

$ fd projectserver
$ fd smartproxyserver
$ rg projectserver
$ rg smartproxyserver

There are no new broken links:
$ rg -i "configuring-the-active-directory-authentication-source-on-projectserver_"
$ rg -i "configuring-the-freeipa-authentication-source-on-projectserver_"
$ rg -i "determining-whether-your-projectserver-uses-internal-or-external-databases"
$ rg -i "snip_prerequisites-configuring-smartproxyservers-for-load-balancing.adoc"

Fixes #4998 (Unify file name to use dashes)
---
 guides/common/assembly_api-cheat-sheet.adoc          |  2 +-
 .../common/assembly_common-deployment-scenarios.adoc |  2 +-
 ...os-sso-for-active-directory-users-in-project.adoc |  2 +-
 ...iguring-kerberos-sso-with-freeipa-in-project.adoc |  4 ++--
 ...ycle-of-a-host-registered-to-a-freeipa-realm.adoc |  4 ++--
 ...certificates-for-load-balancing-with-puppet.adoc} |  2 +-
 ...tificates-for-load-balancing-without-puppet.adoc} |  2 +-
 ...certificates-for-load-balancing-with-puppet.adoc} |  2 +-
 ...tificates-for-load-balancing-without-puppet.adoc} |  2 +-
 ...ecovery-by-virtualizing-your-project-server.adoc} |  6 +++---
 guides/common/assembly_major-project-components.adoc |  2 +-
 ...rom-internal-databases-to-external-databases.adoc |  2 +-
 ...ring-smart-proxy-servers-for-load-balancing.adoc} |  2 +-
 ...embly_reducing-storage-use-on-project-server.adoc |  2 +-
 ...estoring-server-or-smart-proxy-from-a-backup.adoc |  2 +-
 .../assembly_tuning-with-predefined-profiles.adoc    |  2 +-
 ...certificates-for-load-balancing-with-puppet.adoc} |  0
 ...tificates-for-load-balancing-without-puppet.adoc} |  0
 ...certificates-for-load-balancing-with-puppet.adoc} |  0
 ...tificates-for-load-balancing-without-puppet.adoc} |  0
 ...ecovery-by-virtualizing-your-project-server.adoc} |  0
 ...ring-smart-proxy-servers-for-load-balancing.adoc} |  0
 ...verview.adoc => con_project-server-overview.adoc} |  0
 ... con_project-server-with-multiple-manifests.adoc} |  0
 ... con_reducing-storage-use-on-project-server.adoc} |  0
 ...server-performance-with-predefined-profiles.adoc} |  0
 ...ing-hammer-cli-to-accept-freeipa-credentials.adoc |  2 +-
 ...trol-for-freeipa-users-logging-in-to-project.adoc |  2 +-
 ...mart-proxy-server-for-freeipa-realm-support.adoc} |  0
 ...rtificates-for-load-balancing-without-puppet.adoc |  2 +-
 ...tes-to-generate-and-sign-puppet-certificates.adoc |  2 +-
 ...rtificates-for-load-balancing-without-puppet.adoc |  2 +-
 ...tes-to-generate-and-sign-puppet-certificates.adoc |  2 +-
 ...ory-authentication-source-on-project-server.adoc} |  2 +-
 ...ipa-authentication-source-on-project-server.adoc} |  2 +-
 ...-server-uses-internal-or-external-databases.adoc} |  2 +-
 ...lling-project-server-in-your-freeipa-domain.adoc} |  0
 ...ges-on-project-server-or-smart-proxy-server.adoc} |  0
 ...r-on-project-server-and-smart-proxy-servers.adoc} |  0
 ...ecovery-by-virtualizing-your-project-server.adoc} |  0
 ...y-restoring-a-vm-snapshot-of-project-server.adoc} |  0
 ...-server-by-using-a-virtual-machine-snapshot.adoc} |  0
 ...=> proc_uploading-content-to-project-server.adoc} |  0
 ...ring-smart-proxy-servers-for-load-balancing.adoc} |  0
 guides/doc-Administering_Project/master.adoc         |  2 +-
 guides/doc-Configuring_Load_Balancer/master.adoc     | 12 ++++++------
 .../doc-Managing_Configurations_Puppet/master.adoc   |  2 +-
 47 files changed, 37 insertions(+), 37 deletions(-)
 rename guides/common/{assembly_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc => assembly_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc} (87%)
 rename guides/common/{assembly_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc => assembly_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc} (75%)
 rename guides/common/{assembly_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc => assembly_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc} (80%)
 rename guides/common/{assembly_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc => assembly_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc} (52%)
 rename guides/common/{assembly_disaster-recovery-by-virtualizing-your-projectserver.adoc => assembly_disaster-recovery-by-virtualizing-your-project-server.adoc} (71%)
 rename guides/common/{assembly_preparing-smartproxyservers-for-load-balancing.adoc => assembly_preparing-smart-proxy-servers-for-load-balancing.adoc} (92%)
 rename guides/common/modules/{con_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc => con_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc} (100%)
 rename guides/common/modules/{con_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc => con_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc} (100%)
 rename guides/common/modules/{con_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc => con_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc} (100%)
 rename guides/common/modules/{con_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc => con_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc} (100%)
 rename guides/common/modules/{con_disaster-recovery-by-virtualizing-your-projectserver.adoc => con_disaster-recovery-by-virtualizing-your-project-server.adoc} (100%)
 rename guides/common/modules/{con_preparing-smartproxyservers-for-load-balancing.adoc => con_preparing-smart-proxy-servers-for-load-balancing.adoc} (100%)
 rename guides/common/modules/{con_projectserver-overview.adoc => con_project-server-overview.adoc} (100%)
 rename guides/common/modules/{con_projectserver-with-multiple-manifests.adoc => con_project-server-with-multiple-manifests.adoc} (100%)
 rename guides/common/modules/{con_reducing-storage-use-on-projectserver.adoc => con_reducing-storage-use-on-project-server.adoc} (100%)
 rename guides/common/modules/{con_tuning-projectserver-performance-with-predefined-profiles.adoc => con_tuning-project-server-performance-with-predefined-profiles.adoc} (100%)
 rename guides/common/modules/{proc_configuring-projectserver-or-smartproxyserver-for-freeipa-realm-support.adoc => proc_configuring-project-server-or-smart-proxy-server-for-freeipa-realm-support.adoc} (100%)
 rename guides/common/modules/{proc_configuring-the-active-directory-authentication-source-on-projectserver.adoc => proc_configuring-the-active-directory-authentication-source-on-project-server.adoc} (98%)
 rename guides/common/modules/{proc_configuring-the-freeipa-authentication-source-on-projectserver.adoc => proc_configuring-the-freeipa-authentication-source-on-project-server.adoc} (96%)
 rename guides/common/modules/{proc_determining-whether-your-projectserver-uses-internal-or-external-databases.adoc => proc_determining-whether-your-project-server-uses-internal-or-external-databases.adoc} (83%)
 rename guides/common/modules/{proc_enrolling-projectserver-in-your-freeipa-domain.adoc => proc_enrolling-project-server-in-your-freeipa-domain.adoc} (100%)
 rename guides/common/modules/{proc_installing-and-configuring-freeipa-packages-on-projectserver-or-smartproxyserver.adoc => proc_installing-and-configuring-freeipa-packages-on-project-server-or-smart-proxy-server.adoc} (100%)
 rename guides/common/modules/{proc_installing-openvox-server-on-projectserver-and-smartproxyservers.adoc => proc_installing-openvox-server-on-project-server-and-smart-proxy-servers.adoc} (100%)
 rename guides/common/modules/{proc_preparing-for-disaster-recovery-by-virtualizing-your-projectserver.adoc => proc_preparing-for-disaster-recovery-by-virtualizing-your-project-server.adoc} (100%)
 rename guides/common/modules/{proc_recovering-from-disaster-by-restoring-a-vm-snapshot-of-projectserver.adoc => proc_recovering-from-disaster-by-restoring-a-vm-snapshot-of-project-server.adoc} (100%)
 rename guides/common/modules/{proc_restoring-smartproxyserver-by-using-a-virtual-machine-snapshot.adoc => proc_restoring-smart-proxy-server-by-using-a-virtual-machine-snapshot.adoc} (100%)
 rename guides/common/modules/{proc_uploading-content-to-projectserver.adoc => proc_uploading-content-to-project-server.adoc} (100%)
 rename guides/common/modules/{snip_prerequisites-configuring-smartproxyservers-for-load-balancing.adoc => snip_prerequisites-configuring-smart-proxy-servers-for-load-balancing.adoc} (100%)

diff --git a/guides/common/assembly_api-cheat-sheet.adoc b/guides/common/assembly_api-cheat-sheet.adoc
index b6f778d34ac..f119244cbe4 100644
--- a/guides/common/assembly_api-cheat-sheet.adoc
+++ b/guides/common/assembly_api-cheat-sheet.adoc
@@ -29,7 +29,7 @@ include::modules/ref_updating-a-lifecycle-environment.adoc[leveloffset=+2]
 
 include::modules/ref_deleting-a-lifecycle-environment.adoc[leveloffset=+2]
 
-include::modules/proc_uploading-content-to-projectserver.adoc[leveloffset=+1]
+include::modules/proc_uploading-content-to-project-server.adoc[leveloffset=+1]
 
 include::modules/proc_uploading-content-larger-than-2-mb.adoc[leveloffset=+2]
 
diff --git a/guides/common/assembly_common-deployment-scenarios.adoc b/guides/common/assembly_common-deployment-scenarios.adoc
index e8d71941705..8674af068ac 100644
--- a/guides/common/assembly_common-deployment-scenarios.adoc
+++ b/guides/common/assembly_common-deployment-scenarios.adoc
@@ -7,7 +7,7 @@ include::modules/con_multiple-locations.adoc[leveloffset=+1]
 
 include::modules/con_content-view-scenarios.adoc[leveloffset=+1]
 
-include::modules/con_projectserver-with-multiple-manifests.adoc[leveloffset=+1]
+include::modules/con_project-server-with-multiple-manifests.adoc[leveloffset=+1]
 
 include::modules/con_host-group-structures.adoc[leveloffset=+1]
 
diff --git a/guides/common/assembly_configuring-kerberos-sso-for-active-directory-users-in-project.adoc b/guides/common/assembly_configuring-kerberos-sso-for-active-directory-users-in-project.adoc
index 0bae252ffd9..e0926eb8706 100644
--- a/guides/common/assembly_configuring-kerberos-sso-for-active-directory-users-in-project.adoc
+++ b/guides/common/assembly_configuring-kerberos-sso-for-active-directory-users-in-project.adoc
@@ -2,4 +2,4 @@ include::modules/con_configuring-kerberos-sso-for-active-directory-users-in-proj
 
 include::modules/proc_joining-the-project-server-system-to-an-ad-domain.adoc[leveloffset=+1]
 
-include::modules/proc_configuring-the-active-directory-authentication-source-on-projectserver.adoc[leveloffset=+1]
+include::modules/proc_configuring-the-active-directory-authentication-source-on-project-server.adoc[leveloffset=+1]
diff --git a/guides/common/assembly_configuring-kerberos-sso-with-freeipa-in-project.adoc b/guides/common/assembly_configuring-kerberos-sso-with-freeipa-in-project.adoc
index 8261b2165f0..2f394690e87 100644
--- a/guides/common/assembly_configuring-kerberos-sso-with-freeipa-in-project.adoc
+++ b/guides/common/assembly_configuring-kerberos-sso-with-freeipa-in-project.adoc
@@ -1,8 +1,8 @@
 include::modules/con_configuring-kerberos-sso-with-freeipa-in-project.adoc[]
 
-include::modules/proc_enrolling-projectserver-in-your-freeipa-domain.adoc[leveloffset=+1]
+include::modules/proc_enrolling-project-server-in-your-freeipa-domain.adoc[leveloffset=+1]
 
-include::modules/proc_configuring-the-freeipa-authentication-source-on-projectserver.adoc[leveloffset=+1]
+include::modules/proc_configuring-the-freeipa-authentication-source-on-project-server.adoc[leveloffset=+1]
 
 include::modules/proc_configuring-host-based-access-control-for-freeipa-users-logging-in-to-project.adoc[leveloffset=+1]
 
diff --git a/guides/common/assembly_configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm.adoc b/guides/common/assembly_configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm.adoc
index 91f22eef5a6..73c30eda2d1 100644
--- a/guides/common/assembly_configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm.adoc
+++ b/guides/common/assembly_configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm.adoc
@@ -1,8 +1,8 @@
 include::modules/con_configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm.adoc[]
 
-include::modules/proc_installing-and-configuring-freeipa-packages-on-projectserver-or-smartproxyserver.adoc[leveloffset=+1]
+include::modules/proc_installing-and-configuring-freeipa-packages-on-project-server-or-smart-proxy-server.adoc[leveloffset=+1]
 
-include::modules/proc_configuring-projectserver-or-smartproxyserver-for-freeipa-realm-support.adoc[leveloffset=+1]
+include::modules/proc_configuring-project-server-or-smart-proxy-server-for-freeipa-realm-support.adoc[leveloffset=+1]
 
 include::modules/proc_creating-a-realm-for-the-freeipa-enabled-smartproxy.adoc[leveloffset=+1]
 
diff --git a/guides/common/assembly_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc b/guides/common/assembly_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc
similarity index 87%
rename from guides/common/assembly_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc
rename to guides/common/assembly_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc
index 5fb833558ca..88b93b68d40 100644
--- a/guides/common/assembly_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc
+++ b/guides/common/assembly_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc
@@ -1,4 +1,4 @@
-include::modules/con_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc[]
+include::modules/con_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc[]
 
 :ProductName: {SmartProxyServer}
 :ssl-common-name: {smartproxy-example-com}
diff --git a/guides/common/assembly_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc b/guides/common/assembly_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc
similarity index 75%
rename from guides/common/assembly_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc
rename to guides/common/assembly_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc
index d85afd3fdbb..2827a3bbdf2 100644
--- a/guides/common/assembly_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc
+++ b/guides/common/assembly_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc
@@ -1,4 +1,4 @@
-include::modules/con_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc[]
+include::modules/con_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc[]
 
 :ProductName: {SmartProxyServer}
 :ssl-common-name: {smartproxy-example-com}
diff --git a/guides/common/assembly_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc b/guides/common/assembly_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc
similarity index 80%
rename from guides/common/assembly_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc
rename to guides/common/assembly_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc
index 2a225327b3b..2b0e8acf4ab 100644
--- a/guides/common/assembly_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc
+++ b/guides/common/assembly_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc
@@ -1,4 +1,4 @@
-include::modules/con_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc[]
+include::modules/con_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc[]
 
 include::modules/proc_configuring-smart-proxy-server-with-default-ssl-certificates-to-generate-and-sign-puppet-certificates.adoc[leveloffset=+1]
 
diff --git a/guides/common/assembly_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc b/guides/common/assembly_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc
similarity index 52%
rename from guides/common/assembly_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc
rename to guides/common/assembly_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc
index b18e3b0d138..a9b02c2c93a 100644
--- a/guides/common/assembly_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc
+++ b/guides/common/assembly_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc
@@ -1,3 +1,3 @@
-include::modules/con_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc[]
+include::modules/con_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc[]
 
 include::modules/proc_configuring-smart-proxy-server-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc[leveloffset=+1]
diff --git a/guides/common/assembly_disaster-recovery-by-virtualizing-your-projectserver.adoc b/guides/common/assembly_disaster-recovery-by-virtualizing-your-project-server.adoc
similarity index 71%
rename from guides/common/assembly_disaster-recovery-by-virtualizing-your-projectserver.adoc
rename to guides/common/assembly_disaster-recovery-by-virtualizing-your-project-server.adoc
index f788be6af51..0df4fc21b1d 100644
--- a/guides/common/assembly_disaster-recovery-by-virtualizing-your-projectserver.adoc
+++ b/guides/common/assembly_disaster-recovery-by-virtualizing-your-project-server.adoc
@@ -1,7 +1,7 @@
-include::modules/con_disaster-recovery-by-virtualizing-your-projectserver.adoc[]
+include::modules/con_disaster-recovery-by-virtualizing-your-project-server.adoc[]
 
-include::modules/proc_preparing-for-disaster-recovery-by-virtualizing-your-projectserver.adoc[leveloffset=+1]
+include::modules/proc_preparing-for-disaster-recovery-by-virtualizing-your-project-server.adoc[leveloffset=+1]
 
-include::modules/proc_recovering-from-disaster-by-restoring-a-vm-snapshot-of-projectserver.adoc[leveloffset=+1]
+include::modules/proc_recovering-from-disaster-by-restoring-a-vm-snapshot-of-project-server.adoc[leveloffset=+1]
 
 include::modules/proc_retrieving-status-of-services-by-using-cli.adoc[leveloffset=+1]
diff --git a/guides/common/assembly_major-project-components.adoc b/guides/common/assembly_major-project-components.adoc
index 38a45cdfdb3..9cad2548be4 100644
--- a/guides/common/assembly_major-project-components.adoc
+++ b/guides/common/assembly_major-project-components.adoc
@@ -1,6 +1,6 @@
 include::modules/con_major-project-components.adoc[]
 
-include::modules/con_projectserver-overview.adoc[leveloffset=+1]
+include::modules/con_project-server-overview.adoc[leveloffset=+1]
 
 include::modules/con_smartproxy-overview.adoc[leveloffset=+1]
 
diff --git a/guides/common/assembly_migrating-from-internal-databases-to-external-databases.adoc b/guides/common/assembly_migrating-from-internal-databases-to-external-databases.adoc
index 4b7f50b2cdd..e3d385cee6d 100644
--- a/guides/common/assembly_migrating-from-internal-databases-to-external-databases.adoc
+++ b/guides/common/assembly_migrating-from-internal-databases-to-external-databases.adoc
@@ -2,7 +2,7 @@ ifdef::context[:parent-context: {context}]
 
 include::modules/con_migrating-from-internal-databases-to-external-databases.adoc[]
 
-include::modules/proc_determining-whether-your-projectserver-uses-internal-or-external-databases.adoc[leveloffset=+1]
+include::modules/proc_determining-whether-your-project-server-uses-internal-or-external-databases.adoc[leveloffset=+1]
 
 include::modules/ref_postgresql-as-an-external-database-considerations.adoc[leveloffset=+1]
 
diff --git a/guides/common/assembly_preparing-smartproxyservers-for-load-balancing.adoc b/guides/common/assembly_preparing-smart-proxy-servers-for-load-balancing.adoc
similarity index 92%
rename from guides/common/assembly_preparing-smartproxyservers-for-load-balancing.adoc
rename to guides/common/assembly_preparing-smart-proxy-servers-for-load-balancing.adoc
index 39fe8068848..d7f093dff8d 100644
--- a/guides/common/assembly_preparing-smartproxyservers-for-load-balancing.adoc
+++ b/guides/common/assembly_preparing-smart-proxy-servers-for-load-balancing.adoc
@@ -1,4 +1,4 @@
-include::modules/con_preparing-smartproxyservers-for-load-balancing.adoc[]
+include::modules/con_preparing-smart-proxy-servers-for-load-balancing.adoc[]
 
 ifdef::satellite,katello[]
 // Registering {SmartProxyServer} to {ProjectServer}
diff --git a/guides/common/assembly_reducing-storage-use-on-project-server.adoc b/guides/common/assembly_reducing-storage-use-on-project-server.adoc
index c303f0cbb5e..a0796425e92 100644
--- a/guides/common/assembly_reducing-storage-use-on-project-server.adoc
+++ b/guides/common/assembly_reducing-storage-use-on-project-server.adoc
@@ -1,4 +1,4 @@
-include::modules/con_reducing-storage-use-on-projectserver.adoc[]
+include::modules/con_reducing-storage-use-on-project-server.adoc[]
 
 include::modules/con_cleaning-audit-records.adoc[leveloffset=+1]
 
diff --git a/guides/common/assembly_restoring-server-or-smart-proxy-from-a-backup.adoc b/guides/common/assembly_restoring-server-or-smart-proxy-from-a-backup.adoc
index a258b976172..eacf40b161e 100644
--- a/guides/common/assembly_restoring-server-or-smart-proxy-from-a-backup.adoc
+++ b/guides/common/assembly_restoring-server-or-smart-proxy-from-a-backup.adoc
@@ -4,4 +4,4 @@ include::modules/proc_restoring-from-a-full-backup.adoc[leveloffset=+1]
 
 include::modules/proc_restoring-from-incremental-backups.adoc[leveloffset=+1]
 
-include::modules/proc_restoring-smartproxyserver-by-using-a-virtual-machine-snapshot.adoc[leveloffset=+1]
+include::modules/proc_restoring-smart-proxy-server-by-using-a-virtual-machine-snapshot.adoc[leveloffset=+1]
diff --git a/guides/common/assembly_tuning-with-predefined-profiles.adoc b/guides/common/assembly_tuning-with-predefined-profiles.adoc
index 466565dbafd..fb738bf1803 100644
--- a/guides/common/assembly_tuning-with-predefined-profiles.adoc
+++ b/guides/common/assembly_tuning-with-predefined-profiles.adoc
@@ -1,4 +1,4 @@
-include::modules/con_tuning-projectserver-performance-with-predefined-profiles.adoc[]
+include::modules/con_tuning-project-server-performance-with-predefined-profiles.adoc[]
 
 include::modules/con_how-predefined-tuning-profiles-apply.adoc[leveloffset=+1]
 
diff --git a/guides/common/modules/con_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc b/guides/common/modules/con_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc
similarity index 100%
rename from guides/common/modules/con_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc
rename to guides/common/modules/con_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc
diff --git a/guides/common/modules/con_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc b/guides/common/modules/con_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc
similarity index 100%
rename from guides/common/modules/con_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc
rename to guides/common/modules/con_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc
diff --git a/guides/common/modules/con_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc b/guides/common/modules/con_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc
similarity index 100%
rename from guides/common/modules/con_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc
rename to guides/common/modules/con_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc
diff --git a/guides/common/modules/con_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc b/guides/common/modules/con_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc
similarity index 100%
rename from guides/common/modules/con_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc
rename to guides/common/modules/con_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc
diff --git a/guides/common/modules/con_disaster-recovery-by-virtualizing-your-projectserver.adoc b/guides/common/modules/con_disaster-recovery-by-virtualizing-your-project-server.adoc
similarity index 100%
rename from guides/common/modules/con_disaster-recovery-by-virtualizing-your-projectserver.adoc
rename to guides/common/modules/con_disaster-recovery-by-virtualizing-your-project-server.adoc
diff --git a/guides/common/modules/con_preparing-smartproxyservers-for-load-balancing.adoc b/guides/common/modules/con_preparing-smart-proxy-servers-for-load-balancing.adoc
similarity index 100%
rename from guides/common/modules/con_preparing-smartproxyservers-for-load-balancing.adoc
rename to guides/common/modules/con_preparing-smart-proxy-servers-for-load-balancing.adoc
diff --git a/guides/common/modules/con_projectserver-overview.adoc b/guides/common/modules/con_project-server-overview.adoc
similarity index 100%
rename from guides/common/modules/con_projectserver-overview.adoc
rename to guides/common/modules/con_project-server-overview.adoc
diff --git a/guides/common/modules/con_projectserver-with-multiple-manifests.adoc b/guides/common/modules/con_project-server-with-multiple-manifests.adoc
similarity index 100%
rename from guides/common/modules/con_projectserver-with-multiple-manifests.adoc
rename to guides/common/modules/con_project-server-with-multiple-manifests.adoc
diff --git a/guides/common/modules/con_reducing-storage-use-on-projectserver.adoc b/guides/common/modules/con_reducing-storage-use-on-project-server.adoc
similarity index 100%
rename from guides/common/modules/con_reducing-storage-use-on-projectserver.adoc
rename to guides/common/modules/con_reducing-storage-use-on-project-server.adoc
diff --git a/guides/common/modules/con_tuning-projectserver-performance-with-predefined-profiles.adoc b/guides/common/modules/con_tuning-project-server-performance-with-predefined-profiles.adoc
similarity index 100%
rename from guides/common/modules/con_tuning-projectserver-performance-with-predefined-profiles.adoc
rename to guides/common/modules/con_tuning-project-server-performance-with-predefined-profiles.adoc
diff --git a/guides/common/modules/proc_configuring-hammer-cli-to-accept-freeipa-credentials.adoc b/guides/common/modules/proc_configuring-hammer-cli-to-accept-freeipa-credentials.adoc
index 358db5ddbf3..c48079ccdaa 100644
--- a/guides/common/modules/proc_configuring-hammer-cli-to-accept-freeipa-credentials.adoc
+++ b/guides/common/modules/proc_configuring-hammer-cli-to-accept-freeipa-credentials.adoc
@@ -19,7 +19,7 @@ endif::[]
 
 .Prerequisites
 * You have enabled {FreeIPA} access to the {Project} API.
-For more information, see xref:configuring-the-freeipa-authentication-source-on-projectserver_{context}[].
+For more information, see xref:configuring-the-freeipa-authentication-source-on-{project-context}-server[].
 
 .Procedure
 * Open the `~/.hammer/cli.modules.d/foreman.yml` file on your {ProjectServer} and update the list of `foreman` parameters:
diff --git a/guides/common/modules/proc_configuring-host-based-access-control-for-freeipa-users-logging-in-to-project.adoc b/guides/common/modules/proc_configuring-host-based-access-control-for-freeipa-users-logging-in-to-project.adoc
index 19f03284d94..f11f229b88a 100644
--- a/guides/common/modules/proc_configuring-host-based-access-control-for-freeipa-users-logging-in-to-project.adoc
+++ b/guides/common/modules/proc_configuring-host-based-access-control-for-freeipa-users-logging-in-to-project.adoc
@@ -14,7 +14,7 @@ By configuring a HBAC rule in the {FreeIPA} domain, you can ensure {Project} doe
 * {FreeIPA} user account with privileges to configure HBAC rules
 ifdef::containerized[]
 * You have enabled {FreeIPA} as external authentication source on your {ProjectServer}.
-For more information, see xref:configuring-the-freeipa-authentication-source-on-projectserver_{context}[].
+For more information, see xref:configuring-the-freeipa-authentication-source-on-{project-context}-server[].
 endif::[]
 
 .Procedure
diff --git a/guides/common/modules/proc_configuring-projectserver-or-smartproxyserver-for-freeipa-realm-support.adoc b/guides/common/modules/proc_configuring-project-server-or-smart-proxy-server-for-freeipa-realm-support.adoc
similarity index 100%
rename from guides/common/modules/proc_configuring-projectserver-or-smartproxyserver-for-freeipa-realm-support.adoc
rename to guides/common/modules/proc_configuring-project-server-or-smart-proxy-server-for-freeipa-realm-support.adoc
diff --git a/guides/common/modules/proc_configuring-smart-proxy-server-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc b/guides/common/modules/proc_configuring-smart-proxy-server-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc
index 824d317de61..7f0043032a3 100644
--- a/guides/common/modules/proc_configuring-smart-proxy-server-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc
+++ b/guides/common/modules/proc_configuring-smart-proxy-server-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc
@@ -7,7 +7,7 @@
 On each {SmartProxyServer} you want to configure for load balancing, install Katello certificates.
 
 .Prerequisites
-include::snip_prerequisites-configuring-smartproxyservers-for-load-balancing.adoc[]
+include::snip_prerequisites-configuring-smart-proxy-servers-for-load-balancing.adoc[]
 
 .Procedure
 . On {ProjectServer}, enter the `{certs-generate}` command to generate {SmartProxy} certificates:
diff --git a/guides/common/modules/proc_configuring-smart-proxy-server-with-custom-ssl-certificates-to-generate-and-sign-puppet-certificates.adoc b/guides/common/modules/proc_configuring-smart-proxy-server-with-custom-ssl-certificates-to-generate-and-sign-puppet-certificates.adoc
index 1896dadb369..b1b7bdaf1be 100644
--- a/guides/common/modules/proc_configuring-smart-proxy-server-with-custom-ssl-certificates-to-generate-and-sign-puppet-certificates.adoc
+++ b/guides/common/modules/proc_configuring-smart-proxy-server-with-custom-ssl-certificates-to-generate-and-sign-puppet-certificates.adoc
@@ -7,7 +7,7 @@
 On the {SmartProxyServer} that will generate Puppet certificates for all other load-balancing {SmartProxyServers}, configure Puppet certificate generation and signing.
 
 .Prerequisites
-include::snip_prerequisites-configuring-smartproxyservers-for-load-balancing.adoc[]
+include::snip_prerequisites-configuring-smart-proxy-servers-for-load-balancing.adoc[]
 
 .Procedure
 . On {ProjectServer}, enter the `{certs-generate}` command to generate {SmartProxy} certificates:
diff --git a/guides/common/modules/proc_configuring-smart-proxy-server-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc b/guides/common/modules/proc_configuring-smart-proxy-server-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc
index cb33b633ca8..5f6c52413fa 100644
--- a/guides/common/modules/proc_configuring-smart-proxy-server-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc
+++ b/guides/common/modules/proc_configuring-smart-proxy-server-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc
@@ -7,7 +7,7 @@
 On each {SmartProxyServer} that you want to configure for load balancing, install Katello certificates.
 
 .Prerequisites
-include::snip_prerequisites-configuring-smartproxyservers-for-load-balancing.adoc[]
+include::snip_prerequisites-configuring-smart-proxy-servers-for-load-balancing.adoc[]
 
 .Procedure
 . On {ProjectServer}, generate Katello certificates for {SmartProxyServer}:
diff --git a/guides/common/modules/proc_configuring-smart-proxy-server-with-default-ssl-certificates-to-generate-and-sign-puppet-certificates.adoc b/guides/common/modules/proc_configuring-smart-proxy-server-with-default-ssl-certificates-to-generate-and-sign-puppet-certificates.adoc
index e2344a3eec5..a5abd7c42fa 100644
--- a/guides/common/modules/proc_configuring-smart-proxy-server-with-default-ssl-certificates-to-generate-and-sign-puppet-certificates.adoc
+++ b/guides/common/modules/proc_configuring-smart-proxy-server-with-default-ssl-certificates-to-generate-and-sign-puppet-certificates.adoc
@@ -7,7 +7,7 @@
 On the {SmartProxyServer} that will generate Puppet certificates for all other load-balancing {SmartProxyServers}, configure Puppet certificate generation and signing.
 
 .Prerequisites
-include::snip_prerequisites-configuring-smartproxyservers-for-load-balancing.adoc[]
+include::snip_prerequisites-configuring-smart-proxy-servers-for-load-balancing.adoc[]
 
 .Procedure
 . On {ProjectServer}, generate Katello certificates for the system where you configure {SmartProxyServer} to generate and sign Puppet certificates:
diff --git a/guides/common/modules/proc_configuring-the-active-directory-authentication-source-on-projectserver.adoc b/guides/common/modules/proc_configuring-the-active-directory-authentication-source-on-project-server.adoc
similarity index 98%
rename from guides/common/modules/proc_configuring-the-active-directory-authentication-source-on-projectserver.adoc
rename to guides/common/modules/proc_configuring-the-active-directory-authentication-source-on-project-server.adoc
index 838a011be7d..a576af99a03 100644
--- a/guides/common/modules/proc_configuring-the-active-directory-authentication-source-on-projectserver.adoc
+++ b/guides/common/modules/proc_configuring-the-active-directory-authentication-source-on-project-server.adoc
@@ -1,6 +1,6 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="configuring-the-active-directory-authentication-source-on-projectserver_{context}"]
+[id="configuring-the-active-directory-authentication-source-on-{project-context}-server"]
 = Configuring the Active Directory authentication source on {ProjectServer}
 
 [role="_abstract"]
diff --git a/guides/common/modules/proc_configuring-the-freeipa-authentication-source-on-projectserver.adoc b/guides/common/modules/proc_configuring-the-freeipa-authentication-source-on-project-server.adoc
similarity index 96%
rename from guides/common/modules/proc_configuring-the-freeipa-authentication-source-on-projectserver.adoc
rename to guides/common/modules/proc_configuring-the-freeipa-authentication-source-on-project-server.adoc
index c578021d563..8d2de960b2b 100644
--- a/guides/common/modules/proc_configuring-the-freeipa-authentication-source-on-projectserver.adoc
+++ b/guides/common/modules/proc_configuring-the-freeipa-authentication-source-on-project-server.adoc
@@ -1,6 +1,6 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="configuring-the-freeipa-authentication-source-on-projectserver_{context}"]
+[id="configuring-the-freeipa-authentication-source-on-{project-context}-server"]
 = Configuring the {FreeIPA} authentication source on {ProjectServer}
 
 [role="_abstract"]
diff --git a/guides/common/modules/proc_determining-whether-your-projectserver-uses-internal-or-external-databases.adoc b/guides/common/modules/proc_determining-whether-your-project-server-uses-internal-or-external-databases.adoc
similarity index 83%
rename from guides/common/modules/proc_determining-whether-your-projectserver-uses-internal-or-external-databases.adoc
rename to guides/common/modules/proc_determining-whether-your-project-server-uses-internal-or-external-databases.adoc
index 2c61859a2fe..c566a766e75 100644
--- a/guides/common/modules/proc_determining-whether-your-projectserver-uses-internal-or-external-databases.adoc
+++ b/guides/common/modules/proc_determining-whether-your-project-server-uses-internal-or-external-databases.adoc
@@ -1,6 +1,6 @@
 :_mod-docs-content-type: PROCEDURE
 
-[id="determining-whether-your-projectserver-uses-internal-or-external-databases"]
+[id="determining-whether-your-{project-context}-server-uses-internal-or-external-databases"]
 = Determining whether your {ProjectServer} uses internal or external databases
 
 [role="_abstract"]
diff --git a/guides/common/modules/proc_enrolling-projectserver-in-your-freeipa-domain.adoc b/guides/common/modules/proc_enrolling-project-server-in-your-freeipa-domain.adoc
similarity index 100%
rename from guides/common/modules/proc_enrolling-projectserver-in-your-freeipa-domain.adoc
rename to guides/common/modules/proc_enrolling-project-server-in-your-freeipa-domain.adoc
diff --git a/guides/common/modules/proc_installing-and-configuring-freeipa-packages-on-projectserver-or-smartproxyserver.adoc b/guides/common/modules/proc_installing-and-configuring-freeipa-packages-on-project-server-or-smart-proxy-server.adoc
similarity index 100%
rename from guides/common/modules/proc_installing-and-configuring-freeipa-packages-on-projectserver-or-smartproxyserver.adoc
rename to guides/common/modules/proc_installing-and-configuring-freeipa-packages-on-project-server-or-smart-proxy-server.adoc
diff --git a/guides/common/modules/proc_installing-openvox-server-on-projectserver-and-smartproxyservers.adoc b/guides/common/modules/proc_installing-openvox-server-on-project-server-and-smart-proxy-servers.adoc
similarity index 100%
rename from guides/common/modules/proc_installing-openvox-server-on-projectserver-and-smartproxyservers.adoc
rename to guides/common/modules/proc_installing-openvox-server-on-project-server-and-smart-proxy-servers.adoc
diff --git a/guides/common/modules/proc_preparing-for-disaster-recovery-by-virtualizing-your-projectserver.adoc b/guides/common/modules/proc_preparing-for-disaster-recovery-by-virtualizing-your-project-server.adoc
similarity index 100%
rename from guides/common/modules/proc_preparing-for-disaster-recovery-by-virtualizing-your-projectserver.adoc
rename to guides/common/modules/proc_preparing-for-disaster-recovery-by-virtualizing-your-project-server.adoc
diff --git a/guides/common/modules/proc_recovering-from-disaster-by-restoring-a-vm-snapshot-of-projectserver.adoc b/guides/common/modules/proc_recovering-from-disaster-by-restoring-a-vm-snapshot-of-project-server.adoc
similarity index 100%
rename from guides/common/modules/proc_recovering-from-disaster-by-restoring-a-vm-snapshot-of-projectserver.adoc
rename to guides/common/modules/proc_recovering-from-disaster-by-restoring-a-vm-snapshot-of-project-server.adoc
diff --git a/guides/common/modules/proc_restoring-smartproxyserver-by-using-a-virtual-machine-snapshot.adoc b/guides/common/modules/proc_restoring-smart-proxy-server-by-using-a-virtual-machine-snapshot.adoc
similarity index 100%
rename from guides/common/modules/proc_restoring-smartproxyserver-by-using-a-virtual-machine-snapshot.adoc
rename to guides/common/modules/proc_restoring-smart-proxy-server-by-using-a-virtual-machine-snapshot.adoc
diff --git a/guides/common/modules/proc_uploading-content-to-projectserver.adoc b/guides/common/modules/proc_uploading-content-to-project-server.adoc
similarity index 100%
rename from guides/common/modules/proc_uploading-content-to-projectserver.adoc
rename to guides/common/modules/proc_uploading-content-to-project-server.adoc
diff --git a/guides/common/modules/snip_prerequisites-configuring-smartproxyservers-for-load-balancing.adoc b/guides/common/modules/snip_prerequisites-configuring-smart-proxy-servers-for-load-balancing.adoc
similarity index 100%
rename from guides/common/modules/snip_prerequisites-configuring-smartproxyservers-for-load-balancing.adoc
rename to guides/common/modules/snip_prerequisites-configuring-smart-proxy-servers-for-load-balancing.adoc
diff --git a/guides/doc-Administering_Project/master.adoc b/guides/doc-Administering_Project/master.adoc
index 8ea22cc8405..85052dd19e3 100644
--- a/guides/doc-Administering_Project/master.adoc
+++ b/guides/doc-Administering_Project/master.adoc
@@ -33,7 +33,7 @@ include::common/assembly_preparing-for-disaster-recovery-and-recovering-from-dat
 
 :parent-context: {context}
 :context: dr-virt
-include::common/assembly_disaster-recovery-by-virtualizing-your-projectserver.adoc[leveloffset=+2]
+include::common/assembly_disaster-recovery-by-virtualizing-your-project-server.adoc[leveloffset=+2]
 :context: {parent-context}
 :!parent-context:
 
diff --git a/guides/doc-Configuring_Load_Balancer/master.adoc b/guides/doc-Configuring_Load_Balancer/master.adoc
index 9292398ea2b..5815a60103b 100644
--- a/guides/doc-Configuring_Load_Balancer/master.adoc
+++ b/guides/doc-Configuring_Load_Balancer/master.adoc
@@ -33,19 +33,19 @@ endif::[]
 include::common/assembly_overview-of-load-balancing-in-project.adoc[leveloffset=+1]
 
 ifdef::orcharhino[]
-include::common/modules/con_preparing-smartproxyservers-for-load-balancing.adoc[leveloffset=+1]
+include::common/modules/con_preparing-smart-proxy-servers-for-load-balancing.adoc[leveloffset=+1]
 endif::[]
 ifndef::orcharhino[]
-include::common/assembly_preparing-smartproxyservers-for-load-balancing.adoc[leveloffset=+1]
+include::common/assembly_preparing-smart-proxy-servers-for-load-balancing.adoc[leveloffset=+1]
 endif::[]
 
-include::common/assembly_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc[leveloffset=+1]
+include::common/assembly_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-without-puppet.adoc[leveloffset=+1]
 
-include::common/assembly_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc[leveloffset=+1]
+include::common/assembly_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-without-puppet.adoc[leveloffset=+1]
 
-include::common/assembly_configuring-smartproxyservers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc[leveloffset=+1]
+include::common/assembly_configuring-smart-proxy-servers-with-default-ssl-certificates-for-load-balancing-with-puppet.adoc[leveloffset=+1]
 
-include::common/assembly_configuring-smartproxyservers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc[leveloffset=+1]
+include::common/assembly_configuring-smart-proxy-servers-with-custom-ssl-certificates-for-load-balancing-with-puppet.adoc[leveloffset=+1]
 
 include::common/assembly_installing-the-load-balancer.adoc[leveloffset=+1]
 
diff --git a/guides/doc-Managing_Configurations_Puppet/master.adoc b/guides/doc-Managing_Configurations_Puppet/master.adoc
index 8f05272e54d..458c380a6d7 100644
--- a/guides/doc-Managing_Configurations_Puppet/master.adoc
+++ b/guides/doc-Managing_Configurations_Puppet/master.adoc
@@ -27,7 +27,7 @@ include::common/modules/ref_openvox-versions-supported-for-integration-with-proj
 
 include::common/modules/con_enabling-puppet-integration-with-project.adoc[leveloffset=+1]
 
-include::common/modules/proc_installing-openvox-server-on-projectserver-and-smartproxyservers.adoc[leveloffset=+2]
+include::common/modules/proc_installing-openvox-server-on-project-server-and-smart-proxy-servers.adoc[leveloffset=+2]
 
 include::common/modules/proc_configuring-openvox-agent-on-a-host-during-provisioning.adoc[leveloffset=+2]