diff --git a/maps/backend_hostheader.map b/maps/backend_hostheader.map
index 455948fb..53cf9977 100644
--- a/maps/backend_hostheader.map
+++ b/maps/backend_hostheader.map
@@ -27,9 +27,9 @@ aws_home_index buaws-websites-homepage-prod.s3-website-us-east-1.amazonaws.com ;
 static-public static-sites-prod-public.s3-website-us-east-1.amazonaws.com ;
 static-public-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com ;
 
-static-custom-domain-madlab static-sites-prod-public.s3-website-us-east-1.amazonaws.com ;
-static-custom-domain-sitesbuedu-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com ;
-static-custom-domain-framinghamheartstudy-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com ;
+static-domain-madlab static-sites-prod-public.s3-website-us-east-1.amazonaws.com ;
+static-domain-sitesbuedu static-sites-prod-public.s3-website-us-east-1.amazonaws.com ;
+static-domain static-sites-prod-public.s3-website-us-east-1.amazonaws.com ;
 
 people-public static-sites-prod-public.s3-website-us-east-1.amazonaws.com ;
 people-public-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com ;
diff --git a/maps/backend_scheme.map b/maps/backend_scheme.map
index 9e2aee93..ef98cf97 100644
--- a/maps/backend_scheme.map
+++ b/maps/backend_scheme.map
@@ -21,9 +21,9 @@ checkhostheader http ;
 static-public http ;
 static-public-nocache http ;
 
-static-custom-domain-madlab http ;
-static-custom-domain-sitesbuedu-nocache http ;
-static-custom-domain-framinghamheartstudy-nocache http ;
+static-domain-madlab http ;
+static-domain-sitesbuedu http ;
+static-domain-framinghamheartstudy http ;
 
 people-public http ;
 people-public-nocache http ;
diff --git a/maps/cachecontrol.map b/maps/cachecontrol.map
index 3fb55317..f910857d 100644
--- a/maps/cachecontrol.map
+++ b/maps/cachecontrol.map
@@ -1,8 +1,8 @@
   uiscgi_app "no-cache, no-store" ;
   legacy "no-cache, no-store" ;
   static-public-nocache "no-cache, no-store" ;
-  static-custom-domain-sitesbuedu-nocache "no-cache, no-store" ;
-  static-custom-domain-framinghamheartstudy-nocache "no-cache, no-store" ;
+  static-domain-sitesbuedu "no-cache, no-store" ;
+  static-domain-framinghamheartstudy "no-cache, no-store" ;
   people-public-nocache "no-cache, no-store" ;
 
   apps-rewrite "no-cache, no-store" ;
diff --git a/maps/hosts.map.erb b/maps/hosts.map.erb
index 23ac5e50..141d25c3 100644
--- a/maps/hosts.map.erb
+++ b/maps/hosts.map.erb
@@ -2,76 +2,102 @@
 #  Legacy Systems
 # # # # # # # # # # # # # # # # # # # #
 
-legacy <%= ENV['BACKEND_WEB_LEGACY'] || "ist-web-legacy-#{ENV['LANDSCAPE']}.bu.edu" %> ;
+legacy                        <%= ENV['BACKEND_WEB_LEGACY'] || "ist-web-legacy-#{ENV['LANDSCAPE']}.bu.edu" %> ;
+#                             # Hosted: ON-PREM (F5 load balancer)
 
-mainframe-java-8082 usl0.bu.edu:8082 ;
+mainframe-java-8082           usl0.bu.edu:8082 ;
+#                             # Hosted: ON-PREM (individual app server)
 
 
 # # # # # # # # # # # # # # # # # # # #
 #  Static Sites
 # # # # # # # # # # # # # # # # # # # #
 
-static-public static-sites-prod-public.s3-website-us-east-1.amazonaws.com ;
-static-public-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com ;
+static-public                 static-sites-prod-public.s3-website-us-east-1.amazonaws.com ;
+#                             # Hosted: AWS ist-cloud-central-app-prd
 
