diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java b/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java
index 7342e1381bd2a5f555b33ba436cd5817f7c0ce3e..dbe5f9d345bc1e1ee35575013c816f8c4653e728 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/PrimingResource.java
@@ -17,7 +17,7 @@ import jakarta.inject.Singleton;
 @Singleton
 public class PrimingResource implements OrderedResource {
 
-  @Value("${nshmp.context-path}")
+  @Value("${nshmp-haz.context-path}")
   String contextPath;
 
   @Override
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerController.java
index 5dcbfc7d33778bab38fe39fd397176b16878027c..41e30233bf47b55380433de92f6ea11c76fe6d0b 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerController.java
@@ -28,7 +28,7 @@ import jakarta.inject.Inject;
     name = "Swagger",
     description = "Swagger OpenAPI YAML")
 @Hidden
-@Controller("${nshmp.context-path}/swagger")
+@Controller("${nshmp-haz.context-path}/swagger")
 public class SwaggerController {
 
   @Inject
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java
index ed29297569a60db42f9c20de679747697ef95e24..d042c4be3ddfd316e374ce2bf4efca850bf7e7f6 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/SwaggerUIController.java
@@ -23,7 +23,7 @@ import jakarta.inject.Inject;
  * Handle Swagger static resources.
  */
 @Controller(
-    value = "${nshmp.context-path}/",
+    value = "${nshmp-haz.context-path}/",
     produces = {
         MediaType.APPLICATION_YAML,
         MediaType.TEXT_HTML,
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
index 7c28592bc58df846d78957ee07be3bc96a79db24..96749ddeeee6de588f39ee07c73593c767446cda 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
@@ -46,7 +46,7 @@ import jakarta.inject.Inject;
 @Tag(
     name = DisaggService.NAME,
     description = "USGS NSHM hazard disaggregation service")
-@Controller("${nshmp.context-path}/disagg")
+@Controller("${nshmp-haz.context-path}/disagg")
 public class DisaggController {
 
   @Inject
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardController.java
index c630a102c5a4d647c0836f7e68b32b9423b5affe..b78c842ceb7450ebf47cc41ae8eee07d5f083ec1 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardController.java
@@ -40,7 +40,7 @@ import jakarta.inject.Inject;
 @Tag(
     name = HazardService.NAME,
     description = "USGS NSHM hazard calculation service")
-@Controller("${nshmp.context-path}/hazard")
+@Controller("${nshmp-haz.context-path}/hazard")
 public class HazardController {
 
   @Inject
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java
index 4a99368504119a016581bd5276d28872e3d0a100..441dbc6f1dc2555b754f70747cdd56e6d931fb7e 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesController.java
@@ -36,7 +36,7 @@ import jakarta.inject.Inject;
 @Tag(
     name = FeaturesService.NAME,
     description = "USGS NSHM source model features service")
-@Controller("${nshmp.context-path}/features")
+@Controller("${nshmp-haz.context-path}/features")
 public class FeaturesController {
 
   @Inject
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreesController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreesController.java
index 2fe956f3676d38ccebab5c7795321e0570efdcea..e6b339627d1b223a2a78e4698dd34a58b5ec1776 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreesController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/LogicTreesController.java
@@ -34,7 +34,7 @@ import jakarta.inject.Inject;
 @Tag(
     name = LogicTreesService.NAME,
     description = "USGS NSHM source model logic tree service")
-@Controller("${nshmp.context-path}/trees")
+@Controller("${nshmp-haz.context-path}/trees")
 public class LogicTreesController {
 
   @Inject
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/MapController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/MapController.java
index 003137975f6c2283c8e31477d3df6efee3ff85a0..53245a75398486141c9d1b9c23831a38fe3c42e7 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/MapController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/MapController.java
@@ -39,7 +39,7 @@ import jakarta.inject.Inject;
 @Tag(
     name = MapController.NAME,
     description = "NSHM map boundary")
-@Controller("${nshmp.context-path}/map")
+@Controller("${nshmp-haz.context-path}/map")
 public class MapController {
   static final Logger LOG = LoggerFactory.getLogger(MapController.class);
   static final String NAME = "Map Boundary";
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/MfdsController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/MfdsController.java
index fd8151fdbe17f17cdfe7601344ad6a7da64c0afd..8ce8c6e9099a8f13e677f5f5dd052265006e5ecb 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/MfdsController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/MfdsController.java
@@ -40,7 +40,7 @@ import jakarta.inject.Inject;
 @Tag(
     name = MfdsService.NAME,
     description = "USGS NSHM source model MFD service")
-@Controller("${nshmp.context-path}/mfds")
+@Controller("${nshmp-haz.context-path}/mfds")
 public class MfdsController {
 
   @Inject
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/ProbabilityController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/ProbabilityController.java
index 750f0f1f007ee617d4f0c0e26c01acbfa083449d..0a317a596d866f1e556511600485f99ff53ae988 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/ProbabilityController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/ProbabilityController.java
@@ -34,7 +34,7 @@ import jakarta.inject.Inject;
 @Tag(
     name = RateService.NAME_PROBABILITY,
     description = "USGS NSHM earthquake probability calculation service")
-@Controller("${nshmp.context-path}/probability")
+@Controller("${nshmp-haz.context-path}/probability")
 public class ProbabilityController {
 
   @Inject
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateController.java
index f0f12d36a95dd937c72bd76c1430067c0220c3ce..f54f3ec04ddf8c12943a82231ab9d47e8f52a8c5 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateController.java
@@ -34,7 +34,7 @@ import jakarta.inject.Inject;
 @Tag(
     name = RateService.NAME_RATE,
     description = "USGS NSHM earthquake rate calculation service")
-@Controller("${nshmp.context-path}/rate")
+@Controller("${nshmp-haz.context-path}/rate")
 public class RateController {
 
   @Inject
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceController.java
index 0febc062b4b3d305d4ed325823629cf1e7969849..0ac6f08eae88e2f629b4b66bb9e79715bcf42187 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceController.java
@@ -32,7 +32,7 @@ import jakarta.inject.Inject;
 @Tag(
     name = SourceService.NAME,
     description = "USGS NSHM source model metadata service")
-@Controller("${nshmp.context-path}/source")
+@Controller("${nshmp-haz.context-path}/source")
 public class SourceController {
 
   // TODO consider renaming to /model
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/TestSitesController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/TestSitesController.java
index 8a07388c536c58d64e8419d4679a797305e344aa..3464f70600033dd934bd99551da5b3a77cf310d8 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/TestSitesController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/TestSitesController.java
@@ -39,7 +39,7 @@ import jakarta.inject.Inject;
 @Tag(
     name = TestSitesController.NAME,
     description = "NSHM test sites")
-@Controller("${nshmp.context-path}/sites")
+@Controller("${nshmp-haz.context-path}/sites")
 public class TestSitesController {
   static final Logger LOG = LoggerFactory.getLogger(TestSitesController.class);
   static final String NAME = "Test Sites";