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 6a1d8de3970106c1a1b6158746acbeb213bebc62..26e18c2f0e7e43131ecb56811c9c38f7ba88e32b 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
@@ -15,7 +15,6 @@ import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.RequestIml;
 import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.RequestRp;
 import gov.usgs.earthquake.nshmp.www.hazard.DisaggService.Response;
 import gov.usgs.earthquake.nshmp.www.hazard.HazardService.Metadata;
-
 import io.micronaut.core.annotation.Nullable;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
@@ -44,7 +43,7 @@ import jakarta.inject.Inject;
  * @author U.S. Geological Survey
  */
 @Tag(
-    name = "Hazard Disaggregation",
+    name = DisaggService.NAME,
     description = "USGS NSHM hazard disaggregation service")
 @Controller("/disagg")
 public class DisaggController {
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java
index 124d9bcfb15463827eb669c4cabdb874c4e48b8b..94d502dec438510329145b2217de4ad7185ebbc0 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java
@@ -36,7 +36,6 @@ import gov.usgs.earthquake.nshmp.www.ServletUtil.Server;
 import gov.usgs.earthquake.nshmp.www.hazard.HazardService.HazardRequest;
 import gov.usgs.earthquake.nshmp.www.hazard.HazardService.Metadata;
 import gov.usgs.earthquake.nshmp.www.meta.Parameter;
-
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import jakarta.inject.Singleton;
@@ -57,7 +56,7 @@ public final class DisaggService {
    * OR imt=iml pairs
    */
 
-  static final String NAME = "Disaggregation Service";
+  static final String NAME = "Hazard Disaggregation";
   static final Logger LOG = LoggerFactory.getLogger(DisaggService.class);
 
   // TODO range check return periods and imls
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 9dbddb3a24ed96a0a626171b11504f9082703f58..628a482697b3167cd951c3717a8673bbc2575ee8 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
@@ -9,7 +9,6 @@ import gov.usgs.earthquake.nshmp.www.ServletUtil;
 import gov.usgs.earthquake.nshmp.www.hazard.HazardService.Metadata;
 import gov.usgs.earthquake.nshmp.www.hazard.HazardService.Request;
 import gov.usgs.earthquake.nshmp.www.hazard.HazardService.Response;
-
 import io.micronaut.core.annotation.Nullable;
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
@@ -38,7 +37,7 @@ import jakarta.inject.Inject;
  * @author U.S. Geological Survey
  */
 @Tag(
-    name = "Hazard Calculation",
+    name = HazardService.NAME,
     description = "USGS NSHM hazard calculation service")
 @Controller("/hazard")
 public class HazardController {
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java
index a0d5792eac3f7bc0b840e1be1e2301ca42d54a36..58ac15e46421c734812596954cba0bd554739c58 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java
@@ -53,7 +53,7 @@ import jakarta.inject.Singleton;
 @Singleton
 public final class HazardService {
 
-  static final String NAME = "Hazard Service";
+  static final String NAME = "Hazard Curves";
   static final Logger LOG = LoggerFactory.getLogger(HazardService.class);
 
   private static final String TOTAL_KEY = "Total";
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 202e71e2311c59f7ac5b6849ed46bc97b2c71704..471bf2f47423edd23f1ced07584d3b524a4fe229 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
@@ -6,7 +6,6 @@ import gov.usgs.earthquake.nshmp.www.ServletUtil;
 import gov.usgs.earthquake.nshmp.www.source.RateService.ProbMetadata;
 import gov.usgs.earthquake.nshmp.www.source.RateService.Request;
 import gov.usgs.earthquake.nshmp.www.source.RateService.Response;
-
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.MediaType;
@@ -32,7 +31,7 @@ import jakarta.inject.Inject;
  * @author U.S. Geological Survey
  */
 @Tag(
-    name = "Earthquake Probability Calculation",
+    name = RateService.NAME_PROBABILITY,
     description = "USGS NSHM earthquake probability calculation service")
 @Controller("/probability")
 public class ProbabilityController {
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 c77d043038a59d3dd555cfc57426344499cd6fba..b82dac9d59f352cce90f9d46d3b131019a161c50 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
@@ -6,7 +6,6 @@ import gov.usgs.earthquake.nshmp.www.ServletUtil;
 import gov.usgs.earthquake.nshmp.www.source.RateService.Metadata;
 import gov.usgs.earthquake.nshmp.www.source.RateService.Request;
 import gov.usgs.earthquake.nshmp.www.source.RateService.Response;
-
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.MediaType;
@@ -32,7 +31,7 @@ import jakarta.inject.Inject;
  * @author U.S. Geological Survey
  */
 @Tag(
-    name = "Earthquake Rate Calculation",
+    name = RateService.NAME_RATE,
     description = "USGS NSHM earthquake rate calculation service")
 @Controller("/rate")
 public class RateController {
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateService.java
index 924070e7e6c4a5aab48ec56ca97a236e58238e3d..debaff320c7c8835a0ac3194fd3b7cd16d2630bb 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/RateService.java
@@ -42,8 +42,8 @@ import jakarta.inject.Singleton;
 @Singleton
 public final class RateService {
 
-  static final String NAME_RATE = "Earthquake Rate Service";
-  static final String NAME_PROBABILITY = "Earthquake Probability Service";
+  static final String NAME_RATE = "Earthquake Rates";
+  static final String NAME_PROBABILITY = "Earthquake Probabilities";
   static final Logger LOG = LoggerFactory.getLogger(RateService.class);
 
   /*
@@ -348,7 +348,7 @@ public final class RateService {
     var url = request.getUri().toString();
     var usage = new ProbMetadata(ServletUtil.model());
     var body = ResponseBody.usage()
-        .name(NAME_RATE)
+        .name(NAME_PROBABILITY)
         .url(url)
         .metadata(new ResponseMetadata(HazVersion.appVersions()))
         .request(url)
@@ -367,7 +367,6 @@ public final class RateService {
 
     Metadata(HazardModel model) {
       this.model = new SourceModel(model);
-      // TODO should get min max from model (fix via swagger openapi injection)
       longitude = new DoubleParameter(
           "Longitude",
           "°",
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 7c4c8b5711491ea3accf4dabd3582f5193f91925..4c67995baf13e02c28c52ea2135c479317fd0690 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
@@ -4,7 +4,6 @@ import gov.usgs.earthquake.nshmp.www.NshmpMicronautServlet;
 import gov.usgs.earthquake.nshmp.www.ResponseBody;
 import gov.usgs.earthquake.nshmp.www.ServletUtil;
 import gov.usgs.earthquake.nshmp.www.source.SourceService.ResponseData;
-
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import io.micronaut.http.MediaType;
@@ -30,7 +29,7 @@ import jakarta.inject.Inject;
  * @author U.S. Geological Survey
  */
 @Tag(
-    name = "Source Model Information",
+    name = SourceService.NAME,
     description = "USGS NSHM source model metadata service")
 @Controller("/source")
 public class SourceController {
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesController.java
index e154330411da2d5c6b8e1264fa246e9fc4fda20c..0c239d4a528c740266f4480c481176a5f2833f40 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesController.java
@@ -30,7 +30,7 @@ import jakarta.inject.Inject;
  * @author U.S. Geological Survey
  */
 @Tag(
-    name = "Source Model Logic Trees",
+    name = SourceLogicTreesService.NAME,
     description = "USGS NSHM source model logic tree service")
 @Controller("/trees")
 public class SourceLogicTreesController {
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesService.java
index d2bfdef9b02a4e4ef020b70017889e89ae882cbd..0777b148cec3706f181a9514011e511975868f33 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceLogicTreesService.java
@@ -10,7 +10,6 @@ import gov.usgs.earthquake.nshmp.www.ResponseBody;
 import gov.usgs.earthquake.nshmp.www.ResponseMetadata;
 import gov.usgs.earthquake.nshmp.www.ServletUtil;
 import gov.usgs.earthquake.nshmp.www.source.SourceService.SourceModel;
-
 import io.micronaut.http.HttpRequest;
 import io.micronaut.http.HttpResponse;
 import jakarta.inject.Singleton;
@@ -23,7 +22,7 @@ import jakarta.inject.Singleton;
 @Singleton
 public class SourceLogicTreesService {
 
-  static final String NAME = "Source Logic Trees";
+  static final String NAME = "Model Logic Trees";
   static final Logger LOG = LoggerFactory.getLogger(SourceLogicTreesService.class);
 
   public static HttpResponse<String> getMetadata(HttpRequest<?> request) {
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java
index 3ecba39d3b5b442c01bb83f5b5418c690a7a60b5..777cd4b06b2186b7b13603487ca13a11557943fd 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/SourceService.java
@@ -29,7 +29,7 @@ import jakarta.inject.Singleton;
 @Singleton
 public class SourceService {
 
-  static final String NAME = "Source Model";
+  static final String NAME = "Model Contents";
   static final Logger LOG = LoggerFactory.getLogger(SourceService.class);
 
   static HttpResponse<String> getMetadata(HttpRequest<?> request) {