diff --git a/config/plano_config_schema.yaml b/config/plano_config_schema.yaml
index 52820f24..5f93c5ca 100644
--- a/config/plano_config_schema.yaml
+++ b/config/plano_config_schema.yaml
@@ -382,7 +382,7 @@ properties:
         type: integer
       trace_arch_internal:
         type: boolean
-      custom_attribute_prefixes:
+      span_attribute_header_prefixes:
         type: array
         items:
           type: string
diff --git a/crates/brightstaff/src/handlers/agent_chat_completions.rs b/crates/brightstaff/src/handlers/agent_chat_completions.rs
index 268933f0..dc18e093 100644
--- a/crates/brightstaff/src/handlers/agent_chat_completions.rs
+++ b/crates/brightstaff/src/handlers/agent_chat_completions.rs
@@ -188,7 +188,7 @@ async fn handle_agent_chat(
         tracing_config
             .as_ref()
             .as_ref()
-            .and_then(|tracing| tracing.custom_attribute_prefixes.as_deref()),
+            .and_then(|tracing| tracing.span_attribute_header_prefixes.as_deref()),
     );
 
     let chat_request_bytes = request.collect().await?.to_bytes();
diff --git a/crates/brightstaff/src/handlers/llm.rs b/crates/brightstaff/src/handlers/llm.rs
index 4ac75869..4b64733f 100644
--- a/crates/brightstaff/src/handlers/llm.rs
+++ b/crates/brightstaff/src/handlers/llm.rs
@@ -53,7 +53,7 @@ pub async fn llm_chat(
         tracing_config
             .as_ref()
             .as_ref()
-            .and_then(|tracing| tracing.custom_attribute_prefixes.as_deref()),
+            .and_then(|tracing| tracing.span_attribute_header_prefixes.as_deref()),
     );
     let request_id: String = match request_headers
         .get(REQUEST_ID_HEADER)
diff --git a/crates/common/src/configuration.rs b/crates/common/src/configuration.rs
index 47fbb373..6ce5daeb 100644
--- a/crates/common/src/configuration.rs
+++ b/crates/common/src/configuration.rs
@@ -90,7 +90,7 @@ pub struct Overrides {
 pub struct Tracing {
     pub sampling_rate: Option<f64>,
     pub trace_arch_internal: Option<bool>,
-    pub custom_attribute_prefixes: Option<Vec<String>>,
+    pub span_attribute_header_prefixes: Option<Vec<String>>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq, Hash, Default)]
diff --git a/demos/agent_orchestration/travel_agents/config.yaml b/demos/agent_orchestration/travel_agents/config.yaml
index 2924cde8..cb2a632c 100644
--- a/demos/agent_orchestration/travel_agents/config.yaml
+++ b/demos/agent_orchestration/travel_agents/config.yaml
@@ -55,5 +55,5 @@ listeners:
 
 tracing:
   random_sampling: 100
-  custom_attribute_prefixes:
+  span_attribute_header_prefixes:
     - x-katanemo-