diff --git a/src/main/java/gov/cms/madie/services/HumanReadableService.java b/src/main/java/gov/cms/madie/services/HumanReadableService.java
index 8494747..2e7a398 100644
--- a/src/main/java/gov/cms/madie/services/HumanReadableService.java
+++ b/src/main/java/gov/cms/madie/services/HumanReadableService.java
@@ -405,7 +405,7 @@ List<HumanReadableTerminologyModel> buildValueSetTerminology(Set<CQLValueSet> cq
                     new HumanReadableValuesetModel(
                         cqlValueSet.getName(), cqlValueSet.getOid(), cqlValueSet.getVersion(), ""))
             .sorted(
-                Comparator.comparing(HumanReadableValuesetModel::getDataCriteriaDisplay, collator))
+                Comparator.comparing(HumanReadableValuesetModel::getTerminologyDisplay))
             .toList();
     return new ArrayList<>(valueSetTerminology);
   }
@@ -426,7 +426,7 @@ List<HumanReadableTerminologyModel> buildCodeTerminology(Set<CQLCode> cqlCodes)
                         .isCodesystemVersionIncluded(
                             StringUtils.isNotBlank(cqlCode.getCodeSystemVersion()))
                         .build())
-            .sorted(Comparator.comparing(HumanReadableCodeModel::getDataCriteriaDisplay, collator))
+            .sorted(Comparator.comparing(HumanReadableCodeModel::getTerminologyDisplay))
             .toList();
     return new ArrayList<>(codeTerminology);
   }