-static-protected ist-web-static-sites-prod.bu.edu ;
+static-public-nocache         static-sites-prod-public.s3-website-us-east-1.amazonaws.com ;
+#                             # Hosted: AWS ist-cloud-central-app-prd
+
+static-protected              ist-web-static-sites-prod.bu.edu ;
+#                             # Hosted: AWS ist-cloud-central-app-prd
 
 
 # # # # # # # # # # # # # # # # # # # #
 #  Custom Domains
 # # # # # # # # # # # # # # # # # # # #
 
-static-custom-domain-madlab static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/www.madlab.bu.edu ;
+static-domain-madlab          static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/www.madlab.bu.edu ;
+#                             # Hosted: AWS ist-cloud-central-app-prd
 
-static-custom-domain-sitesbuedu-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/sites.bu.edu ;
+static-domain-sitesbuedu      static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/sites.bu.edu ;
+#                             # Hosted: AWS ist-cloud-central-app-prd
 
-static-custom-domain-framinghamheartstudy-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/www.framinghamheartstudy.org ;
+static-domain-framinghamheartstudy static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/www.framinghamheartstudy.org ;
+#                             # Hosted: AWS ist-cloud-central-app-prd
 
 
 # # # # # # # # # # # # # # # # # # # #
 #  people.bu.edu
 # # # # # # # # # # # # # # # # # # # #
 
-people-public static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/people.bu.edu ;
-people-public-nocache static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/people.bu.edu ;
+people-public                 static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/people.bu.edu ;
+#                             # Hosted: AWS ist-cloud-central-app-prd
+
+people-public-nocache         static-sites-prod-public.s3-website-us-east-1.amazonaws.com/_domains/people.bu.edu ;
+#                             # Hosted: AWS ist-cloud-central-app-prd
 
-people-protected ist-web-static-sites-prod.bu.edu/_domains/people.bu.edu ;
+people-protected              ist-web-static-sites-prod.bu.edu/_domains/people.bu.edu ;
+#                             # Hosted: ON-PREM (F5 load balancer)
 
 
 # # # # # # # # # # # # # # # # # # # #
 #  WordPress
 # # # # # # # # # # # # # # # # # # # #
 
-wpassets wordpress-prod-alb.webrouter-prd.aws-cloud.bu.edu ;
-wordpress wordpress-prod-alb.webrouter-prd.aws-cloud.bu.edu ;
+wpassets                      wordpress-prod-alb.webrouter-prd.aws-cloud.bu.edu ;
+#                             # Hosted: AWS buaws-websites-prod, proxied to ist-wp-app-pr*
+
+wordpress                     wordpress-prod-alb.webrouter-prd.aws-cloud.bu.edu ;
+#                             # Hosted: AWS buaws-websites-prod, proxied to ist-wp-app-pr*
 
-# WPEngine (WP Engine) Websites, each of which must be defined separately:
-wpengine-questrom buquestrom.wpengine.com ;
+wpengine-questrom             buquestrom.wpengine.com ;
+#                             # WP Engine
 
 
 # # # # # # # # # # # # # # # # # # # #
 #  PHP
 # # # # # # # # # # # # # # # # # # # #
 
-phpbin-aws ist-web-phpbin-aws-prod.bu.edu ;
-phpbin-nextjs ist-web-phpbin-aws-prod.bu.edu ;
+phpbin-aws                    ist-web-phpbin-aws-prod.bu.edu ;
+#                             # Hosted: AWS ist-cloud-central-app-prd
+
+phpbin-nextjs                 ist-web-phpbin-aws-prod.bu.edu ;
+#                             # Hosted: AWS ist-cloud-central-app-prd
 
 # Custom Domain for wiki.bu.edu:
-www-rewrite-wiki ist-web-phpbin-aws-prod.bu.edu/phpbin/wiki ;
-www-rewrite-wiki-test ist-web-phpbin-aws-test.bu.edu/phpbin/wiki ;
+www-rewrite-wiki              ist-web-phpbin-aws-prod.bu.edu/phpbin/wiki ;
+#                             # Hosted: AWS ist-cloud-central-app-prd
+
+www-rewrite-wiki-test         ist-web-phpbin-aws-test.bu.edu/phpbin/wiki ;
+#                             # Hosted: AWS ist-cloud-central-app-nprd
 
 
 # # # # # # # # # # # # # # # # # # # #
 #  Other Apps
 # # # # # # # # # # # # # # # # # # # #
 
