diff --git a/.gencode_hash.txt b/.gencode_hash.txt
index fe83115014..f34f7089b8 100644
--- a/.gencode_hash.txt
+++ b/.gencode_hash.txt
@@ -7,15 +7,15 @@ a65e8177ca59cd51c4a8ff63ecaa194897f7e22b82afb14708d63efbd7b96a84  gencode/docs/c
 11b21f73b6a4065102968a4c09979639b8a7ea6efb20e40d52cd21b2a60167bb  gencode/docs/configuration_pod.html
 b34c136cee32cb88f32a427ff400c3898ed49168f6dcaca1bc9ba65365bc5ae4  gencode/docs/configuration_pubber.html
 1057fa40fb7a31a23bb2773d21c38cf4590a935bd8b5ea4218e695c6204f5dd9  gencode/docs/data_template.html
-ea06d489d98f96f8ac0134388fb4172b1fca6d924aba895c6e3119c19b0c7dc0  gencode/docs/events.html
+7335338a462cbd476bfacba8be66bbc3c0e2be6eaf9c9169d8d7455a9be3074f  gencode/docs/events.html
 70e57ad6ef39330d958727ebf9dcd61ef6ea30e4c8653eac412bf1867fdb3a70  gencode/docs/events_alarmset.html
-feb4138c5acee9b3626e9c2e541711cec304c0e67c2999e6d713ee2e7144ef53  gencode/docs/events_discovery.html
+05caeef731ef8f7e039350e19c7c2769fcaf4c45e08b1523560de918245c97f6  gencode/docs/events_discovery.html
 808ad1cad37e9f4bf08ea3631162a663998ce60fe8935cbd0ca5e548c3b6df2a  gencode/docs/events_mapping.html
 eafcc3c48189f605f114cde051fea9d13fc5f1a3e395d64fb0a91cb53d4c9aeb  gencode/docs/events_pointset.html
 cac253f57c5c92ef32e2a5f91b6cec8229e8db1dcffcc96a58f06da068e741e7  gencode/docs/events_system.html
 151c1b62db35e84e51d5ff2a7464f61ced4d7fb0c7eb795715c245ee0a1b3436  gencode/docs/events_udmi.html
 73dbe799e7943ec20ac58b544998e986a39539d4ef0cb4f5023e92e7634d3124  gencode/docs/events_validation.html
-0af72961d68e952c511f3edff1fb9d7c94ba1aadfa31fbe89128f8dae7f9703c  gencode/docs/metadata.html
+a6d4c6d1c291054590d82b8c581ff1189641be31a5e0a3ddc56587dbd789fd15  gencode/docs/metadata.html
 c86682715d348bd3dd971fa5bd925a8a3d0f3c2944c65a47c4b64fe1a5ccdea2  gencode/docs/monitoring.html
 474ca16edc9f3cad2bb3ab40b6993cbced90263f762f66ee6cd246a6c4a0d18f  gencode/docs/persistent_device.html
 e11595fd11477947a27461f8ef4fb6facb5f60e2abd6212193f7581ab123ff84  gencode/docs/properties.html
@@ -116,7 +116,7 @@ d48a48484965295327ef553a4f8552c44b9345224d7dbb847877c68c1e1b307e  gencode/java/u
 34704328b6074f96dbf6ce2f926c2e5bafcde5f1412ea50da74e9fa294de32ea  gencode/java/udmi/schema/PodConfiguration.java
 750ff98b9049990b8a56989cd41e19ce3216c5ed668719f5e1fce019db4b8bf0  gencode/java/udmi/schema/PointPointsetConfig.java
 43844df7c477fcb51e0bbf4f8a5e8b68631efa6b9cc4dee58bef82c619e64cc9  gencode/java/udmi/schema/PointPointsetEvents.java
