diff --git a/app/src/components/annotation/AnnotationTooltip.tsx b/app/src/components/annotation/AnnotationTooltip.tsx
index f37ded41bc..c38d097914 100644
--- a/app/src/components/annotation/AnnotationTooltip.tsx
+++ b/app/src/components/annotation/AnnotationTooltip.tsx
@@ -45,12 +45,14 @@ export function AnnotationTooltip({
             </Text>
             <Text color="inherit">{annotation.label || "--"}</Text>
           </Flex>
-          <Flex direction="row" justifyContent="space-between">
-            <Text weight="heavy" color="inherit">
-              kind
-            </Text>
-            <Text color="inherit">{annotation.annotatorKind}</Text>
-          </Flex>
+          {annotation.annotatorKind ? (
+            <Flex direction="row" justifyContent="space-between">
+              <Text weight="heavy" color="inherit">
+                annotator kind
+              </Text>
+              <Text color="inherit">{annotation.annotatorKind}</Text>
+            </Flex>
+          ) : null}
         </View>
         {annotation.explanation ? (
           <View paddingTop="size-50">
diff --git a/app/src/components/annotation/types.ts b/app/src/components/annotation/types.ts
index 0d806e7729..ff3bbd4ec9 100644
--- a/app/src/components/annotation/types.ts
+++ b/app/src/components/annotation/types.ts
@@ -3,5 +3,5 @@ export interface Annotation {
   label?: string | null;
   score?: number | null;
   explanation?: string | null;
-  annotatorKind: string;
+  annotatorKind?: string;
 }
diff --git a/app/src/pages/project/SpanColumnSelector.tsx b/app/src/pages/project/SpanColumnSelector.tsx
index 1ac5d7ee08..147f26f035 100644
--- a/app/src/pages/project/SpanColumnSelector.tsx
+++ b/app/src/pages/project/SpanColumnSelector.tsx
@@ -7,7 +7,7 @@ import { Dropdown, Flex, Icon, Icons, View } from "@arizeai/components";
 
 import { useTracingContext } from "@phoenix/contexts/TracingContext";
 
-import { SpanColumnSelector_evaluations$key } from "./__generated__/SpanColumnSelector_evaluations.graphql";
+import { SpanColumnSelector_annotations$key } from "./__generated__/SpanColumnSelector_annotations.graphql";
 
 const UN_HIDABLE_COLUMN_IDS = ["spanKind", "name"];
 
@@ -19,7 +19,7 @@ type SpanColumnSelectorProps = {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   columns: Column<any>[];
-  query: SpanColumnSelector_evaluations$key;
+  query: SpanColumnSelector_annotations$key;
 };
 
 export function SpanColumnSelector(props: SpanColumnSelectorProps) {
@@ -145,33 +145,33 @@ function ColumnSelectorMenu(props: SpanColumnSelectorProps) {
 function EvaluationColumnSelector({
   query,
 }: Pick<SpanColumnSelectorProps, "query">) {
-  const data = useFragment<SpanColumnSelector_evaluations$key>(
+  const data = useFragment<SpanColumnSelector_annotations$key>(
     graphql`
-      fragment SpanColumnSelector_evaluations on Project {
-        spanEvaluationNames
+      fragment SpanColumnSelector_annotations on Project {
+        spanAnnotationNames
       }
     `,
     query
   );
-  const evaluationVisibility = useTracingContext(
-    (state) => state.evaluationVisibility
+  const annotationColumnVisibility = useTracingContext(
+    (state) => state.annotationColumnVisibility
   );
-  const setEvaluationVisibility = useTracingContext(
-    (state) => state.setEvaluationVisibility
+  const setAnnotationColumnVisibility = useTracingContext(
+    (state) => state.setAnnotationColumnVisibility
   );
   const allVisible = useMemo(() => {
-    return data.spanEvaluationNames.every((name) => {
-      const stateValue = evaluationVisibility[name];
+    return data.spanAnnotationNames.every((name) => {
+      const stateValue = annotationColumnVisibility[name];
       return stateValue || false;
     });
-  }, [evaluationVisibility, data.spanEvaluationNames]);
+  }, [data.spanAnnotationNames, annotationColumnVisibility]);
 
   const onToggleEvaluations = useCallback(() => {
-    const newVisibilityState = data.spanEvaluationNames.reduce((acc, name) => {
+    const newVisibilityState = data.spanAnnotationNames.reduce((acc, name) => {
       return { ...acc, [name]: !allVisible };
     }, {});
-    setEvaluationVisibility(newVisibilityState);
-  }, [setEvaluationVisibility, allVisible, data.spanEvaluationNames]);
+    setAnnotationColumnVisibility(newVisibilityState);
+  }, [data.spanAnnotationNames, setAnnotationColumnVisibility, allVisible]);
   return (
     <section>
       <View
@@ -189,13 +189,13 @@ function EvaluationColumnSelector({
               checked={allVisible}
               onChange={onToggleEvaluations}
             />
-            evaluations
+            feedback
           </label>
         </div>
       </View>
       <ul>
-        {data.spanEvaluationNames.map((name) => {
-          const isVisible = evaluationVisibility[name];
+        {data.spanAnnotationNames.map((name) => {
+          const isVisible = annotationColumnVisibility[name] ?? false;
           return (
             <li key={name} css={columCheckboxItemCSS}>
               <label>
@@ -204,8 +204,8 @@ function EvaluationColumnSelector({
                   name={name}
                   checked={isVisible}
                   onChange={() => {
-                    setEvaluationVisibility({
-                      ...evaluationVisibility,
+                    setAnnotationColumnVisibility({
+                      ...annotationColumnVisibility,
                       [name]: !isVisible,
                     });
                   }}
diff --git a/app/src/pages/project/SpansTable.tsx b/app/src/pages/project/SpansTable.tsx
index 4a9489e180..436e5fe71f 100644
--- a/app/src/pages/project/SpansTable.tsx
+++ b/app/src/pages/project/SpansTable.tsx
@@ -48,9 +48,9 @@ import { SpanFilterConditionField } from "./SpanFilterConditionField";
 import { SpanSelectionToolbar } from "./SpanSelectionToolbar";
 import { spansTableCSS } from "./styles";
 import {
+  ANNOTATIONS_COLUMN_PREFIX,
+  ANNOTATIONS_KEY_SEPARATOR,
   DEFAULT_SORT,
-  EVALS_COLUMN_PREFIX,
-  EVALS_KEY_SEPARATOR,
   getGqlSort,
 } from "./tableUtils";
 type SpansTableProps = {
@@ -82,7 +82,7 @@ export function SpansTable(props: SpansTableProps) {
           }
           filterCondition: { type: "String", defaultValue: null }
         ) {
-          ...SpanColumnSelector_evaluations
+          ...SpanColumnSelector_annotations
           spans(
             first: $first
             after: $after
@@ -112,10 +112,11 @@ export function SpansTable(props: SpansTableProps) {
                 output {
                   value: truncatedValue
                 }
-                spanEvaluations {
+                spanAnnotations {
                   name
                   label
                   score
+                  annotatorKind
                 }
                 documentRetrievalMetrics {
                   evaluationName
@@ -131,14 +132,14 @@ export function SpansTable(props: SpansTableProps) {
       props.project
     );
 
-  const evaluationVisibility = useTracingContext(
-    (state) => state.evaluationVisibility
+  const annotationColumnVisibility = useTracingContext(
+    (state) => state.annotationColumnVisibility
   );
-  const visibleEvaluationColumnNames = useMemo(() => {
-    return Object.keys(evaluationVisibility).filter(
-      (name) => evaluationVisibility[name]
+  const visibleAnnotationColumnNames = useMemo(() => {
+    return Object.keys(annotationColumnVisibility).filter(
+      (name) => annotationColumnVisibility[name]
     );
-  }, [evaluationVisibility]);
+  }, [annotationColumnVisibility]);
 
   const tableData = useMemo(() => {
     const tableData = data.spans.edges.map(({ span }) => span);
@@ -147,58 +148,54 @@ export function SpansTable(props: SpansTableProps) {
   }, [data]);
   type TableRow = (typeof tableData)[number];
 
-  const dynamicEvaluationColumns: ColumnDef<TableRow>[] =
-    visibleEvaluationColumnNames.map((name) => {
+  const dynamicAnnotationColumns: ColumnDef<TableRow>[] =
+    visibleAnnotationColumnNames.map((name) => {
       return {
         header: name,
         columns: [
           {
             header: `label`,
-            accessorKey: `${EVALS_COLUMN_PREFIX}${EVALS_KEY_SEPARATOR}label${EVALS_KEY_SEPARATOR}${name}`,
+            accessorKey: `${ANNOTATIONS_COLUMN_PREFIX}${ANNOTATIONS_KEY_SEPARATOR}label${ANNOTATIONS_KEY_SEPARATOR}${name}`,
             cell: ({ row }) => {
-              const evaluation = row.original.spanEvaluations.find(
-                (evaluation) => evaluation.name === name
+              const annotation = row.original.spanAnnotations.find(
+                (annotation) => annotation.name === name
               );
-              if (!evaluation) {
+              if (!annotation) {
                 return null;
               }
-              return evaluation.label;
+              return annotation.label;
             },
           } as ColumnDef<TableRow>,
           {
             header: `score`,
-            accessorKey: `${EVALS_COLUMN_PREFIX}${EVALS_KEY_SEPARATOR}score${EVALS_KEY_SEPARATOR}${name}`,
+            accessorKey: `${ANNOTATIONS_COLUMN_PREFIX}${ANNOTATIONS_KEY_SEPARATOR}score${ANNOTATIONS_KEY_SEPARATOR}${name}`,
             cell: ({ row }) => {
-              const evaluation = row.original.spanEvaluations.find(
-                (evaluation) => evaluation.name === name
+              const annotation = row.original.spanAnnotations.find(
+                (annotation) => annotation.name === name
               );
-              if (!evaluation) {
+              if (!annotation) {
                 return null;
               }
-              return evaluation.score;
+              return annotation.score;
             },
           } as ColumnDef<TableRow>,
         ],
       };
     });
 
-  const evaluationColumns: ColumnDef<TableRow>[] = [
+  const annotationColumns: ColumnDef<TableRow>[] = [
     {
-      header: "evaluations",
-      accessorKey: "spanEvaluations",
+      header: "feedback",
+      accessorKey: "spanAnnotations",
       enableSorting: false,
 
       cell: ({ row }) => {
         return (
           <Flex direction="row" gap="size-50" wrap="wrap">
-            {row.original.spanEvaluations.map((evaluation) => {
-              const annotation = {
-                ...evaluation,
-                annotatorKind: "LLM",
-              };
+            {row.original.spanAnnotations.map((annotation) => {
               return (
                 <AnnotationTooltip
-                  key={evaluation.name}
+                  key={annotation.name}
                   annotation={annotation}
                 >
                   <AnnotationLabel
@@ -236,7 +233,7 @@ export function SpansTable(props: SpansTableProps) {
         );
       },
     },
-    ...dynamicEvaluationColumns,
+    ...dynamicAnnotationColumns,
   ];
   const columns: ColumnDef<TableRow>[] = [
     {
@@ -303,7 +300,7 @@ export function SpansTable(props: SpansTableProps) {
       cell: TextCell,
       enableSorting: false,
     },
-    ...evaluationColumns, // TODO: consider hiding this column if there are no evals. For now we want people to know that there are evals
+    ...annotationColumns, // TODO: consider hiding this column if there are no evals. For now we want people to know that there are evals
     {
       header: "start time",
       accessorKey: "startTime",
diff --git a/app/src/pages/project/TracesTable.tsx b/app/src/pages/project/TracesTable.tsx
index 7befbadd8d..99b5c8de54 100644
--- a/app/src/pages/project/TracesTable.tsx
+++ b/app/src/pages/project/TracesTable.tsx
@@ -55,9 +55,9 @@ import { SpanFilterConditionField } from "./SpanFilterConditionField";
 import { SpanSelectionToolbar } from "./SpanSelectionToolbar";
 import { spansTableCSS } from "./styles";
 import {
+  ANNOTATIONS_COLUMN_PREFIX,
+  ANNOTATIONS_KEY_SEPARATOR,
   DEFAULT_SORT,
-  EVALS_COLUMN_PREFIX,
-  EVALS_KEY_SEPARATOR,
   getGqlSort,
 } from "./tableUtils";
 type TracesTableProps = {
@@ -114,7 +114,7 @@ export function TracesTable(props: TracesTableProps) {
           }
           filterCondition: { type: "String", defaultValue: null }
         ) {
-          ...SpanColumnSelector_evaluations
+          ...SpanColumnSelector_annotations
           rootSpans: spans(
             first: $first
             after: $after
@@ -146,10 +146,11 @@ export function TracesTable(props: TracesTableProps) {
                   spanId
                   traceId
                 }
-                spanEvaluations {
+                spanAnnotations {
                   name
                   label
                   score
+                  annotatorKind
                 }
                 documentRetrievalMetrics {
                   evaluationName
@@ -178,10 +179,11 @@ export function TracesTable(props: TracesTableProps) {
                     spanId
                     traceId
                   }
-                  spanEvaluations {
+                  spanAnnotations {
                     name
                     label
                     score
+                    annotatorKind
                   }
                   documentRetrievalMetrics {
                     evaluationName
@@ -198,14 +200,14 @@ export function TracesTable(props: TracesTableProps) {
       props.project
     );
 
-  const evaluationVisibility = useTracingContext(
-    (state) => state.evaluationVisibility
+  const annotationColumnVisibility = useTracingContext(
+    (state) => state.annotationColumnVisibility
   );
-  const visibleEvaluationColumnNames = useMemo(() => {
-    return Object.keys(evaluationVisibility).filter(
-      (name) => evaluationVisibility[name]
+  const visibleAnnotationColumnNames = useMemo(() => {
+    return Object.keys(annotationColumnVisibility).filter(
+      (name) => annotationColumnVisibility[name]
     );
-  }, [evaluationVisibility]);
+  }, [annotationColumnVisibility]);
   const tableData = useMemo(() => {
     const tableData = data.rootSpans.edges.map(({ rootSpan }) => {
       // Construct the set of spans over which you want to construct the tree
@@ -219,60 +221,56 @@ export function TracesTable(props: TracesTableProps) {
   }, [data]);
   type TableRow = (typeof tableData)[number];
 
-  const dynamicEvaluationColumns: ColumnDef<TableRow>[] =
-    visibleEvaluationColumnNames.map((name) => {
+  const dynamicAnnotationColumns: ColumnDef<TableRow>[] =
+    visibleAnnotationColumnNames.map((name) => {
       return {
         header: name,
         columns: [
           {
             header: `label`,
-            accessorKey: `${EVALS_COLUMN_PREFIX}${EVALS_KEY_SEPARATOR}label${EVALS_KEY_SEPARATOR}${name}`,
+            accessorKey: `${ANNOTATIONS_COLUMN_PREFIX}${ANNOTATIONS_KEY_SEPARATOR}label${ANNOTATIONS_KEY_SEPARATOR}${name}`,
             cell: ({ row }) => {
-              const evaluation = row.original.spanEvaluations.find(
-                (evaluation) => evaluation.name === name
+              const annotation = row.original.spanAnnotations.find(
+                (annotation) => annotation.name === name
               );
-              if (!evaluation) {
+              if (!annotation) {
                 return null;
               }
-              return evaluation.label;
+              return annotation.label;
             },
           } as ColumnDef<TableRow>,
           {
             header: `score`,
-            accessorKey: `${EVALS_COLUMN_PREFIX}${EVALS_KEY_SEPARATOR}score${EVALS_KEY_SEPARATOR}${name}`,
+            accessorKey: `${ANNOTATIONS_COLUMN_PREFIX}${ANNOTATIONS_KEY_SEPARATOR}score${ANNOTATIONS_KEY_SEPARATOR}${name}`,
             cell: ({ row }) => {
-              const evaluation = row.original.spanEvaluations.find(
-                (evaluation) => evaluation.name === name
+              const annotation = row.original.spanAnnotations.find(
+                (annotation) => annotation.name === name
               );
-              if (!evaluation) {
+              if (!annotation) {
                 return null;
               }
-              return evaluation.score;
+              return annotation.score;
             },
           } as ColumnDef<TableRow>,
         ],
       };
     });
 
-  const evaluationColumns: ColumnDef<TableRow>[] = [
+  const annoationColumns: ColumnDef<TableRow>[] = [
     {
-      header: "evaluations",
-      accessorKey: "spanEvaluations",
+      header: "feedback",
+      accessorKey: "spanAnnotations",
       enableSorting: false,
       cell: ({ row }) => {
         const hasNoEvaluations =
-          row.original.spanEvaluations.length === 0 &&
+          row.original.spanAnnotations.length === 0 &&
           row.original.documentRetrievalMetrics.length === 0;
         return (
           <Flex direction="row" gap="size-50" wrap="wrap">
-            {row.original.spanEvaluations.map((evaluation) => {
-              const annotation = {
-                ...evaluation,
-                annotatorKind: "LLM",
-              };
+            {row.original.spanAnnotations.map((annotation) => {
               return (
                 <AnnotationTooltip
-                  key={evaluation.name}
+                  key={annotation.name}
                   annotation={annotation}
                 >
                   <AnnotationLabel
@@ -311,7 +309,7 @@ export function TracesTable(props: TracesTableProps) {
         );
       },
     },
-    ...dynamicEvaluationColumns,
+    ...dynamicAnnotationColumns,
   ];
 
   const columns: ColumnDef<TableRow>[] = [
@@ -410,7 +408,7 @@ export function TracesTable(props: TracesTableProps) {
       enableSorting: false,
       cell: TextCell,
     },
-    ...evaluationColumns, // TODO: consider hiding this column is there is no evals. For now show it
+    ...annoationColumns, // TODO: consider hiding this column is there is no evals. For now show it
     {
       header: "start time",
       accessorKey: "startTime",
diff --git a/app/src/pages/project/__generated__/ProjectPageQuery.graphql.ts b/app/src/pages/project/__generated__/ProjectPageQuery.graphql.ts
index cb6dba9d46..bba83e2976 100644
--- a/app/src/pages/project/__generated__/ProjectPageQuery.graphql.ts
+++ b/app/src/pages/project/__generated__/ProjectPageQuery.graphql.ts
@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<8281c7e64e43a60aeebe2292a8304e40>>
+ * @generated SignedSource<<e6c2c86fcc0472eb134890109692f561>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -177,9 +177,9 @@ v16 = {
 v17 = {
   "alias": null,
   "args": null,
-  "concreteType": "SpanEvaluation",
+  "concreteType": "SpanAnnotation",
   "kind": "LinkedField",
-  "name": "spanEvaluations",
+  "name": "spanAnnotations",
   "plural": true,
   "selections": [
     (v9/*: any*/),
@@ -196,6 +196,13 @@ v17 = {
       "kind": "ScalarField",
       "name": "score",
       "storageKey": null
+    },
+    {
+      "alias": null,
+      "args": null,
+      "kind": "ScalarField",
+      "name": "annotatorKind",
+      "storageKey": null
     }
   ],
   "storageKey": null
@@ -388,7 +395,7 @@ return {
                 "alias": null,
                 "args": null,
                 "kind": "ScalarField",
-                "name": "spanEvaluationNames",
+                "name": "spanAnnotationNames",
                 "storageKey": null
               },
               {
@@ -667,6 +674,13 @@ return {
                 "name": "latencyMsQuantile",
                 "storageKey": null
               },
+              {
+                "alias": null,
+                "args": null,
+                "kind": "ScalarField",
+                "name": "spanEvaluationNames",
+                "storageKey": null
+              },
               {
                 "alias": null,
                 "args": null,
@@ -691,12 +705,12 @@ return {
     ]
   },
   "params": {
-    "cacheID": "f91a1a2f14ed08ee58a7f39925bac3c8",
+    "cacheID": "539da5f4849b560efb575b6b053b46b1",
     "id": null,
     "metadata": {},
     "name": "ProjectPageQuery",
     "operationKind": "query",
-    "text": "query ProjectPageQuery(\n  $id: GlobalID!\n  $timeRange: TimeRange!\n) {\n  project: node(id: $id) {\n    __typename\n    ...SpansTable_spans\n    ...TracesTable_spans\n    ...ProjectPageHeader_stats\n    ...StreamToggle_data\n    __isNode: __typename\n    id\n  }\n}\n\nfragment ProjectPageHeader_stats on Project {\n  traceCount(timeRange: $timeRange)\n  tokenCountTotal(timeRange: $timeRange)\n  latencyMsP50: latencyMsQuantile(probability: 0.5, timeRange: $timeRange)\n  latencyMsP99: latencyMsQuantile(probability: 0.99, timeRange: $timeRange)\n  spanEvaluationNames\n  documentEvaluationNames\n  id\n}\n\nfragment SpanColumnSelector_evaluations on Project {\n  spanEvaluationNames\n}\n\nfragment SpansTable_spans on Project {\n  ...SpanColumnSelector_evaluations\n  spans(first: 100, sort: {col: startTime, dir: desc}, timeRange: $timeRange) {\n    edges {\n      span: node {\n        id\n        spanKind\n        name\n        metadata\n        statusCode\n        startTime\n        latencyMs\n        tokenCountTotal\n        tokenCountPrompt\n        tokenCountCompletion\n        context {\n          spanId\n          traceId\n        }\n        input {\n          value: truncatedValue\n        }\n        output {\n          value: truncatedValue\n        }\n        spanEvaluations {\n          name\n          label\n          score\n        }\n        documentRetrievalMetrics {\n          evaluationName\n          ndcg\n          precision\n          hit\n        }\n      }\n      cursor\n      node {\n        __typename\n      }\n    }\n    pageInfo {\n      endCursor\n      hasNextPage\n    }\n  }\n  id\n}\n\nfragment StreamToggle_data on Project {\n  streamingLastUpdatedAt\n  id\n}\n\nfragment TracesTable_spans on Project {\n  ...SpanColumnSelector_evaluations\n  rootSpans: spans(first: 100, sort: {col: startTime, dir: desc}, rootSpansOnly: true, timeRange: $timeRange) {\n    edges {\n      rootSpan: node {\n        id\n        spanKind\n        name\n        metadata\n        statusCode: propagatedStatusCode\n        startTime\n        latencyMs\n        cumulativeTokenCountTotal\n        cumulativeTokenCountPrompt\n        cumulativeTokenCountCompletion\n        parentId\n        input {\n          value: truncatedValue\n        }\n        output {\n          value: truncatedValue\n        }\n        context {\n          spanId\n          traceId\n        }\n        spanEvaluations {\n          name\n          label\n          score\n        }\n        documentRetrievalMetrics {\n          evaluationName\n          ndcg\n          precision\n          hit\n        }\n        descendants {\n          id\n          spanKind\n          name\n          statusCode: propagatedStatusCode\n          startTime\n          latencyMs\n          parentId\n          cumulativeTokenCountTotal: tokenCountTotal\n          cumulativeTokenCountPrompt: tokenCountPrompt\n          cumulativeTokenCountCompletion: tokenCountCompletion\n          input {\n            value\n          }\n          output {\n            value\n          }\n          context {\n            spanId\n            traceId\n          }\n          spanEvaluations {\n            name\n            label\n            score\n          }\n          documentRetrievalMetrics {\n            evaluationName\n            ndcg\n            precision\n            hit\n          }\n        }\n      }\n      cursor\n      node {\n        __typename\n      }\n    }\n    pageInfo {\n      endCursor\n      hasNextPage\n    }\n  }\n  id\n}\n"
+    "text": "query ProjectPageQuery(\n  $id: GlobalID!\n  $timeRange: TimeRange!\n) {\n  project: node(id: $id) {\n    __typename\n    ...SpansTable_spans\n    ...TracesTable_spans\n    ...ProjectPageHeader_stats\n    ...StreamToggle_data\n    __isNode: __typename\n    id\n  }\n}\n\nfragment ProjectPageHeader_stats on Project {\n  traceCount(timeRange: $timeRange)\n  tokenCountTotal(timeRange: $timeRange)\n  latencyMsP50: latencyMsQuantile(probability: 0.5, timeRange: $timeRange)\n  latencyMsP99: latencyMsQuantile(probability: 0.99, timeRange: $timeRange)\n  spanEvaluationNames\n  documentEvaluationNames\n  id\n}\n\nfragment SpanColumnSelector_annotations on Project {\n  spanAnnotationNames\n}\n\nfragment SpansTable_spans on Project {\n  ...SpanColumnSelector_annotations\n  spans(first: 100, sort: {col: startTime, dir: desc}, timeRange: $timeRange) {\n    edges {\n      span: node {\n        id\n        spanKind\n        name\n        metadata\n        statusCode\n        startTime\n        latencyMs\n        tokenCountTotal\n        tokenCountPrompt\n        tokenCountCompletion\n        context {\n          spanId\n          traceId\n        }\n        input {\n          value: truncatedValue\n        }\n        output {\n          value: truncatedValue\n        }\n        spanAnnotations {\n          name\n          label\n          score\n          annotatorKind\n        }\n        documentRetrievalMetrics {\n          evaluationName\n          ndcg\n          precision\n          hit\n        }\n      }\n      cursor\n      node {\n        __typename\n      }\n    }\n    pageInfo {\n      endCursor\n      hasNextPage\n    }\n  }\n  id\n}\n\nfragment StreamToggle_data on Project {\n  streamingLastUpdatedAt\n  id\n}\n\nfragment TracesTable_spans on Project {\n  ...SpanColumnSelector_annotations\n  rootSpans: spans(first: 100, sort: {col: startTime, dir: desc}, rootSpansOnly: true, timeRange: $timeRange) {\n    edges {\n      rootSpan: node {\n        id\n        spanKind\n        name\n        metadata\n        statusCode: propagatedStatusCode\n        startTime\n        latencyMs\n        cumulativeTokenCountTotal\n        cumulativeTokenCountPrompt\n        cumulativeTokenCountCompletion\n        parentId\n        input {\n          value: truncatedValue\n        }\n        output {\n          value: truncatedValue\n        }\n        context {\n          spanId\n          traceId\n        }\n        spanAnnotations {\n          name\n          label\n          score\n          annotatorKind\n        }\n        documentRetrievalMetrics {\n          evaluationName\n          ndcg\n          precision\n          hit\n        }\n        descendants {\n          id\n          spanKind\n          name\n          statusCode: propagatedStatusCode\n          startTime\n          latencyMs\n          parentId\n          cumulativeTokenCountTotal: tokenCountTotal\n          cumulativeTokenCountPrompt: tokenCountPrompt\n          cumulativeTokenCountCompletion: tokenCountCompletion\n          input {\n            value\n          }\n          output {\n            value\n          }\n          context {\n            spanId\n            traceId\n          }\n          spanAnnotations {\n            name\n            label\n            score\n            annotatorKind\n          }\n          documentRetrievalMetrics {\n            evaluationName\n            ndcg\n            precision\n            hit\n          }\n        }\n      }\n      cursor\n      node {\n        __typename\n      }\n    }\n    pageInfo {\n      endCursor\n      hasNextPage\n    }\n  }\n  id\n}\n"
   }
 };
 })();
diff --git a/app/src/pages/project/__generated__/SpanColumnSelector_evaluations.graphql.ts b/app/src/pages/project/__generated__/SpanColumnSelector_annotations.graphql.ts
similarity index 53%
rename from app/src/pages/project/__generated__/SpanColumnSelector_evaluations.graphql.ts
rename to app/src/pages/project/__generated__/SpanColumnSelector_annotations.graphql.ts
index bd394b2228..c752c7d00c 100644
--- a/app/src/pages/project/__generated__/SpanColumnSelector_evaluations.graphql.ts
+++ b/app/src/pages/project/__generated__/SpanColumnSelector_annotations.graphql.ts
@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<9db5417ea510c52a55a92eee37bad681>>
+ * @generated SignedSource<<2957a55fe97962ace0f1ac8fb466e632>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -10,26 +10,26 @@
 
 import { Fragment, ReaderFragment } from 'relay-runtime';
 import { FragmentRefs } from "relay-runtime";
-export type SpanColumnSelector_evaluations$data = {
-  readonly spanEvaluationNames: ReadonlyArray<string>;
-  readonly " $fragmentType": "SpanColumnSelector_evaluations";
+export type SpanColumnSelector_annotations$data = {
+  readonly spanAnnotationNames: ReadonlyArray<string>;
+  readonly " $fragmentType": "SpanColumnSelector_annotations";
 };
-export type SpanColumnSelector_evaluations$key = {
-  readonly " $data"?: SpanColumnSelector_evaluations$data;
-  readonly " $fragmentSpreads": FragmentRefs<"SpanColumnSelector_evaluations">;
+export type SpanColumnSelector_annotations$key = {
+  readonly " $data"?: SpanColumnSelector_annotations$data;
+  readonly " $fragmentSpreads": FragmentRefs<"SpanColumnSelector_annotations">;
 };
 
 const node: ReaderFragment = {
   "argumentDefinitions": [],
   "kind": "Fragment",
   "metadata": null,
-  "name": "SpanColumnSelector_evaluations",
+  "name": "SpanColumnSelector_annotations",
   "selections": [
     {
       "alias": null,
       "args": null,
       "kind": "ScalarField",
-      "name": "spanEvaluationNames",
+      "name": "spanAnnotationNames",
       "storageKey": null
     }
   ],
@@ -37,6 +37,6 @@ const node: ReaderFragment = {
   "abstractKey": null
 };
 
-(node as any).hash = "b15c9caa847912fdb7b07a0c01a69ed9";
+(node as any).hash = "ad01e6897ad1ea779eb346d85783b8b4";
 
 export default node;
diff --git a/app/src/pages/project/__generated__/SpansTableSpansQuery.graphql.ts b/app/src/pages/project/__generated__/SpansTableSpansQuery.graphql.ts
index d71777c6e1..aa4f6fdbaf 100644
--- a/app/src/pages/project/__generated__/SpansTableSpansQuery.graphql.ts
+++ b/app/src/pages/project/__generated__/SpansTableSpansQuery.graphql.ts
@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<e8be7057253b134c8b01970cd9616d43>>
+ * @generated SignedSource<<5df7e86b7ae6ac02c1702049887f3b05>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -219,7 +219,7 @@ return {
                 "alias": null,
                 "args": null,
                 "kind": "ScalarField",
-                "name": "spanEvaluationNames",
+                "name": "spanAnnotationNames",
                 "storageKey": null
               },
               {
@@ -352,9 +352,9 @@ return {
                           {
                             "alias": null,
                             "args": null,
-                            "concreteType": "SpanEvaluation",
+                            "concreteType": "SpanAnnotation",
                             "kind": "LinkedField",
-                            "name": "spanEvaluations",
+                            "name": "spanAnnotations",
                             "plural": true,
                             "selections": [
                               (v14/*: any*/),
@@ -371,6 +371,13 @@ return {
                                 "kind": "ScalarField",
                                 "name": "score",
                                 "storageKey": null
+                              },
+                              {
+                                "alias": null,
+                                "args": null,
+                                "kind": "ScalarField",
+                                "name": "annotatorKind",
+                                "storageKey": null
                               }
                             ],
                             "storageKey": null
@@ -490,16 +497,16 @@ return {
     ]
   },
   "params": {
-    "cacheID": "2413f18f0d411113ca2ad6117d901511",
+    "cacheID": "938a1015155332341be66c168d59e627",
     "id": null,
     "metadata": {},
     "name": "SpansTableSpansQuery",
     "operationKind": "query",
-    "text": "query SpansTableSpansQuery(\n  $after: String = null\n  $filterCondition: String = null\n  $first: Int = 100\n  $sort: SpanSort = {col: startTime, dir: desc}\n  $timeRange: TimeRange\n  $id: GlobalID!\n) {\n  node(id: $id) {\n    __typename\n    ...SpansTable_spans_1XEuU\n    __isNode: __typename\n    id\n  }\n}\n\nfragment SpanColumnSelector_evaluations on Project {\n  spanEvaluationNames\n}\n\nfragment SpansTable_spans_1XEuU on Project {\n  ...SpanColumnSelector_evaluations\n  spans(first: $first, after: $after, sort: $sort, filterCondition: $filterCondition, timeRange: $timeRange) {\n    edges {\n      span: node {\n        id\n        spanKind\n        name\n        metadata\n        statusCode\n        startTime\n        latencyMs\n        tokenCountTotal\n        tokenCountPrompt\n        tokenCountCompletion\n        context {\n          spanId\n          traceId\n        }\n        input {\n          value: truncatedValue\n        }\n        output {\n          value: truncatedValue\n        }\n        spanEvaluations {\n          name\n          label\n          score\n        }\n        documentRetrievalMetrics {\n          evaluationName\n          ndcg\n          precision\n          hit\n        }\n      }\n      cursor\n      node {\n        __typename\n      }\n    }\n    pageInfo {\n      endCursor\n      hasNextPage\n    }\n  }\n  id\n}\n"
+    "text": "query SpansTableSpansQuery(\n  $after: String = null\n  $filterCondition: String = null\n  $first: Int = 100\n  $sort: SpanSort = {col: startTime, dir: desc}\n  $timeRange: TimeRange\n  $id: GlobalID!\n) {\n  node(id: $id) {\n    __typename\n    ...SpansTable_spans_1XEuU\n    __isNode: __typename\n    id\n  }\n}\n\nfragment SpanColumnSelector_annotations on Project {\n  spanAnnotationNames\n}\n\nfragment SpansTable_spans_1XEuU on Project {\n  ...SpanColumnSelector_annotations\n  spans(first: $first, after: $after, sort: $sort, filterCondition: $filterCondition, timeRange: $timeRange) {\n    edges {\n      span: node {\n        id\n        spanKind\n        name\n        metadata\n        statusCode\n        startTime\n        latencyMs\n        tokenCountTotal\n        tokenCountPrompt\n        tokenCountCompletion\n        context {\n          spanId\n          traceId\n        }\n        input {\n          value: truncatedValue\n        }\n        output {\n          value: truncatedValue\n        }\n        spanAnnotations {\n          name\n          label\n          score\n          annotatorKind\n        }\n        documentRetrievalMetrics {\n          evaluationName\n          ndcg\n          precision\n          hit\n        }\n      }\n      cursor\n      node {\n        __typename\n      }\n    }\n    pageInfo {\n      endCursor\n      hasNextPage\n    }\n  }\n  id\n}\n"
   }
 };
 })();
 
-(node as any).hash = "78738e3d457d0b4140c9bb4f4dc1180a";
+(node as any).hash = "ef6b4331ce615d951d110ac9d5eab0f9";
 
 export default node;
diff --git a/app/src/pages/project/__generated__/SpansTable_spans.graphql.ts b/app/src/pages/project/__generated__/SpansTable_spans.graphql.ts
index 8171fda981..56d70a274f 100644
--- a/app/src/pages/project/__generated__/SpansTable_spans.graphql.ts
+++ b/app/src/pages/project/__generated__/SpansTable_spans.graphql.ts
@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<3279623b77e3705588b8f404aebf9664>>
+ * @generated SignedSource<<5534923df703a32c3e25bfaad9f91e6a>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -9,6 +9,7 @@
 // @ts-nocheck
 
 import { ReaderFragment, RefetchableFragment } from 'relay-runtime';
+export type AnnotatorKind = "HUMAN" | "LLM";
 export type SpanKind = "agent" | "chain" | "embedding" | "evaluator" | "guardrail" | "llm" | "reranker" | "retriever" | "tool" | "unknown";
 export type SpanStatusCode = "ERROR" | "OK" | "UNSET";
 import { FragmentRefs } from "relay-runtime";
@@ -37,7 +38,8 @@ export type SpansTable_spans$data = {
         readonly output: {
           readonly value: string;
         } | null;
-        readonly spanEvaluations: ReadonlyArray<{
+        readonly spanAnnotations: ReadonlyArray<{
+          readonly annotatorKind: AnnotatorKind;
           readonly label: string | null;
           readonly name: string;
           readonly score: number | null;
@@ -51,7 +53,7 @@ export type SpansTable_spans$data = {
       };
     }>;
   };
-  readonly " $fragmentSpreads": FragmentRefs<"SpanColumnSelector_evaluations">;
+  readonly " $fragmentSpreads": FragmentRefs<"SpanColumnSelector_annotations">;
   readonly " $fragmentType": "SpansTable_spans";
 };
 export type SpansTable_spans$key = {
@@ -152,7 +154,7 @@ return {
     {
       "args": null,
       "kind": "FragmentSpread",
-      "name": "SpanColumnSelector_evaluations"
+      "name": "SpanColumnSelector_annotations"
     },
     {
       "alias": "spans",
@@ -300,9 +302,9 @@ return {
                 {
                   "alias": null,
                   "args": null,
-                  "concreteType": "SpanEvaluation",
+                  "concreteType": "SpanAnnotation",
                   "kind": "LinkedField",
-                  "name": "spanEvaluations",
+                  "name": "spanAnnotations",
                   "plural": true,
                   "selections": [
                     (v2/*: any*/),
@@ -319,6 +321,13 @@ return {
                       "kind": "ScalarField",
                       "name": "score",
                       "storageKey": null
+                    },
+                    {
+                      "alias": null,
+                      "args": null,
+                      "kind": "ScalarField",
+                      "name": "annotatorKind",
+                      "storageKey": null
                     }
                   ],
                   "storageKey": null
@@ -428,6 +437,6 @@ return {
 };
 })();
 
-(node as any).hash = "78738e3d457d0b4140c9bb4f4dc1180a";
+(node as any).hash = "ef6b4331ce615d951d110ac9d5eab0f9";
 
 export default node;
diff --git a/app/src/pages/project/__generated__/TracesTableQuery.graphql.ts b/app/src/pages/project/__generated__/TracesTableQuery.graphql.ts
index 09f3e9bfa1..c20ce9ac92 100644
--- a/app/src/pages/project/__generated__/TracesTableQuery.graphql.ts
+++ b/app/src/pages/project/__generated__/TracesTableQuery.graphql.ts
@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<6e4d1c5341bc49d250c97a667a770e56>>
+ * @generated SignedSource<<9f7c3cff9aea00753f29c80de58a3dcd>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -214,9 +214,9 @@ v21 = {
 v22 = {
   "alias": null,
   "args": null,
-  "concreteType": "SpanEvaluation",
+  "concreteType": "SpanAnnotation",
   "kind": "LinkedField",
-  "name": "spanEvaluations",
+  "name": "spanAnnotations",
   "plural": true,
   "selections": [
     (v15/*: any*/),
@@ -233,6 +233,13 @@ v22 = {
       "kind": "ScalarField",
       "name": "score",
       "storageKey": null
+    },
+    {
+      "alias": null,
+      "args": null,
+      "kind": "ScalarField",
+      "name": "annotatorKind",
+      "storageKey": null
     }
   ],
   "storageKey": null
@@ -358,7 +365,7 @@ return {
                 "alias": null,
                 "args": null,
                 "kind": "ScalarField",
-                "name": "spanEvaluationNames",
+                "name": "spanAnnotationNames",
                 "storageKey": null
               },
               {
@@ -582,16 +589,16 @@ return {
     ]
   },
   "params": {
-    "cacheID": "82574e0f30ec618a7a89afd7c4664347",
+    "cacheID": "6a5266217105c0fec1dfeb7e3e9a7110",
     "id": null,
     "metadata": {},
     "name": "TracesTableQuery",
     "operationKind": "query",
-    "text": "query TracesTableQuery(\n  $after: String = null\n  $filterCondition: String = null\n  $first: Int = 100\n  $sort: SpanSort = {col: startTime, dir: desc}\n  $timeRange: TimeRange\n  $id: GlobalID!\n) {\n  node(id: $id) {\n    __typename\n    ...TracesTable_spans_1XEuU\n    __isNode: __typename\n    id\n  }\n}\n\nfragment SpanColumnSelector_evaluations on Project {\n  spanEvaluationNames\n}\n\nfragment TracesTable_spans_1XEuU on Project {\n  ...SpanColumnSelector_evaluations\n  rootSpans: spans(first: $first, after: $after, sort: $sort, rootSpansOnly: true, filterCondition: $filterCondition, timeRange: $timeRange) {\n    edges {\n      rootSpan: node {\n        id\n        spanKind\n        name\n        metadata\n        statusCode: propagatedStatusCode\n        startTime\n        latencyMs\n        cumulativeTokenCountTotal\n        cumulativeTokenCountPrompt\n        cumulativeTokenCountCompletion\n        parentId\n        input {\n          value: truncatedValue\n        }\n        output {\n          value: truncatedValue\n        }\n        context {\n          spanId\n          traceId\n        }\n        spanEvaluations {\n          name\n          label\n          score\n        }\n        documentRetrievalMetrics {\n          evaluationName\n          ndcg\n          precision\n          hit\n        }\n        descendants {\n          id\n          spanKind\n          name\n          statusCode: propagatedStatusCode\n          startTime\n          latencyMs\n          parentId\n          cumulativeTokenCountTotal: tokenCountTotal\n          cumulativeTokenCountPrompt: tokenCountPrompt\n          cumulativeTokenCountCompletion: tokenCountCompletion\n          input {\n            value\n          }\n          output {\n            value\n          }\n          context {\n            spanId\n            traceId\n          }\n          spanEvaluations {\n            name\n            label\n            score\n          }\n          documentRetrievalMetrics {\n            evaluationName\n            ndcg\n            precision\n            hit\n          }\n        }\n      }\n      cursor\n      node {\n        __typename\n      }\n    }\n    pageInfo {\n      endCursor\n      hasNextPage\n    }\n  }\n  id\n}\n"
+    "text": "query TracesTableQuery(\n  $after: String = null\n  $filterCondition: String = null\n  $first: Int = 100\n  $sort: SpanSort = {col: startTime, dir: desc}\n  $timeRange: TimeRange\n  $id: GlobalID!\n) {\n  node(id: $id) {\n    __typename\n    ...TracesTable_spans_1XEuU\n    __isNode: __typename\n    id\n  }\n}\n\nfragment SpanColumnSelector_annotations on Project {\n  spanAnnotationNames\n}\n\nfragment TracesTable_spans_1XEuU on Project {\n  ...SpanColumnSelector_annotations\n  rootSpans: spans(first: $first, after: $after, sort: $sort, rootSpansOnly: true, filterCondition: $filterCondition, timeRange: $timeRange) {\n    edges {\n      rootSpan: node {\n        id\n        spanKind\n        name\n        metadata\n        statusCode: propagatedStatusCode\n        startTime\n        latencyMs\n        cumulativeTokenCountTotal\n        cumulativeTokenCountPrompt\n        cumulativeTokenCountCompletion\n        parentId\n        input {\n          value: truncatedValue\n        }\n        output {\n          value: truncatedValue\n        }\n        context {\n          spanId\n          traceId\n        }\n        spanAnnotations {\n          name\n          label\n          score\n          annotatorKind\n        }\n        documentRetrievalMetrics {\n          evaluationName\n          ndcg\n          precision\n          hit\n        }\n        descendants {\n          id\n          spanKind\n          name\n          statusCode: propagatedStatusCode\n          startTime\n          latencyMs\n          parentId\n          cumulativeTokenCountTotal: tokenCountTotal\n          cumulativeTokenCountPrompt: tokenCountPrompt\n          cumulativeTokenCountCompletion: tokenCountCompletion\n          input {\n            value\n          }\n          output {\n            value\n          }\n          context {\n            spanId\n            traceId\n          }\n          spanAnnotations {\n            name\n            label\n            score\n            annotatorKind\n          }\n          documentRetrievalMetrics {\n            evaluationName\n            ndcg\n            precision\n            hit\n          }\n        }\n      }\n      cursor\n      node {\n        __typename\n      }\n    }\n    pageInfo {\n      endCursor\n      hasNextPage\n    }\n  }\n  id\n}\n"
   }
 };
 })();
 
-(node as any).hash = "b8e7c42b9731568c7e348cf191017d06";
+(node as any).hash = "6dd76b0c3ddcb8491f14c35175f67dc8";
 
 export default node;
diff --git a/app/src/pages/project/__generated__/TracesTable_spans.graphql.ts b/app/src/pages/project/__generated__/TracesTable_spans.graphql.ts
index 9b6ea80253..5e88aacaf1 100644
--- a/app/src/pages/project/__generated__/TracesTable_spans.graphql.ts
+++ b/app/src/pages/project/__generated__/TracesTable_spans.graphql.ts
@@ -1,5 +1,5 @@
 /**
- * @generated SignedSource<<86aad576a5c4b57f8ef62320d15eed04>>
+ * @generated SignedSource<<4ff736e26375f2eac66ded47d857916e>>
  * @lightSyntaxTransform
  * @nogrep
  */
@@ -9,6 +9,7 @@
 // @ts-nocheck
 
 import { ReaderFragment, RefetchableFragment } from 'relay-runtime';
+export type AnnotatorKind = "HUMAN" | "LLM";
 export type SpanKind = "agent" | "chain" | "embedding" | "evaluator" | "guardrail" | "llm" | "reranker" | "retriever" | "tool" | "unknown";
 export type SpanStatusCode = "ERROR" | "OK" | "UNSET";
 import { FragmentRefs } from "relay-runtime";
@@ -48,7 +49,8 @@ export type TracesTable_spans$data = {
             readonly value: string;
           } | null;
           readonly parentId: string | null;
-          readonly spanEvaluations: ReadonlyArray<{
+          readonly spanAnnotations: ReadonlyArray<{
+            readonly annotatorKind: AnnotatorKind;
             readonly label: string | null;
             readonly name: string;
             readonly score: number | null;
@@ -74,7 +76,8 @@ export type TracesTable_spans$data = {
           readonly value: string;
         } | null;
         readonly parentId: string | null;
-        readonly spanEvaluations: ReadonlyArray<{
+        readonly spanAnnotations: ReadonlyArray<{
+          readonly annotatorKind: AnnotatorKind;
           readonly label: string | null;
           readonly name: string;
           readonly score: number | null;
@@ -85,7 +88,7 @@ export type TracesTable_spans$data = {
       };
     }>;
   };
-  readonly " $fragmentSpreads": FragmentRefs<"SpanColumnSelector_evaluations">;
+  readonly " $fragmentSpreads": FragmentRefs<"SpanColumnSelector_annotations">;
   readonly " $fragmentType": "TracesTable_spans";
 };
 export type TracesTable_spans$key = {
@@ -185,9 +188,9 @@ v9 = {
 v10 = {
   "alias": null,
   "args": null,
-  "concreteType": "SpanEvaluation",
+  "concreteType": "SpanAnnotation",
   "kind": "LinkedField",
-  "name": "spanEvaluations",
+  "name": "spanAnnotations",
   "plural": true,
   "selections": [
     (v3/*: any*/),
@@ -204,6 +207,13 @@ v10 = {
       "kind": "ScalarField",
       "name": "score",
       "storageKey": null
+    },
+    {
+      "alias": null,
+      "args": null,
+      "kind": "ScalarField",
+      "name": "annotatorKind",
+      "storageKey": null
     }
   ],
   "storageKey": null
@@ -320,7 +330,7 @@ return {
     {
       "args": null,
       "kind": "FragmentSpread",
-      "name": "SpanColumnSelector_evaluations"
+      "name": "SpanColumnSelector_annotations"
     },
     {
       "alias": "rootSpans",
@@ -553,6 +563,6 @@ return {
 };
 })();
 
-(node as any).hash = "b8e7c42b9731568c7e348cf191017d06";
+(node as any).hash = "6dd76b0c3ddcb8491f14c35175f67dc8";
 
 export default node;
diff --git a/app/src/pages/project/tableUtils.ts b/app/src/pages/project/tableUtils.ts
index f694df5d0f..d8ad051327 100644
--- a/app/src/pages/project/tableUtils.ts
+++ b/app/src/pages/project/tableUtils.ts
@@ -5,8 +5,8 @@ import {
   TracesTableQuery$variables,
 } from "./__generated__/TracesTableQuery.graphql";
 
-export const EVALS_COLUMN_PREFIX = "evals";
-export const EVALS_KEY_SEPARATOR = ":";
+export const ANNOTATIONS_COLUMN_PREFIX = "annotations";
+export const ANNOTATIONS_KEY_SEPARATOR = ":";
 export const DEFAULT_SORT: SpanSort = {
   col: "startTime",
   dir: "desc",
@@ -17,8 +17,8 @@ export function getGqlSort(
 ): TracesTableQuery$variables["sort"] {
   let col = null,
     evalResultKey = null;
-  if (sort.id && sort.id.startsWith(EVALS_COLUMN_PREFIX)) {
-    const [, attr, name] = sort.id.split(EVALS_KEY_SEPARATOR);
+  if (sort.id && sort.id.startsWith(ANNOTATIONS_COLUMN_PREFIX)) {
+    const [, attr, name] = sort.id.split(ANNOTATIONS_KEY_SEPARATOR);
     evalResultKey = {
       attr,
       name,
diff --git a/app/src/store/tracingStore.tsx b/app/src/store/tracingStore.tsx
index 97611a7bc3..29eb967b6f 100644
--- a/app/src/store/tracingStore.tsx
+++ b/app/src/store/tracingStore.tsx
@@ -8,9 +8,9 @@ export interface TracingProps {
    */
   columnVisibility: VisibilityState;
   /**
-   * Map of the evaluation names that are toggled on
+   * Map of the annotation column names that are toggled on
    */
-  evaluationVisibility: VisibilityState;
+  annotationColumnVisibility: VisibilityState;
 }
 
 export interface TracingState extends TracingProps {
@@ -21,9 +21,11 @@ export interface TracingState extends TracingProps {
    */
   setColumnVisibility: (columnVisibility: VisibilityState) => void;
   /**
-   * Sets the visibility of the evaluation columns
+   * Sets the visibility of the annotation columns
    */
-  setEvaluationVisibility: (evaluationVisibility: VisibilityState) => void;
+  setAnnotationColumnVisibility: (
+    annotationColumnVisibility: VisibilityState
+  ) => void;
 }
 
 export const createTracingStore = (initialProps?: Partial<TracingProps>) => {
@@ -32,12 +34,12 @@ export const createTracingStore = (initialProps?: Partial<TracingProps>) => {
     columnVisibility: {
       metadata: false,
     },
-    evaluationVisibility: {},
+    annotationColumnVisibility: {},
     setColumnVisibility: (columnVisibility) => {
       set({ columnVisibility });
     },
-    setEvaluationVisibility: (evaluationVisibility) => {
-      set({ evaluationVisibility });
+    setAnnotationColumnVisibility: (annotationColumnVisibility) => {
+      set({ annotationColumnVisibility });
     },
   });
   return create<TracingState>()(devtools(tracingStore));