diff --git a/schemas/atlas/parcellationEntity.schema.tpl.json b/schemas/atlas/parcellationEntity.schema.tpl.json
index b871cb0a0..8cb7608cc 100644
--- a/schemas/atlas/parcellationEntity.schema.tpl.json
+++ b/schemas/atlas/parcellationEntity.schema.tpl.json
@@ -21,7 +21,18 @@
       "items": {
         "type": "string"
       }
-    },      
+    },
+    "anatomicalEntity":{
+      "_instruction": "Add the related anatomical entity.",
+      "_linkedTypes": [
+        "controlledTerms:MuscularStructure",
+        "controlledTerms:NervousSystemStructure",
+        "controlledTerms:Organ",
+        "controlledTerms:SkeletalStructure",
+        "controlledTerms:TissueStructure",
+        "controlledTerms:VascularStructure"
+      ]
+    },
     "definition": {
       "type": "string",
       "_instruction": "Enter the definition for this parcellation entity."
@@ -54,13 +65,6 @@
           "iri"        
         ]
       }      
-    }, 
-    "relatedUBERONTerm":{
-      "_instruction": "Add the related anatomical entity as defined by the UBERON ontology.",
-      "_linkedTypes": [
-        "controlledTerms:Organ",
-        "controlledTerms:UBERONParcellation"
-      ]
     }
   }
 }
diff --git a/schemas/non-atlas/customAnatomicalEntity.schema.tpl.json b/schemas/non-atlas/customAnatomicalEntity.schema.tpl.json
index 7f1c2a423..fa9e7e9dd 100644
--- a/schemas/non-atlas/customAnatomicalEntity.schema.tpl.json
+++ b/schemas/non-atlas/customAnatomicalEntity.schema.tpl.json
@@ -8,6 +8,17 @@
     "name"
   ],
   "properties": {
+    "anatomicalEntity":{
+      "_instruction": "Add the related anatomical entity.",
+      "_linkedTypes": [
+        "controlledTerms:MuscularStructure",
+        "controlledTerms:NervousSystemStructure",
+        "controlledTerms:Organ",
+        "controlledTerms:SkeletalStructure",
+        "controlledTerms:TissueStructure",
+        "controlledTerms:VascularStructure"
+      ]
+    },
     "hasAnnotation": {
       "type": "array",
       "minItems": 1,
@@ -20,13 +31,6 @@
     "name": {
       "type": "string",
       "_instruction": "Enter a descriptive name for this custom anatomical entity."
-    },    
-    "relatedUBERONTerm":{
-      "_instruction": "Add the related anatomical entity as defined by the UBERON ontology.",
-      "_linkedTypes": [
-        "controlledTerms:Organ",
-        "controlledTerms:UBERONParcellation"
-      ]
     },
     "relationAssessment": {
       "type": "array",