-90a0a42def3a0e3a3b5ed1f01010324d1e4a9023aa48a5f56d24e7672441998c  gencode/java/udmi/schema/PointPointsetModel.java
+1c059256fd5f1ae9b517314588b542bea35d1bade2542a5a384fbd9985390aa8  gencode/java/udmi/schema/PointPointsetModel.java
 88ea66c1a8a1db71ee805a8facabafa0954690d0afd8a559758e50ec9624ed94  gencode/java/udmi/schema/PointPointsetState.java
 66c33eb0cc692fb4d0938967ac7eeacd6400c3ce31274f39aa7c26a65b884b41  gencode/java/udmi/schema/PointsetConfig.java
 f4735049f0c27c3f0669d8cf2d6dda6e25dc7d20cef598d5677e3a72943ff019  gencode/java/udmi/schema/PointsetEvents.java
@@ -229,7 +229,7 @@ c799ce667100201d81f02f0a5d22a4d0ef7db01035e7f08219a76a04c4507a15  gencode/python
 bdec4b1e8091db8420e813e22a57106acbdf77e7354e6b1ca38f3fd5fcff1141  gencode/python/udmi/schema/model_localnet.py
 e727422e0690d5cb6b45eb1e6771f6f676a429b2b9708af84490eddb6287b518  gencode/python/udmi/schema/model_localnet_family.py
 7a252256cce946af6750c644e91b0f09363c8e28b03dbb41c8ae3e5d0758d615  gencode/python/udmi/schema/model_pointset.py
-b27f7187d5aa69be9900bbb652dfbb09602dbde77f368f20523305636d18aea6  gencode/python/udmi/schema/model_pointset_point.py
+3f8ccf5035f1870e72f0f13d92102fe1d6d5e0a931def5ea437d7354be406d9c  gencode/python/udmi/schema/model_pointset_point.py
 f65ab38c968d1dc2ffb2d3eaf632f401e2b722ff0d6fe69abf20227f694c0d33  gencode/python/udmi/schema/model_policy.py
 53cc53278a4d387bd2f6f9d564be0b80dd470aae5d32bd79d0019fc6ec8dc138  gencode/python/udmi/schema/model_relationships.py
 241c702f6a877f41c0ebd997c7e431ba8e6d6c0d1b21bc95a9fc57592ff094a7  gencode/python/udmi/schema/model_system.py
diff --git a/bin/dbo_extract.py b/bin/dbo_extract.py
index 59488ea884..481478aee7 100755
--- a/bin/dbo_extract.py
+++ b/bin/dbo_extract.py
@@ -103,8 +103,8 @@ def extract_dbo_config(site_model_dir: Path) -> dict:
       if pt_dbo:
         translations[point_name] = pt_dbo
 
