diff --git a/schema/core-person.json b/schema/core-person.json
index 8b41e00..cff4513 100644
--- a/schema/core-person.json
+++ b/schema/core-person.json
@@ -8,17 +8,17 @@
     "name": {
       "$ref": "#/components/schemas/name"
     },
-    "userLogon": {
-      "$ref": "#/components/schemas/userLogon"
+    "logon-id": {
+      "$ref": "#/components/schemas/logon-id"
     },
-    "institutionalId": {
-      "$ref": "#/components/schemas/institutionalId"
+    "subject-id": {
+      "$ref": "#/components/schemas/subject-id"
     },
-     "priorInstId": {
-      "$ref": "#/components/schemas/priorInstId"
+     "priorSubject-id": {
+      "$ref": "#/components/schemas/priorSubject-id"
     },
-    "identifier": {
-      "$ref": "#/components/schemas/identifier"
+    "sourcedId": {
+      "$ref": "#/components/schemas/sourcedId"
     },
 
     "birthDate": {
@@ -55,38 +55,30 @@
           }
         }
       },
-      "userLogon": {
+      "logon-id": {
         "type": "string",
         "description": "same as identifier/network in Core Attribute Specification"
       },
-      "institutionalId": {
+      "subject-id": {
         "type": "string",
         "description": "same as identifier/enterprise in Core Attribute Specification"
       },
-      "priorInstId": {
+      "priorSubject-id": {
          "type": "array",
         "items": {
            "type": "object",
           "properties": {
             "id": {
              "type": "string"
-            },
-            "source": {
-              "type": "string"
             }
           }
         }
       },
-      "identifier": {
+      "sourcedId": {
         "type": "array",
         "items": {
-           "type": "object",
-          "properties": {
-            "id": {
+             "id": {
              "type": "string"
-            },
-            "source": {
-              "type": "string"
             }
           }
         }
@@ -101,9 +93,6 @@
           "properties": {
             "emailAddress": {
             "type": "string"
-          },
-            "emailType": {
-            "type": "string"
           }
         }
       }