diff --git a/src/service-info.ts b/src/service-info.ts
index fed18d7..b3dec08 100644
--- a/src/service-info.ts
+++ b/src/service-info.ts
@@ -400,11 +400,11 @@ function addKeyToAggregates(k: KeyPoolKey) {
             addToFamily(`aws-claude__awsSonnet3_7`, 1);
           } else if (id.includes("claude-3-haiku")) {
             addToFamily(`aws-claude__awsHaiku`, 1);
-          } else if (id.includes("claude-sonnet-4")) {
+          } else if (id.includes("sonnet-4")) {
             addToFamily(`aws-claude__awsSonnet4`, 1);
           } else if (id.includes("claude-3-opus")) {
             addToFamily(`aws-claude__awsOpus3`, 1);
-          } else if (id.includes("claude-opus-4")) {
+          } else if (id.includes("opus-4")) {
             addToFamily(`aws-claude__awsOpus4`, 1);
           } else if (id.includes("claude-v2")) {
             addToFamily(`aws-claude__awsClaude2`, 1);