-      if "link" in point_info:
-        link_val = point_info["link"]
+      if "expr" in point_info:
+        link_val = point_info["expr"]
         if ":" in link_val:
           remote_device_id, remote_pt = link_val.split(":", 1)
           remote_guid = device_id_to_guid.get(
diff --git a/bin/dbo_merge.py b/bin/dbo_merge.py
index 15f1ae2ccc..608a54df2f 100755
--- a/bin/dbo_merge.py
+++ b/bin/dbo_merge.py
@@ -91,7 +91,7 @@ def merge_dbo_config(yaml_file: Path, site_model_dir: Path):
           target_code = guid_to_code.get(target_guid, target_guid)
           for local_pt, remote_pt in link_map.items():
             pt_udmi = points.setdefault(local_pt, {})
-            pt_udmi["link"] = f"{target_code}:{remote_pt}"
+            pt_udmi["expr"] = f"{target_code}:{remote_pt}"
 
     with open(metadata_path, "w", encoding="utf-8") as f:
       json.dump(metadata, f, indent=2)
diff --git a/gencode/docs/events.html b/gencode/docs/events.html
index 337a590403..b0d2fe71c6 100644
--- a/gencode/docs/events.html
+++ b/gencode/docs/events.html
@@ -16364,18 +16364,18 @@ <h2 class="mb-0">
         </div>
     </div>
 </div>
-<div class="accordion" id="accordiondiscovery_points_pattern1_link">
+<div class="accordion" id="accordiondiscovery_points_pattern1_expr">
     <div class="card">
-        <div class="card-header" id="headingdiscovery_points_pattern1_link">
+        <div class="card-header" id="headingdiscovery_points_pattern1_expr">
             <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#discovery_points_pattern1_link"
-                        aria-expanded="" aria-controls="discovery_points_pattern1_link" onclick="setAnchor('#discovery_points_pattern1_link')"><span class="property-name">link</span></button>
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#discovery_points_pattern1_expr"
+                        aria-expanded="" aria-controls="discovery_points_pattern1_expr" onclick="setAnchor('#discovery_points_pattern1_expr')"><span class="property-name">expr</span></button>
             </h2>
         </div>
 
-        <div id="discovery_points_pattern1_link"
-             class="collapse property-definition-div" aria-labelledby="headingdiscovery_points_pattern1_link"
-             data-parent="#accordiondiscovery_points_pattern1_link">
+        <div id="discovery_points_pattern1_expr"
+             class="collapse property-definition-div" aria-labelledby="headingdiscovery_points_pattern1_expr"
+             data-parent="#accordiondiscovery_points_pattern1_expr">
             <div class="card-body pl-5">
 
     <div class="breadcrumbs">root
@@ -16406,9 +16406,9 @@ <h2 class="mb-0">
                 d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
             />
         </svg>
-    <a href="#discovery_points_pattern1_link" onclick="anchorLink('discovery_points_pattern1_link')">link</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+    <a href="#discovery_points_pattern1_expr" onclick="anchorLink('discovery_points_pattern1_expr')">expr</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
 <span class="description"><p>Virtual equipment mapping linking this local point to a remote point in another device</p>
-</span><span class="pattern-value" id="discovery_points_pattern1_link_pattern">Must match regular expression: <code>^[-0-9a-zA-Z$]+:[a-z0-9_]+$</code></span>
+</span><span class="pattern-value" id="discovery_points_pattern1_expr_pattern">Must match regular expression: <code>^[-0-9a-zA-Z$]+:[a-z0-9_]+$</code></span>
         
 
         
@@ -16416,7 +16416,7 @@ <h2 class="mb-0">
 
         <br/>
 <div class="badge badge-secondary">Example:</div>
-<br/><div id="discovery_points_pattern1_link_ex1" class="jumbotron examples"><div class="highlight"><pre><span></span><span class="s2">&quot;VAV-3:supply_air_flowrate_sensor&quot;</span>
+<br/><div id="discovery_points_pattern1_expr_ex1" class="jumbotron examples"><div class="highlight"><pre><span></span><span class="s2">&quot;VAV-3:supply_air_flowrate_sensor&quot;</span>
 </pre></div>
 </div>
             </div>
diff --git a/gencode/docs/events_discovery.html b/gencode/docs/events_discovery.html
index 212c2cc3fe..2b54fc7b06 100644
--- a/gencode/docs/events_discovery.html
+++ b/gencode/docs/events_discovery.html
@@ -11307,18 +11307,18 @@ <h2 class="mb-0">
         </div>
     </div>
 </div>
-<div class="accordion" id="accordionpoints_pattern1_link">
+<div class="accordion" id="accordionpoints_pattern1_expr">
     <div class="card">
-        <div class="card-header" id="headingpoints_pattern1_link">
+        <div class="card-header" id="headingpoints_pattern1_expr">
             <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#points_pattern1_link"
-                        aria-expanded="" aria-controls="points_pattern1_link" onclick="setAnchor('#points_pattern1_link')"><span class="property-name">link</span></button>
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#points_pattern1_expr"
+                        aria-expanded="" aria-controls="points_pattern1_expr" onclick="setAnchor('#points_pattern1_expr')"><span class="property-name">expr</span></button>
             </h2>
         </div>
 
-        <div id="points_pattern1_link"
-             class="collapse property-definition-div" aria-labelledby="headingpoints_pattern1_link"
-             data-parent="#accordionpoints_pattern1_link">
+        <div id="points_pattern1_expr"
+             class="collapse property-definition-div" aria-labelledby="headingpoints_pattern1_expr"
+             data-parent="#accordionpoints_pattern1_expr">
             <div class="card-body pl-5">
 
     <div class="breadcrumbs">root
@@ -11342,9 +11342,9 @@ <h2 class="mb-0">
                 d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
             />
         </svg>
-    <a href="#points_pattern1_link" onclick="anchorLink('points_pattern1_link')">link</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+    <a href="#points_pattern1_expr" onclick="anchorLink('points_pattern1_expr')">expr</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
 <span class="description"><p>Virtual equipment mapping linking this local point to a remote point in another device</p>
-</span><span class="pattern-value" id="points_pattern1_link_pattern">Must match regular expression: <code>^[-0-9a-zA-Z$]+:[a-z0-9_]+$</code></span>
+</span><span class="pattern-value" id="points_pattern1_expr_pattern">Must match regular expression: <code>^[-0-9a-zA-Z$]+:[a-z0-9_]+$</code></span>
         
 
         
@@ -11352,7 +11352,7 @@ <h2 class="mb-0">
 
         <br/>
 <div class="badge badge-secondary">Example:</div>
-<br/><div id="points_pattern1_link_ex1" class="jumbotron examples"><div class="highlight"><pre><span></span><span class="s2">&quot;VAV-3:supply_air_flowrate_sensor&quot;</span>
+<br/><div id="points_pattern1_expr_ex1" class="jumbotron examples"><div class="highlight"><pre><span></span><span class="s2">&quot;VAV-3:supply_air_flowrate_sensor&quot;</span>
 </pre></div>
 </div>
             </div>
diff --git a/gencode/docs/metadata.html b/gencode/docs/metadata.html
index 40c3713763..7b9c1e13ea 100644
--- a/gencode/docs/metadata.html
+++ b/gencode/docs/metadata.html
@@ -19249,18 +19249,18 @@ <h2 class="mb-0">
         </div>
     </div>
 </div>
-<div class="accordion" id="accordionpointset_points_pattern1_link">
+<div class="accordion" id="accordionpointset_points_pattern1_expr">
     <div class="card">
-        <div class="card-header" id="headingpointset_points_pattern1_link">
+        <div class="card-header" id="headingpointset_points_pattern1_expr">
             <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#pointset_points_pattern1_link"
-                        aria-expanded="" aria-controls="pointset_points_pattern1_link" onclick="setAnchor('#pointset_points_pattern1_link')"><span class="property-name">link</span></button>
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#pointset_points_pattern1_expr"
+                        aria-expanded="" aria-controls="pointset_points_pattern1_expr" onclick="setAnchor('#pointset_points_pattern1_expr')"><span class="property-name">expr</span></button>
             </h2>
         </div>
 
-        <div id="pointset_points_pattern1_link"
-             class="collapse property-definition-div" aria-labelledby="headingpointset_points_pattern1_link"
-             data-parent="#accordionpointset_points_pattern1_link">
+        <div id="pointset_points_pattern1_expr"
+             class="collapse property-definition-div" aria-labelledby="headingpointset_points_pattern1_expr"
+             data-parent="#accordionpointset_points_pattern1_expr">
             <div class="card-body pl-5">
 
     <div class="breadcrumbs">root
@@ -19291,9 +19291,9 @@ <h2 class="mb-0">
                 d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
             />
         </svg>
-    <a href="#pointset_points_pattern1_link" onclick="anchorLink('pointset_points_pattern1_link')">link</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+    <a href="#pointset_points_pattern1_expr" onclick="anchorLink('pointset_points_pattern1_expr')">expr</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
 <span class="description"><p>Virtual equipment mapping linking this local point to a remote point in another device</p>
-</span><span class="pattern-value" id="pointset_points_pattern1_link_pattern">Must match regular expression: <code>^[-0-9a-zA-Z$]+:[a-z0-9_]+$</code></span>
+</span><span class="pattern-value" id="pointset_points_pattern1_expr_pattern">Must match regular expression: <code>^[-0-9a-zA-Z$]+:[a-z0-9_]+$</code></span>
         
 
         
@@ -19301,7 +19301,7 @@ <h2 class="mb-0">
 
         <br/>
 <div class="badge badge-secondary">Example:</div>
-<br/><div id="pointset_points_pattern1_link_ex1" class="jumbotron examples"><div class="highlight"><pre><span></span><span class="s2">&quot;VAV-3:supply_air_flowrate_sensor&quot;</span>
+<br/><div id="pointset_points_pattern1_expr_ex1" class="jumbotron examples"><div class="highlight"><pre><span></span><span class="s2">&quot;VAV-3:supply_air_flowrate_sensor&quot;</span>
 </pre></div>
 </div>
             </div>
@@ -33647,18 +33647,18 @@ <h2 class="mb-0">
         </div>
     </div>
 </div>
-<div class="accordion" id="accordionstructure_pattern1_points_pattern1_link">
+<div class="accordion" id="accordionstructure_pattern1_points_pattern1_expr">
     <div class="card">
-        <div class="card-header" id="headingstructure_pattern1_points_pattern1_link">
+        <div class="card-header" id="headingstructure_pattern1_points_pattern1_expr">
             <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#structure_pattern1_points_pattern1_link"
-                        aria-expanded="" aria-controls="structure_pattern1_points_pattern1_link" onclick="setAnchor('#structure_pattern1_points_pattern1_link')"><span class="property-name">link</span></button>
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#structure_pattern1_points_pattern1_expr"
+                        aria-expanded="" aria-controls="structure_pattern1_points_pattern1_expr" onclick="setAnchor('#structure_pattern1_points_pattern1_expr')"><span class="property-name">expr</span></button>
             </h2>
         </div>
 
-        <div id="structure_pattern1_points_pattern1_link"
-             class="collapse property-definition-div" aria-labelledby="headingstructure_pattern1_points_pattern1_link"
-             data-parent="#accordionstructure_pattern1_points_pattern1_link">
+        <div id="structure_pattern1_points_pattern1_expr"
+             class="collapse property-definition-div" aria-labelledby="headingstructure_pattern1_points_pattern1_expr"
+             data-parent="#accordionstructure_pattern1_points_pattern1_expr">
             <div class="card-body pl-5">
 
     <div class="breadcrumbs">root
@@ -33696,9 +33696,9 @@ <h2 class="mb-0">
                 d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
             />
         </svg>
-    <a href="#structure_pattern1_points_pattern1_link" onclick="anchorLink('structure_pattern1_points_pattern1_link')">link</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+    <a href="#structure_pattern1_points_pattern1_expr" onclick="anchorLink('structure_pattern1_points_pattern1_expr')">expr</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
 <span class="description"><p>Virtual equipment mapping linking this local point to a remote point in another device</p>
-</span><span class="pattern-value" id="structure_pattern1_points_pattern1_link_pattern">Must match regular expression: <code>^[-0-9a-zA-Z$]+:[a-z0-9_]+$</code></span>
+</span><span class="pattern-value" id="structure_pattern1_points_pattern1_expr_pattern">Must match regular expression: <code>^[-0-9a-zA-Z$]+:[a-z0-9_]+$</code></span>
         
 
         
@@ -33706,7 +33706,7 @@ <h2 class="mb-0">
 
         <br/>
 <div class="badge badge-secondary">Example:</div>
-<br/><div id="structure_pattern1_points_pattern1_link_ex1" class="jumbotron examples"><div class="highlight"><pre><span></span><span class="s2">&quot;VAV-3:supply_air_flowrate_sensor&quot;</span>
+<br/><div id="structure_pattern1_points_pattern1_expr_ex1" class="jumbotron examples"><div class="highlight"><pre><span></span><span class="s2">&quot;VAV-3:supply_air_flowrate_sensor&quot;</span>
 </pre></div>
 </div>
             </div>
diff --git a/gencode/java/udmi/schema/PointPointsetModel.java b/gencode/java/udmi/schema/PointPointsetModel.java
index 424f56ca3b..fdf4384fd7 100644
--- a/gencode/java/udmi/schema/PointPointsetModel.java
+++ b/gencode/java/udmi/schema/PointPointsetModel.java
@@ -36,7 +36,7 @@
     "adjunct",
     "tags",
     "structure",
-    "link"
+    "expr"
 })
 public class PointPointsetModel {
 
@@ -145,16 +145,15 @@ public class PointPointsetModel {
      * Virtual equipment mapping linking this local point to a remote point in another device
      * 
      */
-    @JsonProperty("link")
+    @JsonProperty("expr")
     @JsonPropertyDescription("Virtual equipment mapping linking this local point to a remote point in another device")
-    public java.lang.String link;
+    public java.lang.String expr;
 
     @Override
     public int hashCode() {
         int result = 1;
         result = ((result* 31)+((this.baseline_state == null)? 0 :this.baseline_state.hashCode()));
         result = ((result* 31)+((this.range_min == null)? 0 :this.range_min.hashCode()));
-        result = ((result* 31)+((this.link == null)? 0 :this.link.hashCode()));
         result = ((result* 31)+((this.description == null)? 0 :this.description.hashCode()));
         result = ((result* 31)+((this.units == null)? 0 :this.units.hashCode()));
         result = ((result* 31)+((this.type == null)? 0 :this.type.hashCode()));
@@ -166,6 +165,7 @@ public int hashCode() {
         result = ((result* 31)+((this.baseline_value == null)? 0 :this.baseline_value.hashCode()));
         result = ((result* 31)+((this.range_max == null)? 0 :this.range_max.hashCode()));
         result = ((result* 31)+((this.unchanged_limit_sec == null)? 0 :this.unchanged_limit_sec.hashCode()));
+        result = ((result* 31)+((this.expr == null)? 0 :this.expr.hashCode()));
         result = ((result* 31)+((this.adjunct == null)? 0 :this.adjunct.hashCode()));
         result = ((result* 31)+((this.cov_increment == null)? 0 :this.cov_increment.hashCode()));
         return result;
@@ -180,7 +180,7 @@ public boolean equals(Object other) {
             return false;
         }
         PointPointsetModel rhs = ((PointPointsetModel) other);
-        return (((((((((((((((((this.baseline_state == rhs.baseline_state)||((this.baseline_state!= null)&&this.baseline_state.equals(rhs.baseline_state)))&&((this.range_min == rhs.range_min)||((this.range_min!= null)&&this.range_min.equals(rhs.range_min))))&&((this.link == rhs.link)||((this.link!= null)&&this.link.equals(rhs.link))))&&((this.description == rhs.description)||((this.description!= null)&&this.description.equals(rhs.description))))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.type == rhs.type)||((this.type!= null)&&this.type.equals(rhs.type))))&&((this.baseline_tolerance == rhs.baseline_tolerance)||((this.baseline_tolerance!= null)&&this.baseline_tolerance.equals(rhs.baseline_tolerance))))&&((this.structure == rhs.structure)||((this.structure!= null)&&this.structure.equals(rhs.structure))))&&((this.writable == rhs.writable)||((this.writable!= null)&&this.writable.equals(rhs.writable))))&&((this.tags == rhs.tags)||((this.tags!= null)&&this.tags.equals(rhs.tags))))&&((this.ref == rhs.ref)||((this.ref!= null)&&this.ref.equals(rhs.ref))))&&((this.baseline_value == rhs.baseline_value)||((this.baseline_value!= null)&&this.baseline_value.equals(rhs.baseline_value))))&&((this.range_max == rhs.range_max)||((this.range_max!= null)&&this.range_max.equals(rhs.range_max))))&&((this.unchanged_limit_sec == rhs.unchanged_limit_sec)||((this.unchanged_limit_sec!= null)&&this.unchanged_limit_sec.equals(rhs.unchanged_limit_sec))))&&((this.adjunct == rhs.adjunct)||((this.adjunct!= null)&&this.adjunct.equals(rhs.adjunct))))&&((this.cov_increment == rhs.cov_increment)||((this.cov_increment!= null)&&this.cov_increment.equals(rhs.cov_increment))));
+        return (((((((((((((((((this.baseline_state == rhs.baseline_state)||((this.baseline_state!= null)&&this.baseline_state.equals(rhs.baseline_state)))&&((this.range_min == rhs.range_min)||((this.range_min!= null)&&this.range_min.equals(rhs.range_min))))&&((this.description == rhs.description)||((this.description!= null)&&this.description.equals(rhs.description))))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.type == rhs.type)||((this.type!= null)&&this.type.equals(rhs.type))))&&((this.baseline_tolerance == rhs.baseline_tolerance)||((this.baseline_tolerance!= null)&&this.baseline_tolerance.equals(rhs.baseline_tolerance))))&&((this.structure == rhs.structure)||((this.structure!= null)&&this.structure.equals(rhs.structure))))&&((this.writable == rhs.writable)||((this.writable!= null)&&this.writable.equals(rhs.writable))))&&((this.tags == rhs.tags)||((this.tags!= null)&&this.tags.equals(rhs.tags))))&&((this.ref == rhs.ref)||((this.ref!= null)&&this.ref.equals(rhs.ref))))&&((this.baseline_value == rhs.baseline_value)||((this.baseline_value!= null)&&this.baseline_value.equals(rhs.baseline_value))))&&((this.range_max == rhs.range_max)||((this.range_max!= null)&&this.range_max.equals(rhs.range_max))))&&((this.unchanged_limit_sec == rhs.unchanged_limit_sec)||((this.unchanged_limit_sec!= null)&&this.unchanged_limit_sec.equals(rhs.unchanged_limit_sec))))&&((this.expr == rhs.expr)||((this.expr!= null)&&this.expr.equals(rhs.expr))))&&((this.adjunct == rhs.adjunct)||((this.adjunct!= null)&&this.adjunct.equals(rhs.adjunct))))&&((this.cov_increment == rhs.cov_increment)||((this.cov_increment!= null)&&this.cov_increment.equals(rhs.cov_increment))));
     }
 
 
diff --git a/gencode/python/udmi/schema/model_pointset_point.py b/gencode/python/udmi/schema/model_pointset_point.py
index 4b2e7a09aa..3a941ddb64 100644
--- a/gencode/python/udmi/schema/model_pointset_point.py
+++ b/gencode/python/udmi/schema/model_pointset_point.py
@@ -57,4 +57,4 @@ class PointPointsetModel(DataModel):
     adjunct: Optional[Dict[str, str]] = None
     tags: Optional[List[Tag]] = None
     structure: Optional[Dict[str, RefDiscovery]] = None
-    link: Optional[str] = None
+    expr: Optional[str] = None
diff --git a/schema/model_pointset_point.json b/schema/model_pointset_point.json
index a9fc0aeaef..f799dd18cf 100644
--- a/schema/model_pointset_point.json
+++ b/schema/model_pointset_point.json
@@ -95,7 +95,7 @@
         }
       }
     },
-    "link": {
+    "expr": {
       "type": "string",
       "description": "Virtual equipment mapping linking this local point to a remote point in another device",
       "pattern": "^[-0-9a-zA-Z$]+:[a-z0-9_]+$",
diff --git a/tests/dbo/basic/site_model/devices/VAV-1/metadata.json b/tests/dbo/basic/site_model/devices/VAV-1/metadata.json
index 23781df268..18599d51f7 100644
--- a/tests/dbo/basic/site_model/devices/VAV-1/metadata.json
+++ b/tests/dbo/basic/site_model/devices/VAV-1/metadata.json
@@ -20,7 +20,7 @@
         "units": "degC"
       },
       "supply_air_flowrate_sensor_1": {
-        "link": "VAV-3:supply_air_flowrate_sensor"
+        "expr": "VAV-3:supply_air_flowrate_sensor"
       }
     }
   }