From 967426eb85741b005cf15fdd550eff46bf1bb6f0 Mon Sep 17 00:00:00 2001
From: Josef Hardi <josef.hardi@gmail.com>
Date: Fri, 23 Aug 2024 11:04:57 -0700
Subject: [PATCH] Rename properties

---
 schemas/src/digital-objects/asct-b.yaml | 12 ++++++------
 src/normalization/normalize-asct-b.js   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/schemas/src/digital-objects/asct-b.yaml b/schemas/src/digital-objects/asct-b.yaml
index 4643f62..af4a69f 100644
--- a/schemas/src/digital-objects/asct-b.yaml
+++ b/schemas/src/digital-objects/asct-b.yaml
@@ -130,8 +130,8 @@ classes:
       - Named
       - Instance
     slots:
-      - target_cell_type
-      - cell_type_location
+      - primary_cell_type
+      - primary_anatomical_structure
       - biomarker_set
       - references
       - derived_from
@@ -315,15 +315,15 @@ slots:
     slot_uri: ccf:proteoforms_marker_item
     annotations:
       owl: AnnotationAssertion, AnnotationProperty
-  target_cell_type:
+  primary_cell_type:
     required: true
-    slot_uri: ccf:target_cell_type
+    slot_uri: ccf:primary_cell_type
     range: CellType
     annotations:
       owl: AnnotationAssertion, AnnotationProperty
-  cell_type_location:
+  primary_anatomical_structure:
     required: true
-    slot_uri: ccf:cell_type_location
+    slot_uri: ccf:primary_anatomical_structure
     range: AnatomicalStructure
     annotations:
       owl: AnnotationAssertion, AnnotationProperty
diff --git a/src/normalization/normalize-asct-b.js b/src/normalization/normalize-asct-b.js
index 6edaea8..d69abfa 100644
--- a/src/normalization/normalize-asct-b.js
+++ b/src/normalization/normalize-asct-b.js
@@ -352,8 +352,8 @@ function normalizeCellMarkerDescriptor(context, data) {
       id: generateCellMarkerDescriptorId(context, recordNumber),
       label: `Cell marker descriptor for ${lastCt.name}`,
       type_of: [`CellMarkerDescriptor`],
-      target_cell_type: lastCt.id,
-      cell_type_location: lastAs,
+      primary_cell_type: lastCt.id,
+      primary_anatomical_structure: lastAs,
       biomarker_set: validBm,
       references: validReferences,
       derived_from: generateAsctbRecordId(context, recordNumber)