diff --git a/src/reports/biospecimen-data/configKfNext.ts b/src/reports/biospecimen-data/configKfNext.ts
index ea3907c..2d563fa 100644
--- a/src/reports/biospecimen-data/configKfNext.ts
+++ b/src/reports/biospecimen-data/configKfNext.ts
@@ -19,14 +19,14 @@ const biospecimens: SheetConfig = {
         { field: 'status', header: 'Sample Availability' },
         { field: 'volume', header: 'Volume' },
         { field: 'volume_unit', header: 'Volume Unit' },
-        { field: 'method_of_sample_procurement', header: 'Method of Sample Procurement' },
-        { field: 'mondo_code', header: 'Histological Diagnosis (MONDO)' },
-        { field: 'ncit_code', header: 'Histological Diagnosis (NCIT)' },
-        { field: 'source_text', header: 'Histological Diagnosis (Source Text)' },
-        { field: 'source_text_tumor_location', header: 'Tumor Location (Source Text)' },
+        { field: 'collection_method_of_sample_procurement', header: 'Method of Sample Procurement' },
+        { field: 'diagnoses.diagnosis_mondo', header: 'Histological Diagnosis (MONDO)' },
+        { field: 'diagnoses.diagnosis_ncit', header: 'Histological Diagnosis (NCIT)' },
+        { field: 'diagnoses.source_text', header: 'Histological Diagnosis (Source Text)' },
+        { field: 'diagnoses.source_text_tumor_location', header: 'Tumor Location (Source Text)' },
         //FIXME { field: '', header: 'Tumor Descriptor (Source Text)' },
-        { field: 'ncit_anatomy_site_id', header: 'Anatomical Site (NCIT)' },
-        { field: 'anatomy_site', header: 'Anatomical Site (Source Text)' },
+        { field: 'collection_ncit_anatomy_site_id', header: 'Anatomical Site (NCIT)' },
+        { field: 'collection_anatomy_site', header: 'Anatomical Site (Source Text)' },
         // TODO: Add this back when it's ready { field: 'ncit_id_tissue_type', header: 'Tissue Type (NCIT)' },
         // TODO: Add this back when it's ready { field: 'tissue_type_source_text', header: 'Tissue Type (Source Text)' },
         { field: 'consent_type', header: 'Consent Type' },