diff --git a/frontend/src/components/test-detail/DataClassificationBadge.tsx b/frontend/src/components/test-detail/DataClassificationBadge.tsx
index 0a6cc54..891316f 100644
--- a/frontend/src/components/test-detail/DataClassificationBadge.tsx
+++ b/frontend/src/components/test-detail/DataClassificationBadge.tsx
@@ -5,9 +5,9 @@ import type { DataClassification } from "../../types/models";
 // ── Options ────────────────────────────────────────────────────────
 
 const CLASSIFICATION_OPTIONS: { value: DataClassification; label: string; color: string }[] = [
-  { value: "public", label: "Public", color: "border-gray-500/30 bg-gray-800/50 text-gray-400" },
-  { value: "internal", label: "Internal", color: "border-blue-500/30 bg-blue-900/30 text-blue-400" },
-  { value: "sensitive", label: "Sensitive", color: "border-amber-500/30 bg-amber-900/30 text-amber-400" },
+  { value: "public_release", label: "Public Release", color: "border-gray-500/30 bg-gray-800/50 text-gray-400" },
+  { value: "general_use", label: "General Use", color: "border-blue-500/30 bg-blue-900/30 text-blue-400" },
+  { value: "confidential", label: "Confidential", color: "border-amber-500/30 bg-amber-900/30 text-amber-400" },
   { value: "restricted", label: "Restricted", color: "border-red-500/30 bg-red-900/30 text-red-400" },
 ];
 
diff --git a/frontend/src/components/test-detail/TestDetailHeader.tsx b/frontend/src/components/test-detail/TestDetailHeader.tsx
index da2c36f..2f04fe9 100644
--- a/frontend/src/components/test-detail/TestDetailHeader.tsx
+++ b/frontend/src/components/test-detail/TestDetailHeader.tsx
@@ -531,7 +531,7 @@ export default function TestDetailHeader({
               </span>
               <DataClassificationBadge
                 value={test.data_classification}
-                canEdit={role === "admin"}
+                canEdit={["admin", "manager", "red_tech", "red_lead", "blue_tech", "blue_lead"].includes(role)}
                 isSaving={isUpdatingClassification}
                 onChange={onUpdateClassification}
               />
diff --git a/frontend/src/types/models.ts b/frontend/src/types/models.ts
index 01927f8..91c3407 100644
--- a/frontend/src/types/models.ts
+++ b/frontend/src/types/models.ts
@@ -62,7 +62,7 @@ export type ContainmentResult = "contained" | "partially_contained" | "not_conta
 
 export type AttackSuccessResult = "successful" | "not_successful" | "partially_successful";
 
-export type DataClassification = "public" | "internal" | "sensitive" | "restricted";
+export type DataClassification = "public_release" | "general_use" | "confidential" | "restricted";
 
 export type ValidationStatus = "pending" | "approved" | "rejected";