@matter/model 0.16.0-alpha.0-20251023-bb23617e5 → 0.16.0-alpha.0-20251029-bd92894d4

package/src/standard/resources/currency.resource.ts

@@ -0,0 +1,14 @@
+/**
+ * @license
+ * Copyright 2022-2025 Matter.js Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/*** THIS FILE IS GENERATED, DO NOT EDIT ***/
+
+import { Resource } from "#models/Resource.js";
+
+Resource.add({
+    tag: "datatype", name: "currency", description: "Currency", xref: "core§7.19.2.51",
+    details: "This data type represents a currency with an associated number of decimal points."
+});

package/src/standard/resources/descriptor.resource.ts

@@ -22,8 +22,8 @@ Resource.add({
         "This cluster supports a list of one or more device type identifiers that represent conformance to " +
         "device type specifications." +
         "\n" +
-        "The cluster supports a PartsList attribute that is a list of zero or more endpoints to support a " +
-        "composed device type.",
+        "The cluster supports a PartsList attribute that is a list of zero or more endpoints to support " +
+        "compound devices or composed device types.",
 
     children: [
         {
@@ -39,7 +39,7 @@ Resource.add({
             tag: "attribute", name: "DeviceTypeList", xref: "core§9.5.6.1",
 
             details: "This is a list of device types and corresponding revisions declaring endpoint conformance (see " +
-                "DeviceTypeStruct). At least one device type entry shall be present." +
+                "Section 9.5.5.1, “DeviceTypeStruct Type”). At least one device type entry shall be present." +
                 "\n" +
                 "An endpoint shall conform to all device types listed in the DeviceTypeList. A cluster instance that " +
                 "is in common for more than one device type in the DeviceTypeList shall be supported as a shared " +
@@ -87,6 +87,23 @@ Resource.add({
                 "same structure."
         },
 
+        {
+            tag: "attribute", name: "EndpointUniqueId", xref: "core§9.5.6.6",
+
+            details: "Indicates an identifier which allows to uniquely identify the functionality exposed on an endpoint, " +
+                "and therefore shall be unique within the device. It is constructed in a manufacturer specific " +
+                "manner." +
+                "\n" +
+                "  • If a globally unique identifier is used, the same rules as defined for the UniqueID attribute in " +
+                "    the Basic Information cluster apply." +
+                "\n" +
+                "  • If the identifier is only unique in the scope of the device, and cannot be used to track the " +
+                "    device, then it may remain unchanged at factory reset." +
+                "\n" +
+                "The value does not need to be human readable, since it is intended for machine to machine (M2M) " +
+                "communication."
+        },
+
         {
             tag: "datatype", name: "DeviceTypeStruct", xref: "core§9.5.5.1",
             details: "The device type and revision define endpoint conformance to a release of a device type definition. " +

package/src/standard/resources/device-energy-management-cluster.resource.ts

@@ -71,7 +71,13 @@ Resource.add(
                             "\n" +
                             "For example, a home may have solar PV which often produces more power than the home requires, " +
                             "resulting in the excess power flowing into the grid. This excess power naturally fluctuates when " +
-                            "clouds pass overhead and other loads in the home are switched on and off."
+                            "clouds pass overhead and other loads in the home are switched on and off." +
+                            "\n" +
+                            "EVSE Example: An EMS may therefore be able to turn on the EVSE (if the vehicle is plugged in) and " +
+                            "can start charging the vehicle, and periodically modify the charging power depending on PV " +
+                            "generation and other home loads, so as to minimize import and export to the grid. An EMS may also " +
+                            "use this feature to control the discharging (and re-charging) of the vehicle if the EVSE and vehicle " +
+                            "support the V2X feature of the EVSE cluster of the associated EVSE device."
                     },
 
                     {
@@ -85,6 +91,10 @@ Resource.add(
                             "Forecasts are defined from a current time, using a slot format, where the slot is akin to a " +
                             "relatively constant operating mode." +
                             "\n" +
+                            "Washing machine example: a washing machine may have stages of a washing cycle: heating, tumbling, " +
+                            "rinse and spin stages. At each stage, the approximate minimum and maximum power consumption may be " +
+                            "known, as well as the duration of that stage." +
+                            "\n" +
                             "In some circumstances the ESA may allow the stage to be delayed or paused (subject to safety and " +
                             "manufacturer’s discretion and user preferences)." +
                             "\n" +
@@ -99,6 +109,8 @@ Resource.add(
                             "\n" +
                             "The PowerForecastReporting and the adjustment features aim to align to the [SAREF4ENER] ontology." +
                             "\n" +
+                            "Inverter driven ESAs: some inverter driven ESAs can consume or generate a variable amount of power." +
+                            "\n" +
                             "For example, a single phase EVSE can be adjusted in the range of 6-32Amps in 0.6 Amp steps in EU or " +
                             "on a hardwired 120V supply in the range of 6-15 Amps in US." +
                             "\n" +
@@ -134,6 +146,9 @@ Resource.add(
                         details: "ESAs which support the Start Time Adjustment feature, allow an EMS to recommend a change to the " +
                             "start time of the energy transfer that the ESA has previously suggested it would use." +
                             "\n" +
+                            "Washing machine example: A Washing Machine may have been set to start a wash cycle at 9pm when the " +
+                            "variable tariff normally reduces." +
+                            "\n" +
                             "However, the EMS is aware that a grid event has occurred, making it cheaper to run the cycle at a " +
                             "later time, but the washing machine is not aware of this." +
                             "\n" +
@@ -154,6 +169,8 @@ Resource.add(
                         details: "ESAs which support the Pausable feature, allow an EMS to recommend a pause in the middle of a " +
                             "forecast power profile that the ESA is currently using." +
                             "\n" +
+                            "Washing machine example: A Washing Machine is in operation, and starting its water heating step." +
+                            "\n" +
                             "However, the EMS becomes aware from the smart meter that the total home load on the grid is close to " +
                             "exceeding its allowed total grid load." +
                             "\n" +
@@ -176,6 +193,11 @@ Resource.add(
                             "duration and/or power level limits of the steps of the power profile that the ESA has previously " +
                             "suggested it would use." +
                             "\n" +
+                            "Heat pump and Solar PV example: A heat pump may have the ability to heat hot water as well as " +
+                            "heating the home. The heat pump scheduling system may have determined that the home will be " +
+                            "unoccupied during the day, or that the indoor temperature is above the set-point and so it knows " +
+                            "that it will not need to heat the home." +
+                            "\n" +
                             "However, the hot water tank is likely to need to be reheated before the homeowner comes home in the " +
                             "evening. The heat pump is not aware that the property also has a solar PV inverter which is also an " +
                             "ESA that is communicating with the EMS." +
@@ -201,6 +223,10 @@ Resource.add(
                             "grid supplier has requested reduced energy usage due to overall peak grid demand) and may cause the " +
                             "ESA to modify the intended power profile has previously suggested it would use." +
                             "\n" +
+                            "EVSE example: An EVSE scheduling system may have determined that the vehicle would be charged " +
+                            "starting at a moderate rate at 1am, so that it has enough charge by the time it is needed later that " +
+                            "morning." +
+                            "\n" +
                             "However, the DSR service provider has informed the EMS that due to high forecast winds it is now " +
                             "forecast that there will be very cheap energy available from wind generation between 2am and 3am." +
                             "\n" +
@@ -544,8 +570,8 @@ Resource.add(
                             "If this ESA supports PFR this would have 2 entries in the list as follows:" +
                             "\n" +
                             "If this ESA supports SFR where it does not know the actual power, but has an understanding of the " +
-                            "functions that use more energy, it could be requested to use more or less energy using the " +
-                            "LoadControl field as follows:"
+                            "functions that use more energy, it could be requested to use more or less energy using the LoadCon " +
+                            "trol field as follows:"
                     },
 
                     {
@@ -727,7 +753,7 @@ Resource.add(
                     },
                     {
                         tag: "field", name: "GridOptimizationAdjustment",
-                        description: "There is PowerAdjustment active due to local EMS optimization"
+                        description: "There is PowerAdjustment active due to grid optimization"
                     }
                 ]
             },
@@ -776,8 +802,7 @@ Resource.add(
                         tag: "field", name: "MinPower", xref: "cluster§9.2.7.10.1",
                         details: "This field shall indicate the minimum power that the ESA can have its power adjusted to." +
                             "\n" +
-                            "Note that this is a signed value. Negative values indicate power flows out of the node" +
-                            "\n" +
+                            "Note that this is a signed value. Negative values indicate power flows out of the node (e.g. " +
                             "discharging a battery)."
                     },
 
@@ -996,6 +1021,8 @@ Resource.add(
                             "they may choose to use values between 0-100 as a percentage of compressor modulation, or could use " +
                             "these values as Enum states meaning heating with fan, heating without fan etc." +
                             "\n" +
+                            "NOTE An ESA shall always use the same value to represent the same operating state." +
+                            "\n" +
                             "By providing this information a smart EMS may be able to learn the observed power draw when the ESA " +
                             "is put into a specific state. It can potentially then use the ManufacturerESAState field in the " +
                             "Forecast attribute along with observed power drawn to predict the power draw from the appliance and " +

package/src/standard/resources/dimmable-plug-in-unit.resource.ts

@@ -10,10 +10,24 @@ import { Resource } from "#models/Resource.js";
 
 Resource.add({
     tag: "deviceType", name: "DimmablePlugInUnit", classification: "simple", xref: "device§5.2",
+
     details: "A Dimmable Plug-In Unit is a device that provides power to another device that is plugged into it, " +
         "and is capable of being switched on or off and have its level adjusted. The Dimmable Plug-in Unit is " +
         "typically used to control a conventional non-communicating light through its mains connection using " +
-        "phase cutting.",
+        "phase cutting." +
+        "\n" +
+        "The Mounted Dimmable Load Control (added in Matter 1.4) has identical cluster requirements as the " +
+        "Dimmable Plug-In Unit, and is marked as a superset of this device type (since Matter 1.4.2). For " +
+        "devices intended to be mounted permanently, the Mounted Dimmable Load Control device type shall be " +
+        "used, with the Dimmable Plug-In Unit device type optionally added to the DeviceTypeList of the " +
+        "Descriptor cluster in addition to the Mounted Dimmable Load Control device type (see " +
+        "[ref_MountedDimmableLoadControlServerGuidance])." +
+        "\n" +
+        "### Before Matter 1.4, mounted dimmable load control units typically used the Dimmable Plug-In Unit " +
+        "device type. Clients can encounter devices which were made before or after these specification " +
+        "updates. Therefore, clients SHOULD use the following heuristic to distinguish the type of physical " +
+        "device based on the device type revision found on an endpoint (\"--\" means the device type is not " +
+        "listed).",
 
     children: [
         { tag: "requirement", name: "Identify", xref: "device§5.2.4" },

package/src/standard/resources/door-lock-cluster.resource.ts

@@ -280,15 +280,24 @@ Resource.add(
             },
             {
                 tag: "attribute", name: "OperatingMode", xref: "cluster§5.2.9.24",
-                details: "This attribute shall indicate the current operating mode of the lock as defined in " +
-                    "OperatingModeEnum."
+                details: "Indicates the current operating mode of the lock as defined in OperatingModeEnum."
             },
 
             {
                 tag: "attribute", name: "SupportedOperatingModes", xref: "cluster§5.2.9.25",
+
                 details: "This attribute shall contain a bitmap with all operating bits of the OperatingMode attribute " +
-                    "supported by the lock. All operating modes NOT supported by a lock shall be set to one. The value of " +
-                    "the OperatingMode enumeration defines the related bit to be set."
+                    "supported by the lock." +
+                    "\n" +
+                    "A bit position set to zero shall indicate that the mode is supported. A bit position set to one " +
+                    "shall indicate that the mode is not supported." +
+                    "\n" +
+                    "Any bit that is not yet defined in OperatingModesBitmap shall be set to 1." +
+                    "\n" +
+                    "The values considered valid to read or write in the OperatingMode attribute shall be the enum values " +
+                    "from DoorLockOperatingModeEnum whose equivalent same-named bit from OperatingModesBitmap is set to " +
+                    "zero in this attribute. WARNING: This is the opposite of most other semantically similar bitmaps in " +
+                    "this specification."
             },
 
             {
@@ -403,65 +412,58 @@ Resource.add(
             },
 
             {
-                tag: "attribute", name: "AlarmMask", xref: "cluster§5.2.9.37",
+                tag: "attribute", name: "AliroReaderVerificationKey", xref: "cluster§5.2.9.37",
 
-                details: "This attribute is only supported if the Alarms cluster is on the same endpoint. The alarm mask is " +
-                    "used to turn on/off alarms for particular functions. Alarms for an alarm group are enabled if the " +
-                    "associated alarm mask bit is set. Each bit represents a group of alarms. Entire alarm groups can be " +
-                    "turned on or off by setting or clearing the associated bit in the alarm mask." +
-                    "\n" +
-                    "This mask DOES NOT apply to the Events mechanism of this cluster."
-            },
-
-            {
-                tag: "attribute", name: "AliroReaderVerificationKey", xref: "cluster§5.2.9.38",
                 details: "Indicates the verification key component of the Reader’s key pair as defined in [Aliro]. The value, " +
                     "if not null, shall be an uncompressed elliptic curve public key as defined in section 2.3.3 of SEC " +
                     "1." +
                     "\n" +
-                    "Null if no Reader key pair has been configured on the lock. See SetAliroReaderConfig."
+                    "Null if no Reader key pair has been configured on the lock. See Section 5.2.10.42, " +
+                    "“SetAliroReaderConfig Command”."
             },
 
             {
-                tag: "attribute", name: "AliroReaderGroupIdentifier", xref: "cluster§5.2.9.39",
+                tag: "attribute", name: "AliroReaderGroupIdentifier", xref: "cluster§5.2.9.38",
                 details: "Indicates the reader_group_identifier as defined in [Aliro]." +
                     "\n" +
-                    "Null if no reader_group_identifier has been configured on the lock. See SetAliroReaderConfig."
+                    "Null if no reader_group_identifier has been configured on the lock. See Section 5.2.10.42, " +
+                    "“SetAliroReaderConfig Command”."
             },
 
             {
-                tag: "attribute", name: "AliroReaderGroupSubIdentifier", xref: "cluster§5.2.9.40",
+                tag: "attribute", name: "AliroReaderGroupSubIdentifier", xref: "cluster§5.2.9.39",
                 details: "Indicates the reader_group_sub_identifier as defined in [Aliro]."
             },
             {
                 tag: "attribute", name: "AliroExpeditedTransactionSupportedProtocolVersions",
-                xref: "cluster§5.2.9.41",
+                xref: "cluster§5.2.9.40",
                 details: "Indicates the list of protocol versions supported for expedited transactions as defined in [Aliro]."
             },
 
             {
-                tag: "attribute", name: "AliroGroupResolvingKey", xref: "cluster§5.2.9.42",
+                tag: "attribute", name: "AliroGroupResolvingKey", xref: "cluster§5.2.9.41",
                 details: "Indicates the Group Resolving Key as defined in [Aliro]." +
                     "\n" +
-                    "Null if no group resolving key has been configured on the lock. See SetAliroReaderConfig."
+                    "Null if no group resolving key has been configured on the lock. See Section 5.2.10.42, " +
+                    "“SetAliroReaderConfig Command”."
             },
 
             {
-                tag: "attribute", name: "AliroSupportedBleuwbProtocolVersions", xref: "cluster§5.2.9.43",
+                tag: "attribute", name: "AliroSupportedBleuwbProtocolVersions", xref: "cluster§5.2.9.42",
                 details: "Indicates the list of protocol versions supported for the Bluetooth LE + UWB Access Control Flow as " +
                     "defined in [Aliro]."
             },
             {
-                tag: "attribute", name: "AliroBleAdvertisingVersion", xref: "cluster§5.2.9.44",
+                tag: "attribute", name: "AliroBleAdvertisingVersion", xref: "cluster§5.2.9.43",
                 details: "Indicates the version of the Bluetooth LE advertisement as defined in [Aliro]."
             },
             {
-                tag: "attribute", name: "NumberOfAliroCredentialIssuerKeysSupported", xref: "cluster§5.2.9.45",
+                tag: "attribute", name: "NumberOfAliroCredentialIssuerKeysSupported", xref: "cluster§5.2.9.44",
                 details: "Indicates the maximum number of AliroCredentialIssuerKey credentials that can be stored on the lock."
             },
 
             {
-                tag: "attribute", name: "NumberOfAliroEndpointKeysSupported", xref: "cluster§5.2.9.46",
+                tag: "attribute", name: "NumberOfAliroEndpointKeysSupported", xref: "cluster§5.2.9.45",
 
                 details: "Indicates the maximum number of endpoint key credentials that can be stored on the lock. This limit " +
                     "applies to the sum of the number of AliroEvictableEndpointKey credentials and the number of " +
@@ -522,8 +524,9 @@ Resource.add(
                     "    ◦ shall generate a LockOperation event of LockOperationType Unlatch when it is actuated from the " +
                     "      outside." +
                     "\n" +
-                    "    ◦ may generate a LockOperation event of LockOperationType Unlatch when it is actuated from the " +
-                    "      inside.",
+                    "    ◦ may generate a LockOperation event of LockOperationType Unlatch when it is actuated" +
+                    "\n" +
+                    "from the inside.",
 
                 children: [
                     {
@@ -695,7 +698,10 @@ Resource.add(
                     "> If the attribute AutoRelockTime is supported the lock will transition to the locked state when the " +
                     "  auto relock time has expired.",
 
-                children: [{ tag: "field", name: "PinCode", xref: "cluster§5.2.10.2.1", details: "See PINCode field." }]
+                children: [{
+                    tag: "field", name: "PinCode", xref: "cluster§5.2.10.2.1",
+                    details: "See Section 5.2.10.1.1, “PINCode Field”."
+                }]
             },
 
             { tag: "command", name: "Toggle", xref: "cluster§5.2.10" },
@@ -714,7 +720,10 @@ Resource.add(
                         details: "This field shall indicate the timeout in seconds to wait before relocking the door lock. This value " +
                             "is independent of the AutoRelockTime attribute value."
                     },
-                    { tag: "field", name: "PinCode", xref: "cluster§5.2.10.3.2", details: "See PINCode field." }
+                    {
+                        tag: "field", name: "PinCode", xref: "cluster§5.2.10.3.2",
+                        details: "See Section 5.2.10.1.1, “PINCode Field”."
+                    }
                 ]
             },
 
@@ -1208,7 +1217,7 @@ Resource.add(
                         tag: "field", name: "UserId", xref: "cluster§5.2.10.27.1",
                         details: "This field shall indicate the user ID." +
                             "\n" +
-                            "The value of the UserID field shall be between 0 and the value of the NumberOfRFIDUsersSupported " +
+                            "The value of the UserID field shall be between 0 and the value of the NumberOfRFIDUsersSup ported " +
                             "attribute."
                     },
 
@@ -1248,8 +1257,9 @@ Resource.add(
                     "If the requested User ID is valid and the Code doesn’t exist, Get RFID Code Response shall have the " +
                     "following format:" +
                     "\n" +
-                    "User ID = requested User ID UserStatus = 0 (available) UserType = 0xFF (not supported) RFID Code = 0 " +
-                    "(zero length)" +
+                    "User ID = requested User ID UserStatus = 0 (available) UserType = 0xFF (not supported)" +
+                    "\n" +
+                    "RFID Code = 0 (zero length)" +
                     "\n" +
                     "If requested User ID is invalid, send Default Response with an error status. The error status shall " +
                     "be equal to CONSTRAINT_ERROR when User_ID is less than the max number of users supported, and " +
@@ -1394,7 +1404,7 @@ Resource.add(
                 tag: "command", name: "GetUser", xref: "cluster§5.2.10.33",
                 details: "Retrieve user." +
                     "\n" +
-                    "An InvokeResponse command shall be sent with an appropriate error (e.g. FAILURE, INVALID_COMMAND, " +
+                    "An InvokeResponse command shall be sent with an appropriate error (e.g. FAILURE, INVALID_ COMMAND, " +
                     "etc.) as needed otherwise the GetUserResponse Command shall be sent implying a status of SUCCESS."
             },
 
@@ -1415,10 +1425,7 @@ Resource.add(
                         tag: "field", name: "UserName", xref: "cluster§5.2.10.34.2",
                         details: "This field shall contain a string to use as a human readable identifier for the user."
                     },
-                    {
-                        tag: "field", name: "UserUniqueId", xref: "cluster§5.2.10.34.3",
-                        details: "See UserUniqueID field."
-                    },
+                    { tag: "field", name: "UserUniqueId", xref: "cluster§5.2.10.34.3", details: "See UserUniqueID." },
                     {
                         tag: "field", name: "UserStatus", xref: "cluster§5.2.10.34.4",
                         details: "This field shall indicate the UserStatus assigned to the user when created or modified."
@@ -1707,7 +1714,10 @@ Resource.add(
                     "> If the attribute AutoRelockTime is supported, the lock will transition to the locked state when " +
                     "  the auto relock time has expired.",
 
-                children: [{ tag: "field", name: "PinCode", xref: "cluster§5.2.10.41.1", details: "See PINCode field." }]
+                children: [{
+                    tag: "field", name: "PinCode", xref: "cluster§5.2.10.41.1",
+                    details: "See Section 5.2.10.1.1, “PINCode Field”."
+                }]
             },
 
             {
@@ -1777,6 +1787,13 @@ Resource.add(
                 description: "For the OperatingModesBitmap, a bit SET indicates that the operating mode IS NOT supported. A bit CLEAR indicates that the operating mode IS supported. This is the inverse of most bitmaps in this specification, and it is RECOMMENDED that clients carefully take this into consideration.",
                 xref: "cluster§5.2.6.3",
 
+                details: "### WARNING" +
+                    "\n" +
+                    "For the OperatingModesBitmap, a bit SET indicates that the operating mode IS NOT supported. A bit " +
+                    "CLEAR indicates that the operating mode IS supported. This is the inverse of most bitmaps in this " +
+                    "specification, and it is recommended that clients carefully take this into consideration. See " +
+                    "SupportedOperatingModes.",
+
                 children: [
                     { tag: "field", name: "Normal", description: "Normal operation mode is NOT supported" },
                     { tag: "field", name: "Vacation", description: "Vacation operation mode is NOT supported" },

package/src/standard/resources/ecosystem-information.resource.ts

@@ -10,7 +10,7 @@ import { Resource } from "#models/Resource.js";
 
 Resource.add({
     tag: "cluster", name: "EcosystemInformation", classification: "endpoint", pics: "ECOINFO",
-    xref: "core§9.18",
+    xref: "core§9.17",
 
     details: "The Ecosystem Information Cluster provides extended device information for all the logical devices " +
         "represented by a Bridged Node. The Ecosystem Information Cluster presents the view of device name " +
@@ -43,14 +43,14 @@ Resource.add({
 
     children: [
         {
-            tag: "attribute", name: "DeviceDirectory", xref: "core§9.18.5.1",
+            tag: "attribute", name: "DeviceDirectory", xref: "core§9.17.5.1",
             details: "This attribute shall contain the list of logical devices represented by a Bridged Node. Most of the " +
                 "time this will contain a single entry, but may grow with more complex device compositions (e.g. " +
                 "another bridge.) An empty list indicates that the information is not available."
         },
 
         {
-            tag: "attribute", name: "LocationDirectory", xref: "core§9.18.5.2",
+            tag: "attribute", name: "LocationDirectory", xref: "core§9.17.5.2",
 
             details: "This attribute shall contain the list of rooms, areas and groups associated with the DeviceDirectory " +
                 "entries, and shall NOT contain locations which are dynamically generated and removed by an " +
@@ -62,24 +62,38 @@ Resource.add({
         },
 
         {
-            tag: "datatype", name: "EcosystemDeviceStruct", xref: "core§9.18.4.1",
+            tag: "datatype", name: "DeviceTypeStruct", xref: "core§9.17.4.1",
+            details: "The device type and revision define endpoint conformance to a release of a device type definition. " +
+                "See the Data Model specification for more information.",
 
             children: [
                 {
-                    tag: "field", name: "DeviceName", xref: "core§9.18.4.1.1",
+                    tag: "field", name: "DeviceType", xref: "core§9.17.4.1.1",
+                    details: "This shall indicate the device type definition."
+                },
+                {
+                    tag: "field", name: "Revision", xref: "core§9.17.4.1.2",
+                    details: "This is the implemented revision of the device type definition."
+                }
+            ]
+        },
+
+        {
+            tag: "datatype", name: "EcosystemDeviceStruct", xref: "core§9.17.4.2",
+
+            children: [
+                {
+                    tag: "field", name: "DeviceName", xref: "core§9.17.4.2.1",
                     details: "This field shall indicate the device’s name, which is provided externally if the user consents. (For " +
                         "example, provided by the user in an ecosystem specific interface.)"
                 },
-
                 {
-                    tag: "field", name: "DeviceNameLastEdit", xref: "core§9.18.4.1.2",
-                    details: "This field shall be present and set if the DeviceName field is present." +
-                        "\n" +
-                        "This field shall indicate the timestamp of when the DeviceName was last modified."
+                    tag: "field", name: "DeviceNameLastEdit", xref: "core§9.17.4.2.2",
+                    details: "This field shall indicate the timestamp of when the DeviceName was last modified."
                 },
 
                 {
-                    tag: "field", name: "BridgedEndpoint", xref: "core§9.18.4.1.3",
+                    tag: "field", name: "BridgedEndpoint", xref: "core§9.17.4.2.3",
                     details: "This field shall indicate the endpoint this EcosystemDeviceStruct is associated with on this Bridge." +
                         "\n" +
                         "This field shall be present and set to a valid endpoint if the device is accessible through the " +
@@ -87,7 +101,7 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "OriginalEndpoint", xref: "core§9.18.4.1.4",
+                    tag: "field", name: "OriginalEndpoint", xref: "core§9.17.4.2.4",
                     details: "This field shall indicate the endpoint this EcosystemDeviceStruct is associated with on the original " +
                         "device represented by this bridge’s Bridged Node. If this bridge is receiving the device from " +
                         "another bridge, then the OriginalEndpoint field value would be the same on both bridges. This field " +
@@ -96,7 +110,7 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "DeviceTypes", xref: "core§9.18.4.1.5",
+                    tag: "field", name: "DeviceTypes", xref: "core§9.17.4.2.5",
                     details: "This field shall indicate all of the DeviceTypes within the DeviceTypeList in the Descriptor Cluster " +
                         "associated with this EcosystemDeviceStruct entry." +
                         "\n" +
@@ -104,32 +118,30 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "UniqueLocationIDs", xref: "core§9.18.4.1.6",
+                    tag: "field", name: "UniqueLocationIDs", xref: "core§9.17.4.2.6",
                     details: "This field shall specify the EcosystemLocationStruct entries in the LocationDirectory attribute " +
                         "associated with this EcosystemDeviceStruct."
                 },
 
                 {
-                    tag: "field", name: "UniqueLocationIDsLastEdit", xref: "core§9.18.4.1.7",
+                    tag: "field", name: "UniqueLocationIDsLastEdit", xref: "core§9.17.4.2.7",
 
                     details: "This field shall indicate the timestamp of when the UniqueLocationIDs was last modified." +
                         "\n" +
-                        "> [!NOTE]" +
-                        "\n" +
-                        "> If multiple server instances update the UniqueLocationIDs field at the same time, it is possible " +
-                        "  one of the updates will be missed. This is considered an acceptable limitation to reduce the " +
-                        "  complexity of the design. Since this is meant to be provided from user input, it is unlikely these " +
-                        "  signals would be happening at one time."
+                        "NOTE If multiple server instances update the UniqueLocationIDs field at the same time, it is " +
+                        "possible one of the updates will be missed. This is considered an acceptable limitation to reduce " +
+                        "the complexity of the design. Since this is meant to be provided from user input, it is unlikely " +
+                        "these signals would be happening at one time."
                 }
             ]
         },
 
         {
-            tag: "datatype", name: "EcosystemLocationStruct", xref: "core§9.18.4.2",
+            tag: "datatype", name: "EcosystemLocationStruct", xref: "core§9.17.4.3",
 
             children: [
                 {
-                    tag: "field", name: "UniqueLocationId", xref: "core§9.18.4.2.1",
+                    tag: "field", name: "UniqueLocationId", xref: "core§9.17.4.3.1",
 
                     details: "This field shall indicate a unique identifier for a specific Ecosystem Information Cluster server " +
                         "instance representing the location independent of its LocationDescriptor field." +
@@ -156,9 +168,10 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "LocationDescriptor", xref: "core§9.18.4.2.2",
+                    tag: "field", name: "LocationDescriptor", xref: "core§9.17.4.3.2",
 
-                    details: "This field shall indicate the location (e.g. living room, driveway) and associated metadata that is " +
+                    details: "This field shall indicate the location (e.g. living room, driveway) and associated metadata that is" +
+                        "\n" +
                         "provided externally if the user consents. (For example, provided by the user in an ecosystem " +
                         "specific interface.)" +
                         "\n" +
@@ -167,7 +180,7 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "LocationDescriptorLastEdit", xref: "core§9.18.4.2.3",
+                    tag: "field", name: "LocationDescriptorLastEdit", xref: "core§9.17.4.3.3",
                     details: "This field shall indicate the timestamp of when the LocationDescriptor was last modified."
                 }
             ]