-uiscgi_app <%= ENV['BACKEND_UISCGI_APP'] || "ist-uiscgi-app-#{ENV['LANDSCAPE']}.bu.edu" %> ;
+uiscgi_app                    <%= ENV['BACKEND_UISCGI_APP'] || "ist-uiscgi-app-#{ENV['LANDSCAPE']}.bu.edu" %> ;
+#                             # Hosted: ON-PREM (F5 load balancer)
 
-uiscgi_content <%= ENV['BACKEND_UISCGI_CONTENT'] || "ist-uiscgi-content-#{ENV['LANDSCAPE']}.bu.edu" %> ;
+uiscgi_content                <%= ENV['BACKEND_UISCGI_CONTENT'] || "ist-uiscgi-content-#{ENV['LANDSCAPE']}.bu.edu" %> ;
+#                             # Hosted: ON-PREM (F5 load balancer)
 
-search ist-web-phpbin-aws-prod.bu.edu/phpbin/search ;
+search                        ist-web-phpbin-aws-prod.bu.edu/phpbin/search ;
+#                             # Hosted: AWS ist-cloud-central-app-prd
 
-wp-deploy ist-wp-bld-pr01.bu.edu ;
+wp-deploy                     ist-wp-bld-pr01.bu.edu ;
+#                             # Hosted: ON-PREM (individual app server, as named here)
 
 
 
diff --git a/maps/sites.map b/maps/sites.map
index a26dba48..a7b563c3 100644
--- a/maps/sites.map
+++ b/maps/sites.map
@@ -1676,7 +1676,7 @@ www.city-convenience.com redirect_asis ;
 www.computationalimmunology.org redirect ;
 www.ddensmore.net redirect ;
 www.indigobirds.com redirect ;
-www.madlab.bu.edu static-custom-domain-madlab ;
+www.madlab.bu.edu static-domain-madlab ;
 www.martinlutherkingjrarchive.net redirect_asis ;
 www.martinlutherkingjrarchive.org redirect_asis ;
 www.martinlutherkingjrcollection.com redirect_asis ;
@@ -1717,17 +1717,17 @@ blogs.bu.edu/vschmidt redirect_asis ;
 # sites.bu.edu
 sites.bu.edu/agingny redirect_asis ;
 sites.bu.edu/akwok redirect ;
-sites.bu.edu/autismsa/training static-custom-domain-sitesbuedu-nocache ;
+sites.bu.edu/autismsa/training static-domain-sitesbuedu ;
 sites.bu.edu/collegeharmsfromothersdrinking redirect_asis ;
 sites.bu.edu/earlcenter redirect_asis ;
 sites.bu.edu/geddesgrants redirect_asis ;
 sites.bu.edu/hothouse redirect_asis ;
 sites.bu.edu/hyness redirect_asis ;
 sites.bu.edu/maasap redirect_asis ;
-sites.bu.edu/mosquitobrainbrowser static-custom-domain-sitesbuedu-nocache ;
+sites.bu.edu/mosquitobrainbrowser static-domain-sitesbuedu ;
 sites.bu.edu/musicbridge redirect_asis ;
 sites.bu.edu/reinhartlab redirect_asis ;
-sites.bu.edu/ria/geddes static-custom-domain-sitesbuedu-nocache ;
+sites.bu.edu/ria/geddes static-domain-sitesbuedu ;
 sites.bu.edu/techlaw redirect_asis ;
 sites.bu.edu/shield-drive redirect_asis ;
 sites.bu.edu/slde redirect_asis ;
@@ -1739,7 +1739,7 @@ sites.bu.edu/vschmidt redirect_asis ;
 people.bu.edu people-public ;
 
 # www.framinghamheartstudy.org
-www.framinghamheartstudy.org/training static-custom-domain-framinghamheartstudy-nocache ;
+www.framinghamheartstudy.org/training static-domain-framinghamheartstudy ;
 
 # Sites with .shtml files:
 people.bu.edu/alyasoff people-protected ;