diff --git a/TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md b/TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md
index ef3db5c86c8b726dd6a15195be72177a5a802275..59a3ac93d13def2e82241f105c4e4f87692b49e9 100644
--- a/TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md
+++ b/TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md
@@ -2,7 +2,8 @@
 
 ![oneM2M logo](media/logo.png)
 
-|oneM2M<br />Technical Specification |oneM2M<br />Technical Specification |
+
+| | oneM2M Technical Specification |
 |-|-|
 |Document Number |oneM2M- TS-0023-V5.5.0 |
 |Document Name: |SDT based Information Model and Mapping for Vertical Industries |
@@ -10,7 +11,7 @@
 |Abstract: |This technical specification includes oneM2M defined information model for home appliances and the mapping with other information models from external organization. |
 |Template Version: January 2017 (Do not modify) |Template Version: January 2017 (Do not modify) |
 
-
+<mark>Editor's note: We need to decide how the Phrase "oneM2M Technical Specification" in the table header above is been formatted. In the original word document this is single line (using col-span)</mark>
 
 The present document is provided for future development work within oneM2M only. The Partners accept no liability for any use of this specification.
 
@@ -221,7 +222,7 @@ Specifications of new DeviceClass models and ModuleClasses are encouraged to re-
 
 ![SDT 4.0 Basic Elements](media/SDT_4_0_basic_elements.png)
 
-**Figure 5.2.11: Design Structure of the Home Appliance Information Model using SDT 4.0**
+**Figure 5.2.1-1: Design Structure of the Home Appliance Information Model using SDT 4.0**-
 
 
 The R/W column of the ModuleClasses's data point tables in clause 5.3 reflects the intentions of how a data point in a ModuleClass shall be used semantically. This is a "behavioral contract" between applications or users of the modeled devices on the semantic level. Further, the devices or IPE's (for NoDN) are expected to implement and control the mappings in clause 5.2.2 to implement this "behavioral contract".
@@ -240,7 +241,7 @@ When the Home Appliances Information Model is described based on SDT, the follow
 - Rule 2: Rule for description of Action, DataPoint:
 
     - DataPoint shall be used to represent stateless operations. (e.g. powerState of [binarySwitch](#53112-binaryswitch) for on/off operations).
-    - Action shall be used when describing stateful condition, handling unknown internal state conditions (e.g. upVolume/downVolume by increasing/decreasing the audioVolume in steps, handling transactional procedures, or checking integrity using username plus password at the same time).
+    - Action shall be used when describing stateful condition, handling unknown internal state conditions (e.g. [upVolume](#5318-audiovolume)/[downVolume](#5318-audiovolume) by increasing/decreasing the audioVolume in steps, handling transactional procedures, or checking integrity using username plus password at the same time).
 
 - Rule 3: Rule for description of DataPoint and Property:
 
@@ -248,7 +249,7 @@ When the Home Appliances Information Model is described based on SDT, the follow
 
 - Rule 4: Definition of the Domain:
 
-    - The Domains are specified as "org.onem2m.[domain]", where [domain] is one of the domain names defined in 6.4.1. The name is chosen according to the domain in which the element is defined. 
+    - The Domains are specified as "org.onem2m.[domain]", where [domain] is one of the domain names defined in [6.4.1](#641-introduction). The name is chosen according to the domain in which the element is defined. 
     - The sub-domains for DeviceClasses, SubDevices, ModuleClasses and Actions shall be specified as "org.onem2m.[domain].device", "org.onem2m.[domain].subdevice", "org.onem2m.[domain].moduleclass", and "org.onem2m.[domain].action" respectively.
 
 - Rule 5: Naming rule for the element:
@@ -263,10 +264,10 @@ When the Home Appliances Information Model is described based on SDT, the follow
 
 - Rule 7: Enumeration type:
 
-    - When describing the meaning of values for enumeration type elements, they may be described under clause 5.6.
-    - The enumeration types for the harmonized information model are based on &lt;xs:integer>, and the numeric values are interpreted as specified in clause 5.6. 
+    - When describing the meaning of values for enumeration type elements, they may be described under clause [5.6](#56-enumeration-type-definitions).
+    - The enumeration types for the harmonized information model are based on &lt;xs:integer>, and the numeric values are interpreted as specified in clause [5.6](#56-enumeration-type-definitions). 
     - The name of an enumeration type shall start with the prefix "enum". This prefix shall not be used with non-enumeration type names.
-    - All enumeration types are defined under the same domain called Horizontal Domain, which does not contain any other entity. They also must use the same XSD name space identifiers as defined in clause 6.5.1. Even if an enumeration type is used in multiple module classes from different domains, this enumeration type is defined only once.
+    - All enumeration types are defined under the same domain called Horizontal Domain, which does not contain any other entity. They also must use the same XSD name space identifiers as defined in clause [6.5.1](#651-introduction). Even if an enumeration type is used in multiple module classes from different domains, this enumeration type is defined only once.
 
 - Rule 8: Rule for unit  in documentation :
 
@@ -406,7 +407,6 @@ The following table provides some examples for short names that have been create
 
 This ModuleClass provides capabilities for a 3D printer. 
 
-
 **Table 5.3.1.1-1: Actions of threeDprinter**
 
 |Return Type |Name |Argument |Optional |Documentation |
@@ -560,7 +560,7 @@ This ModuleClass provides capabilities to control and monitor volume
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
 |volumeValue |xs:integer |RW |false |pct |The rounded percentage of the current volume in the range of [0, maxValue]. 0 percentage shall mean no sound produced. |
-|stepValue |xs:integer |R |true |pct |Step value used by the "UpVolume" and "DownVolume" actions. |
+|stepValue |xs:integer |R |true |pct |Step value used by the "upVolume" and "downVolume" actions. |
 |maxValue |xs:integer |R |true |pct |Maximum value allowed for Volume. maxValue is 100 by default if "maxValue" is not provided. |
 |muteEnabled |xs:boolean |RW |false | |The current status of the mute enablement. "True" indicates enabled (that is, no sound), and "False" indicates not enabled (that is, sound is played). |
 |saveAudioVolume |xs:integer |RW |true |pct |Save the current audio volume for the muteAudioVolume |
@@ -601,8 +601,8 @@ This ModuleClass provides capabilities to indicate the detection of low battery
 |chargingAmpere |xs:float |R |true |A |The ampere to charge the battery |
 |dischargingVoltage |xs:float |R |true |V |The voltage to discharge the battery |
 |dischargingAmpere |xs:float |R |true |A |The ampere to discharge the battery |
-|batteryMaterial |[hd:enumBatteryMaterial](#5651-hdenumbatterymaterial) |R |true | |The material of the cell of the battery |
-|batteryShape |[hd:enumBatteryShape](#5652-hdenumbatteryshape) |R |true | |The size of the battery such as "AAA". |
+|batteryMaterial |[hd:enumBatteryMaterial](#5650-hdenumbatterymaterial) |R |true | |The material of the cell of the battery |
+|batteryShape |[hd:enumBatteryShape](#5651-hdenumbatteryshape) |R |true | |The size of the battery such as "AAA". |
 
 
 
@@ -735,7 +735,7 @@ This ModuleClass provides capabilities to control and monitor time and date info
 |-|-|-|-|-|-|
 |currentTime |xs:time |RW |false | |Information of the current time  |
 |currentDate |xs:date |RW |false | |Information of the current date |
-|currentTimeZone |xs:string |RW |true | |Name of current time zone according to the IANA Timezone data format (TZ) <a href="#_ref_17">[17]</a>, ==for example, "".==  |
+|currentTimeZone |xs:string |RW |true | |Name of current time zone according to the IANA Timezone data format (TZ) <a href="#_ref_17">[17]</a>, <mark>for example, "".</mark>  |
 
 
 
@@ -743,7 +743,6 @@ This ModuleClass provides capabilities to control and monitor time and date info
 #### 5.3.1.19 clothesDryerJobMode
 This ModuleClasses provides capabilities to control and monitor the job modes of a clothes dryer.
 
-
 **Table 5.3.1.19-1: DataPoints of clothesDryerJobMode ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -836,7 +835,8 @@ This ModuleClass provides cababilities to control and monitor a colour saturatio
 #### 5.3.1.25 connectivity
 This ModuleClass provides capabilities to monitor network connectivity. 
 
-==Editor note: the following attributes are missing from the short name table 6.3==
+<mark>Editor note: the following attributes are missing from the short name table 6.3</mark>
+
 
 **Table 5.3.1.25-1: DataPoints of connectivity ModuleClass**
 
@@ -1033,7 +1033,7 @@ This ModuleClass provides capabilities to control and monitor desired parameters
 #### 5.3.1.37 galleryMode
 This ModuleClass provides information about the mode of display. The galleryMode includes the display orientation, display interval and display order.  
 
-==Editor note: the following attributes are missing from the short name tables in 6.3==
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
 
 
 **Table 5.3.1.37-1: DataPoints of galleryMode ModuleClass**
@@ -1050,7 +1050,7 @@ This ModuleClass provides information about the mode of display. The galleryMode
 #### 5.3.1.38 gasChargingControl
 This ModuleClass provides capabilities to recharge the gas meter. 
 
-==Editor note: the following attributes are missing from the short name tables in 6.3==
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
 
 **Table 5.3.1.38-1: DataPoints of gasChargingControl ModuleClass**
 
@@ -1068,7 +1068,7 @@ This ModuleClass provides capabilities to recharge the gas meter.
 #### 5.3.1.39 gasMeterAlarm
 This ModuleClass provides capabilities to set service parameters of a gas meter. 
 
-==Editor note: the following attributes are missing from the short name tables in 6.3==
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
 
 
 **Table 5.3.1.39-1: DataPoints of gasMeterAlarm ModuleClass**
@@ -1089,7 +1089,7 @@ This ModuleClass provides capabilities to set service parameters of a gas meter.
 #### 5.3.1.40 gasMeterReportInfo
 This ModuleClass provides information of measurements of a gas meter.
 
-==Editor note: the following attributes are missing from the short name tables in 6.3==
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
 
 
 **Table 5.3.1.40-1: DataPoints of gasMeterReportInfo ModuleClass**
@@ -1283,7 +1283,7 @@ This ModuleClass provides the function to lock and unlock an object.
 
 
 
-#### ==5.3.1.53 mediaSelect==
+#### 5.3.1.53 mediaSelect
 This ModuleClass provides capabilities to control and monitor media input and output of device such as TV or SetTopBox.
 
 
@@ -1292,10 +1292,10 @@ This ModuleClass provides capabilities to control and monitor media input and ou
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
 |mediaID |xs:integer |RW |false | |The numeric index of the activated media in the supported media sources list "supportedMediaSources". |
-|supportedMediaSources |list of hd:enumSupportedMediaSource |R |false | |List of supported input or output media for the given device (see clause 5.6.32). |
+|supportedMediaSources |list of [hd:enumSupportedMediaSources](#5632-hdenumsupportedmediasources) |R |false | |List of supported input or output media for the given device (see clause [5.6.32](#5632-hdenumsupportedmediasources)). |
 |mediaName |xs:string |R |true | |Specifies a pre-defined media input or output. |
 |status |xs:boolean |R |true | |Specifies whether the specific media instance is selected ("True") or not ("False"). |
-|mediaType |hd:enumSupportedMediaSource |R |false | |Specifies the type of the media (see clause 5.6.32). |
+|mediaType |[hd:enumSupportedMediaSources](#5632-hdenumsupportedmediasources) |R |false | |Specifies the type of the media (see clause [5.6.32](#5632-hdenumsupportedmediasources)). |
 
 
 
@@ -1336,7 +1336,7 @@ This ModuleClass provides the capabilities to represent a number. It also has ca
 |-|-|-|-|-|-|
 |numberValue |xs:float |RW |false | |The actual value of the number. |
 |minValue |xs:float |RW |true | |The optional minimum value of the number. The default is the system-specific minimum value for a float value. |
-|maxValue |xs:float<br /> |RW |true | |The optional maximum value of the number. The default is the system-specific maximum value for a float value. |
+|maxValue |xs:float |RW |true | |The optional maximum value of the number. The default is the system-specific maximum value for a float value. |
 |defaultValue |xs:float |RW |true | |The optional default value for the number. The default is 0.0 . |
 |step |xs:float |RW |true | |The optional step size for controlled increment and decrement. The default is 1.0 , even when this data point is not implemeneted. |
 
@@ -1392,7 +1392,7 @@ This ModuleClass provides capabilities for an over-current sensor.
 |-|-|-|-|-|-|
 |overcurrentStatus |xs:boolean |R |false | |The overcurrentStatus indicates as follows:<br />"True" indicates that an over-current is detected, and "False" indicates a normal status, this means that an over-current is not detected. |
 |detectedTime |m2m:timestamp |R |true | |The time when the over-current was detected. |
-|duration |xs:float |R |true |ms |The duration of the detected over-current.<br /> |
+|duration |xs:float |R |true |ms |The duration of the detected over-current. |
 
 
 
@@ -1429,6 +1429,8 @@ This ModuleClass provides capabilities for an ozone meter. The "ozoneValue..." a
 #### 5.3.1.61 magneticSensorParameters
 This ModuleClass provides capabilities to set service parameters for parking detectors. 
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.61-1: DataPoints of magneticSensorParameters ModuleClass**
 
@@ -1445,6 +1447,8 @@ This ModuleClass provides capabilities to set service parameters for parking det
 #### 5.3.1.62 parkingStatus
 This ModuleClass provides the status of the parking detector.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.62-1: DataPoints of parkingStatus ModuleClass**
 
@@ -1458,6 +1462,8 @@ This ModuleClass provides the status of the parking detector.
 #### 5.3.1.63 periodicalReportConfig
 This ModuleClass provides capabilities to set parameters of periodic report.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.63-1: DataPoints of periodicalReportConfig ModuleClass**
 
@@ -1492,7 +1498,7 @@ This ModuleClass provides the capability get or set the caller and receipient ID
 |-|-|-|-|-|-|
 |callerID |xs:string |RW |false | |This data point represents the initiating caller identification of a call. In case of an outgoing call this would be the local line ID. This data point is optional. When it is empty for an incomming call, then the caller ID is unknown. When it is empty for an outgoing call, then it is exepected that it is set by the PBX or the operator. The format of caller ID is not specified here. |
 |recipientID |xs:string |RW |false | |This data point represents the receiving caller identification of a call. In case of an incoming call this would be the local line ID and optionally extension. The format of caller ID is not specified here. |
-|callState |hd:enumCallState |R |true | |This data point represents the current state of an associated phone device regarding calls. |
+|callState |[hd:enumCallState](#566-hdenumcallstate) |R |true | |This data point represents the current state of an associated phone device regarding calls. |
 
 
 
@@ -1515,9 +1521,9 @@ This ModuleClass provides capabilities to control and monitor the operational mo
 
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
-|currentPlayerMode |hd:enumPlayerMode |RW |false | |The current mode of the player. |
+|currentPlayerMode |[hd:enumPlayerMode](#5627-hdenumplayermode) |RW |false | |The current mode of the player. |
 |currentPlayerModeName |xs:string |R |true | |Name of current player mode in string. This can be used when "currentPlayerMode" is vendor-specific. |
-|supportedPlayerModes |list of hd:enumPlayerMode |R |false | |List of supported modes for a player. |
+|supportedPlayerModes |list of [hd:enumPlayerMode](#5627-hdenumplayermode) |R |false | |List of supported modes for a player. |
 |speedFactor |xs:float |RW |true | |The optional factor of speeding up or slowing down playback, rewind or fast forward. |
 
 
@@ -1545,7 +1551,7 @@ This ModuleClass provides the capabilities for monitoring printing list informat
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
 |uri |list of xs:uri |trueR |false | |The URI of the printing file. The URI could be "file://www.example.com/file.extension" |
-|printingState |list of hd:enumJobState |R |false | |The printingState is indicating the status of the printing file. |
+|printingState |list of [hd:enumJobState](#5623-hdenumjobstate) |R |false | |The printingState is indicating the status of the printing file. <br><mark>Editor Note: Better mapping explanation needed. This doesn't seem to be the same as the usual list of enums used in other ModuleClasses</mark> |
 
 
 
@@ -1553,7 +1559,6 @@ This ModuleClass provides the capabilities for monitoring printing list informat
 #### 5.3.1.68 pulsemeter
 This ModuleClass provides the capability to report the measurement of pulse characteristics. 
 
-
 **Table 5.3.1.68-1: DataPoints of pulsemeter ModuleClass**
 
 |Name |Type |R-W |Optional |Unit |Documentation |
@@ -1644,9 +1649,9 @@ This ModuleClasses provides capabilities to control and monitor the job modes of
 
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
-|currentJobMode |hd:enumRobotCleanerJobMode |RW |false | |Currently active job mode (see clause 5.6.28).  |
+|currentJobMode |[hd:enumRobotCleanerJobMode](#5628-hdenumrobotcleanerjobmode) |RW |false | |Currently active job mode (see clause [5.6.28](#5628-hdenumrobotcleanerjobmode)).  |
 |currentJobModeName |xs:string |R |true | |Name of current job mode as a string. This can be used when "currentJobMode" is vendor-specific. |
-|jobModes |list of hd:enumRobotCleanerJobMode |R |false | |List of possible job states the device supports (see clause 5.6.28). |
+|jobModes |list of [hd:enumRobotCleanerJobMode](#5628-hdenumrobotcleanerjobmode) |R |false | |List of possible job states the device supports (see clause [5.6.28](#5628-hdenumrobotcleanerjobmode)). |
 
 
 
@@ -1659,10 +1664,10 @@ This ModuleClasses provides capabilities to control and the monitor machine stat
 
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
-|currentMachineState |hd:enumMachineState |RW |false  | |The currently active machine state  (see clause 5.6.25). |
-|machineStates |list of hd:enumMachineState |R |false | |A list of possible machine states the device supports (see clause 5.6.25). |
-|currentJobState |hd:enumJobState |R |true  | |The currently active job state at the level of some transaction being executed by the device  (see clause 5.6.23). |
-|jobStates |list of hd:enumJobState |R |true | |The list of possible job states that the device supports (see clause 5.6.23). |
+|currentMachineState |[hd:enumMachineState](#5625-hdenummachinestate) |RW |false  | |The currently active machine state  (see clause [5.6.25](#5625-hdenummachinestate)). |
+|machineStates |list of [hd:enumMachineState](#5625-hdenummachinestate) |R |false | |A list of possible machine states the device supports (see clause [5.6.25](#5625-hdenummachinestate)). |
+|currentJobState |[hd:enumJobState](#5623-hdenumjobstate) |R |true  | |The currently active job state at the level of some transaction being executed by the device  (see clause [5.6.23](#5623-hdenumjobstate)). |
+|jobStates |list of [hd:enumJobState](#5623-hdenumjobstate) |R |true | |The list of possible job states that the device supports (see clause [5.6.23](#5623-hdenumjobstate)). |
 |progressPercentage |xs:float |R |true |pct |The indication of current job progress in percentage. |
 
 
@@ -1676,8 +1681,8 @@ This ModuleClasses provides capabilities to control and monitor a security mode.
 
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
-|currentSecurityMode |hd:enumSecurityMode |RW |false  | |Current security mode (see clause 5.6.29). |
-|securityModes |list of hd:enumSecurityMode |R |false | |List of possible security modes the device supports (see clause 5.6.29). |
+|currentSecurityMode |[hd:enumSecurityMode](#5629-hdenumsecuritymode) |RW |false  | |Current security mode (see clause [5.6.29](#5629-hdenumsecuritymode)). |
+|securityModes |list of [hd:enumSecurityMode](#5629-hdenumsecuritymode) |R |false | |List of possible security modes the device supports (see clause [5.6.29](#5629-hdenumsecuritymode)). |
 
 
 
@@ -1713,6 +1718,8 @@ NOTE: Need further study for this module class.
 #### 5.3.1.79 slcAlarm
 This ModuleClass provides capabilities to provide alarm information of street light controller. 
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.79-1: DataPoints of slcAlarm ModuleClass**
 
@@ -1740,6 +1747,8 @@ This ModuleClass provides capabilities to provide alarm information of street li
 #### 5.3.1.80 slcParameterSetting
 This ModuleClass provides capabilities to set service parameters. 
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.80-1: DataPoints of slcParameterSetting ModuleClass**
 
@@ -1757,6 +1766,8 @@ This ModuleClass provides capabilities to set service parameters.
 #### 5.3.1.81 slcReportInfo
 This ModuleClass provides information of status of the street light controller.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.81-1: DataPoints of slcReportInfo ModuleClass**
 
@@ -1832,7 +1843,7 @@ This ModuleClass provides capabilities to control and monitor the level of spin.
 
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
-|spinLevelStrength |hd:enumSpinLevelStrength |RW |false | |The value of spin-dry level (see clause 5.6.30). A higher value indicates a higher spin level. |
+|spinLevelStrength |[hd:enumSpinLevelStrength](#5630-hdenumspinlevelstrength) |RW |false | |The value of spin-dry level (see clause [5.6.30](#5630-hdenumspinlevelstrength)). A higher value indicates a higher spin level. |
 
 
 
@@ -1845,9 +1856,9 @@ This ModuleClasses provides capabilities to control and monitor the job modes of
 
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
-|currentJobMode |hd:enumSteamClosetJobMode |RW |false | |Currently active job mode (see clause 5.6.31).  |
+|currentJobMode |[hd:enumSteamClosetJobMode](#5631-hdenumsteamclosetjobmode) |RW |false | |Currently active job mode (see clause [5.6.31](#5631-hdenumsteamclosetjobmode)).  |
 |currentJobModeName |xs:string |R |true | |Name of current job mode as a string. This can be used when "currentJobMode" is vendor-specific. |
-|jobModes |list of hd:enumSteamClosetJobMode |R |false | |List of possible job states the device supports (see clause 5.6.31). |
+|jobModes |list of [hd:enumSteamClosetJobMode](#5631-hdenumsteamclosetjobmode) |R |false | |List of possible job states the device supports (see clause [5.6.31](#5631-hdenumsteamclosetjobmode)). |
 
 
 
@@ -1888,7 +1899,7 @@ This ModuleClass provides capabilities to represent the current temperature and
 |-|-|-|-|-|-|
 |currentTemperature |xs:float |R |false | |The current temperature. |
 |targetTemperature |xs:float |RW |true | |The desired temperature to reach. |
-|unit |hd:enumTemperatureUnit |RW |true |C or F or K |Default values is 'C' |
+|unit |[hd:enumTemperatureUnit](#5640-hdenumtemperatureunit) |RW |true |C or F or K |Default values is 'C' |
 |minValue |xs:float |R |true | |Minimum value of "targetTemperature". |
 |maxValue |xs:float |R |true | |Maximum value of "targetTemperature". |
 |stepValue |xs:float |R |true | |Step value allowed for "targetTemperature". |
@@ -1899,12 +1910,14 @@ This ModuleClass provides capabilities to represent the current temperature and
 #### 5.3.1.88 temperatureAlarm
 This ModuleClass provides the capabilities to indicate the detection of abnormal temperatures and raises an alarm if the triggering criterion is met. 
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.88-1: DataPoints of temperatureAlarm ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
-|unit |hd:enumTemperatureUnit |RW |true |C or F or K |Default value is 'C' |
+|unit | [hd:enumTemperatureUnit](#5640-hdenumtemperatureunit) |RW |true |C or F or K |Default value is 'C' |
 |temperature |xs:float |R |true |Defined in the datapoint 'unit' |To report the value of the temperature.  |
 | | | | | | |
 |highTemperatureAlarm |xs:boolean |R |false | |High temperature alarm |
@@ -1995,7 +2008,7 @@ This ModuleClass describes the capabilities of an ultraviolet sensor.
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
 |uvValue |xs:float |R |false |mW/cm2 | |
-|uvStatus |hd:enumUvStatus |R |true | |The "uvStatus" indicates the level of the UV radiation status (see clause 5.6.35).  |
+|uvStatus |[hd:enumUvStatus](#5635-hdenumuvstatus) |R |true | |The "uvStatus" indicates the level of the UV radiation status (see clause [5.6.35](#5635-hdenumuvstatus)).  |
 
 
 
@@ -2008,7 +2021,7 @@ This ModuleClass provides capabilities for controlling the water strength of a d
 
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
-|waterLevelStrength |hd:enumWaterFlowStrength |RW |false | |The desired level of water flow (see clause 5.6.37). A higher value indicates higher water flow. |
+|waterLevelStrength |[hd:enumWaterFlowStrength](#5637-hdenumwaterflowstrength) |RW |false | |The desired level of water flow (see clause [5.6.37](#5637-hdenumwaterflowstrength)). A higher value indicates higher water flow. |
 
 
 
@@ -2016,6 +2029,8 @@ This ModuleClass provides capabilities for controlling the water strength of a d
 #### 5.3.1.94 waterMeterAlarm
 This ModuleClass provides capabilities to provide alarm information of watermeter, such as the alarm of low water flow. Once an alarm is fired, a notification should be sent out from the device and no historical alarm is stored locally, therefore no need to associate timestamp with the alarms. 
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.94-1: DataPoints of waterMeterAlarm ModuleClass**
 
@@ -2060,6 +2075,8 @@ This ModuleClass provides capabilities to provide alarm information of watermete
 #### 5.3.1.95 waterMeterReportInfo
 This ModuleClass provides information of measurements of the watermeter.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.95-1: DataPoints of waterMeterReportInfo ModuleClass**
 
@@ -2089,6 +2106,8 @@ This ModuleClass provides information of measurements of the watermeter.
 #### 5.3.1.96 waterMeterSetting
 This ModuleClass provides capabilities to set service parameters for data sampling and reporting. 
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.96-1: DataPoints of waterMeterSetting ModuleClass**
 
@@ -2121,6 +2140,8 @@ This ModuleClass provides the capabilities to indicate whether or not water has
 #### 5.3.1.98 waterQualityMonitor
 This ModuleClass provides the information of water quality detection.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.98-1: DataPoints of waterQualityMonitor ModuleClass**
 
@@ -2133,7 +2154,7 @@ This ModuleClass provides the information of water quality detection.
 |biotoxicity |xs:float |R |true |mg/L |Biological toxicity |
 |bod |xs:float |R |true |mg/L |Biochemical oxygen demand (BOD) is the amount of dissolved oxygen consumed during the biochemical reaction of biodegradable organic matter that is decomposed by microorganisms in water under certain conditions. |
 |cod |xs:float |R |true |mg/L |Chemical oxygen demand (COD) is the amount of reducing substance that needs to be oxidized in a water sample. |
-|conductivity |xs:float |R |true |S/m <br />(siemens per meter) |Conductivity is a parameter used to describe the ease of charge flow in a substance. |
+|conductivity |xs:float |R |true |S/m |Conductivity is a parameter used to describe the ease of charge flow in a substance. |
 |cd |xs:float |R |true |mg/L |Cadmium (Cd) |
 |chlorophyll_a |xs:float |R |true |mg/L |Chlorophyll a |
 |cn |xs:float |R |true |mg/L |Cyanide (CN) |
@@ -2168,7 +2189,7 @@ This ModuleClass provides the capability to report the measurement of weight.
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
 |weight |xs:float |R |false |kg |The weight measurement.  |
-|unit |hd:enumWeightUnit |RW |true | |The unit of measure for the weight values. The default is kilogram (kg). (see clause 5.6.39). |
+|unit |[hd:enumWeightUnit](#5639-hdenumweightunit) |RW |true | |The unit of measure for the weight values. The default is kilogram (kg). (see clause [5.6.39](#5639-hdenumweightunit)). |
 
 
 
@@ -2176,6 +2197,8 @@ This ModuleClass provides the capability to report the measurement of weight.
 #### 5.3.1.100 anemometer
 This ModuleClass provides the capabilities to indicate the measure of the wind speed.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.100-1: DataPoints of anemometer ModuleClass**
 
@@ -2189,6 +2212,8 @@ This ModuleClass provides the capabilities to indicate the measure of the wind s
 #### 5.3.1.101 barometer
 This ModuleClass provides the capabilities to measure the atmospheric pressure and indicate the detection of abnormal pressure, and raise an alarm if a triggering criterion is met.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.101-1: DataPoints of barometer ModuleClass**
 
@@ -2205,6 +2230,8 @@ This ModuleClass provides the capabilities to measure the atmospheric pressure a
 
 This ModuleClass provides the capabilities to measure the height of fallen rain.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.102-1: Actions of rainGauge ModuleClass**
 
@@ -2227,6 +2254,7 @@ This ModuleClass provides the capabilities to measure the height of fallen rain.
 #### 5.3.1.103 infraredSensor
 This ModuleClass provides the capabilities to indicate whether or not an object has been sensed.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
 
 **Table 5.3.1.103-1: DataPoints of infraredSensor ModuleClass**
 
@@ -2241,6 +2269,8 @@ This ModuleClass provides the capabilities to indicate whether or not an object
 
 This ModuleClass provides capabilities to control the status of the disposing functionality for garbage disposal.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.104-1: DataPoints of disposal ModuleClass**
 
@@ -2254,12 +2284,14 @@ This ModuleClass provides capabilities to control the status of the disposing fu
 #### 5.3.1.105 waterFilterType
 This ModuleClass indicates the type of the water purifier.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.105-1: DataPoints of waterFilterType ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
-|filterType |hd:enumWaterFilterType |R |false | |The type of water purifier. list of Water Filter Type(see clause5.6.41). |
+|filterType |[hd:enumWaterFilterType](#5641-hdenumwaterfiltertype) |R |false | |The type of water purifier. list of Water Filter Type(see clause [5.6.41](#5641-hdenumwaterfiltertype)). |
 
 
 
@@ -2267,6 +2299,8 @@ This ModuleClass indicates the type of the water purifier.
 #### 5.3.1.106 touchScreen
 This ModuleClass provides the capability to get selections of a user from the pre-defined menus on the screen as parts of a process of charging transportation payment card of the user.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.106-1: DataPoints of touchScreen ModuleClass**
 
@@ -2280,7 +2314,9 @@ This ModuleClass provides the capability to get selections of a user from the pr
 
 
 #### 5.3.1.107 prePaidCardReader
-The Pre-paid card reader ModuleClass provides functions to read NFC card and indicates its information..
+The Pre-paid card reader ModuleClass provides functions to read NFC card and indicates its information.
+
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
 
 
 **Table 5.3.1.107-1: DataPoints of prePaidCardReader ModuleClass**
@@ -2296,7 +2332,9 @@ The Pre-paid card reader ModuleClass provides functions to read NFC card and ind
 
 
 #### 5.3.1.108 billDeposit
-This ModuleClass provides the capability to deposit bills, indicates the balance of the deposited bills and detects fake.
+This ModuleClass provides the capability to deposit bills, indicates the balance of the deposited bills and detects fakes.
+
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
 
 
 **Table 5.3.1.108-1: DataPoints of billDeposit ModuleClass**
@@ -2313,7 +2351,9 @@ This ModuleClass provides the capability to deposit bills, indicates the balance
 
 
 #### 5.3.1.109 billWithdrawal
-This ModuleClass provides the capability to withdraw bills which are deposited by the billDepositModule.
+This ModuleClass provides the capability to withdraw bills which are deposited by the [billDeposit](#531108-billdeposit) ModuleClass.
+
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
 
 
 **Table 5.3.1.109-1: DataPoints of billWithdrawal ModuleClass**
@@ -2328,7 +2368,9 @@ This ModuleClass provides the capability to withdraw bills which are deposited b
 
 
 #### 5.3.1.110 coinDeposit
-This ModuleClass provides the capability to deposit coins, indicates the balance of the deposited coins and detects fake.
+This ModuleClass provides the capability to deposit coins, indicates the balance of the deposited coins and detects fakes.
+
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
 
 
 **Table 5.3.1.110-1: DataPoints of coinDeposit ModuleClass**
@@ -2345,7 +2387,9 @@ This ModuleClass provides the capability to deposit coins, indicates the balance
 
 
 #### 5.3.1.111 cashDispenser
-This ModuleClass provides the capability to withdraw designated amount of cash or returns all the deposited bills and coins by the billDepositModule and coinDepositModule.
+This ModuleClass provides the capability to withdraw designated amount of cash or returns all the deposited bills and coins by the [billDeposit](#531108-billdeposit) ModuleClass and [coinDeposit](#531110-coindeposit) ModuleClass.
+
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
 
 
 **Table 5.3.1.111-1: DataPoints of cashDispenser ModuleClass**
@@ -2361,7 +2405,9 @@ This ModuleClass provides the capability to withdraw designated amount of cash o
 
 
 #### 5.3.1.112 cardScanner
-This ModuleClass provides the capability to scan an image of a card, gets the card information from the image and provides the information..
+This ModuleClass provides the capability to scan an image of a card, gets the card information from the image and provides the information.
+
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
 
 
 **Table 5.3.1.112-1: DataPoints of cardScanner ModuleClass**
@@ -2377,6 +2423,8 @@ This ModuleClass provides the capability to scan an image of a card, gets the ca
 #### 5.3.1.113 headingSensor
 This ModuleClass provides the capabilities to indicate the heading (e.g. status of get-in and get-out) of a pedestrian or a vehicle which crossing a control point (e.g. entrance and gate).
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.113-1: DataPoints of headingSensor ModuleClass**
 
@@ -2391,6 +2439,8 @@ This ModuleClass provides the capabilities to indicate the heading (e.g. status
 #### 5.3.1.114 signalPanel
 This ModuleClass displays a signal (e.g. direction arrow) to indicate a gate is permitted to get-in or get-out on a panel.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.114-1: DataPoints of signalPanel ModuleClass**
 
@@ -2404,6 +2454,8 @@ This ModuleClass displays a signal (e.g. direction arrow) to indicate a gate is
 #### 5.3.1.115 crossingBarrier
 An active barrier is used to block a pedestrian or vehicle from a control point (e.g. entrance and gate).
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.115-1: DataPoints of crossingBarrier ModuleClass**
 
@@ -2419,16 +2471,18 @@ An active barrier is used to block a pedestrian or vehicle from a control point
 #### 5.3.1.116 threeDDisplay
 This ModuleClass provides capabilities to give the information of a 3D display.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.116-1: DataPoints of threeDDisplay ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
-|threeDDisplayType |hd:enum3DDisplayType |R |false | |The type of 3D display technology (see clause 5.6.52) |
+|threeDDisplayType |[hd:enum3DDisplayType](#5652-hdenum3ddisplaytype) |R |false | |The type of 3D display technology (see clause [5.6.52](#5652-hdenum3ddisplaytype)) |
 |threeDDisplayViewAngle |xs:integer |R |true |degree |This data point indicates viewing angle of the 3D display (1..360) |
 |threeDDisplayResolutionX |xs:integer |R |true |px |This data point indicates resolution of X-axis of the 3D display. |
 |threeDDisplayResolutionY |xs:integer |R |true |px |This data point indicates resolution of Y-axis of the 3D display. |
-|threeDGlasses |xs:boolean |R |true | |This data point indicates the 3D display uses 3D  glasses (TRUE) or not. |
+|threeDGlasses |xs:boolean |R |true | |This data point indicates the 3D display uses 3D  glasses (True) or not. |
 
 
 
@@ -2436,12 +2490,14 @@ This ModuleClass provides capabilities to give the information of a 3D display.
 #### 5.3.1.117 threeDScanner
 This ModuleClass provides the capability to scanning 3D object for the user.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.117-1: DataPoints of threeDScanner ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
-|threeDScannerType |hd:enum3DScannerType |R |false | |This data point indicates type of the 3D scanner |
+|threeDScannerType |[hd:enum3DScannerType](#5653-hdenum3dscannertype) |R |false | |This data point indicates type of the 3D scanner (see clause [5.6.53](#5653-hdenum3dscannertype)) |
 |threeDScanResolution |xs:integer |R |false |dpi  |This data point indicates the scanning resolution. |
 |maxSizeX |xs:float |R |true |cm |This data point indicates the maximum horizontal size of the scanning. |
 |maxSizeY |xs:float |R |true |cm |This data point indicates the maximum vertical size of the scanning. |
@@ -2453,13 +2509,15 @@ This ModuleClass provides the capability to scanning 3D object for the user.
 #### 5.3.1.118 blender
 This ModuleClass is for controlling a blender, for example in a juicer. 
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.118-1: DataPoints of blender ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
 |useBlender |xs:boolean |RW |false | |The current status of the blender enablement. "True" indicates enabled, and "False" indicates disabled. |
-|spinSpeed |hd:enumSpinLevelStrength |RW |true | |Choose the right spin speed according to the hardness of the object (eg.fruits and vegetables) (see clause 5.6.30) |
+|spinSpeed |[hd:enumSpinLevelStrength](#5630-hdenumspinlevelstrength) |RW |true | |Choose the right spin speed according to the hardness of the object (eg.fruits and vegetables) (see clause [5.6.30](#5630-hdenumspinlevelstrength)) |
 
 
 
@@ -2467,14 +2525,16 @@ This ModuleClass is for controlling a blender, for example in a juicer.
 #### 5.3.1.119 shoesWasherJobMode
 This ModuleClasses provides capabilities to control and monitor the job modes of a shoesWasher.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.1.119-1: DataPoints: DataPoints of shoesWasherJobMode ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
-|currentJobMode |hd: enumShoesWasherJobMode |RW |false | |The currently active job mode. (see clause5.6.54) |
+|currentJobMode |[hd:enumShoesWasherJobMode](#5654-hdenumshoeswasherjobmode) |RW |false | |The currently active job mode. (see clause [5.6.54](#5654-hdenumshoeswasherjobmode)) |
 |currentJobModeName |xs:string |R |true | |The name of the current job mode as a string. This can be used when the currentJobMode is vendor-specific. |
-|jobModes |list of hd: enumShoesWasherJobMode |R |false | |List of possible job states the device supports (see clause5.6.54) |
+|jobModes |list of [hd:enumShoesWasherJobMode](#5654-hdenumshoeswasherjobmode) |R |false | |List of possible job states the device supports (see clause [5.6.54](#5654-hdenumshoeswasherjobmode)) |
 
 
 
@@ -2494,13 +2554,15 @@ This ModuleClasses provides capabilities to control and monitor the job modes of
 #### 5.3.7.1 cowActivityMonitor
 This ModuleClass provides capabilities to measure activity data in terms of step count. The data sampling rate is every hour by default.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.7.1-1: DataPoints of cowActivityMonitor ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
-|stepsPerPeriod |list of xs:integer |R |false | |Counted steps per hour during each report period. The value is updated every report period. The length of the report period can be configured by the periodicalReportConfig ModuleClass. If not configured, the default length of the period is 1 hour.<br />If the report period is longer than 1 hour, this data point may contain multiple data samples (one for each hour) during last period. The report period should always be set to longer than 1 hour which is the data sampling period. The start time of the data sampling and report period is implementation specific, e.g. the power-on time. |
-|updateTime |xs:datetime |R |true | |A timestamp that indicates the update time of the stepsPerPeriod data point. |
+|stepsPerPeriod |list of xs:integer |R |false | |Counted steps per hour during each report period. The value is updated every report period. The length of the report period can be configured by the [periodicalReportConfig](#53163-periodicalreportconfig) ModuleClass. If not configured, the default length of the period is 1 hour.<br />If the report period is longer than 1 hour, this data point may contain multiple data samples (one for each hour) during last period. The report period should always be set to longer than 1 hour which is the data sampling period. The start time of the data sampling and report period is implementation specific, e.g. the power-on time. |
+|updateTime |xs:datetime |R |true | |A timestamp that indicates the update time of the *stepsPerPeriod* data point. |
 |historyStepCounts |list of xs:integer |R |false | |The list of stepCounts per hour during the last 24 hours (in total 24 data samples). |
 
 
@@ -2518,7 +2580,7 @@ The Balise Transmission Module(BTM) ModuleClasses provides capabilities to indic
 
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
-|baliseSystemId |hd:enumBaliseSystemIndicator |R |true | |Get the hd:enumBaliseSystemIndicator (see clause 5.6.38).  |
+|baliseSystemId |[hd:enumBaliseSystemIndicator](#5638-hdenumbalisesystemindicator) |R |true | |Get the hd:enumBaliseSystemIndicator (see clause [5.6.38](#5638-hdenumbalisesystemindicator)).  |
 |telegramMessage |xs:string |R |true | |The telegramMessage is system-specific. |
 
 
@@ -2589,6 +2651,8 @@ This ModuleClass provides information on the origin of the parent device data.
 #### 5.3.10.1 Disseminator
 This ModuleClass provides the capability of creating oneM2M based information from CAP based information received from oneM2M SP Gateway (ASN) and of controlling the change of received public warning messages such as updating oneM2M based information and canceling the dissemination of oneM2M based information.
 
+<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
+
 
 **Table 5.3.10.1-1: Actions of disseminator ModuleClass**
 
@@ -2606,12 +2670,12 @@ This ModuleClass provides the capability of creating oneM2M based information fr
 |identifier |xs:string |RW |false | |The identifier of the warning message that uniquely identifying this message. |
 |sender |xs:string |RW |false | |The identifier of the originator of this alert message. |
 |sent |xs:dateTime |RW |false | |The time and date of the origination of this alert message. |
-|status |hd:enumAlertStatus |RW |false | |The code to represent the appropriate handling of the alert message receiver. The value of this DataPoint is specified the CAP 1.2 specification <a href="#_ref_22">[22]</a> <br />(see clause 5.5.2). |
-|msgType |hd:enumAlertMsgType |RW |false | |The code to represent the nature of the alert message. The value of this DataPoint is specified the CAP 1.2 specification <a href="#_ref_22">[22]</a> (see clause 5.5.3). |
+|status |[hd:enumAlertStatus](#5655-hdenumalertstatus) |RW |false | |The code to represent the appropriate handling of the alert message receiver. The value of this DataPoint is specified the CAP 1.2 specification <a href="#_ref_22">[22]</a> <br />(see clause [5.6.55](#5655-hdenumalertstatus)). |
+|msgType |[hd:enumAlertMsgType](#5656-hdenumalertmsgtype) |RW |false | |The code to represent the nature of the alert message. The value of this DataPoint is specified the CAP 1.2 specification <a href="#_ref_22">[22]</a> (see clause [5.6.56](#5656-hdenumalertmsgtype)). |
 |references |list of xs:string |RW |true | |The list of identifiers for earlier message(s) referenced by this alert message. |
-|urgency |hd:enumUrgency |RW |false | |The code representing the urgency of the subject event of the alert message (see clause 5.5.4). |
-|severity |hd:enumSeverty |RW |false | |The code representing the severity of the subject event of the alert message (see clause 5.5.5). |
-|certainty |hd:enumCertainty |RW |false | |The code representing the certainty of the subject event of the alert message (see clause 5.5.6). |
+|urgency |[hd:enumUrgency](#5657-hdenumurgency) |RW |false | |The code representing the urgency of the subject event of the alert message (see clause [5.6.57](#5657-hdenumurgency)). |
+|severity |[hd:enumSeverity](#5658-hdenumseverity) |RW |false | |The code representing the severity of the subject event of the alert message (see clause [5.6.59](#5658-hdenumseverity)). |
+|certainty |[hd:enumCertainty](#5659-hdenumcertainty) |RW |false | |The code representing the certainty of the subject event of the alert message (see clause [5.6.59](#5659-hdenumcertainty)). |
 |eventCodes |list of xs:string |RW |false | |The definitions of system-specific codes identifying the event type of the alert message. A code definition consists of valueName and value pair separated by colon. |
 |effective |xs:dateTime |RW |true | |The effective time of the information of the alert message. |
 |onset |xs:dateTime |RW |true | |The expected time of the beginning of the subject event of the alert message. |
@@ -2637,12 +2701,12 @@ This ModuleClass provides the capability of triggering things to change into an
 |identifier |xs:string |RW |false | |The identifier of the warning message that uniquely identifying this message. |
 |sender |xs:string |RW |false | |The identifier of the originator of this alert message. |
 |sent |xs:dateTime |RW |false | |The time and date of the origination of this alert message. |
-|status |hd:enumAlertStatus |RW |false | |The code to represent the appropriate handling of the alert message receiver. The value of this DataPoint is specified the CAP 1.2 specification <a href="#_ref_22">[22]</a> (see clause 5.5.2). |
-|msgType |hd:enumAlertMsgType |RW |false | |The code to represent the nature of the alert message. The value of this DataPoint is specified the CAP 1.2 specification <a href="#_ref_22">[22]</a> (see clause 5.5.3). |
+|status |[hd:enumAlertStatus](#5655-hdenumalertstatus) |RW |false | |The code to represent the appropriate handling of the alert message receiver. The value of this DataPoint is specified by the CAP 1.2 specification <a href="#_ref_22">[22]</a> (see clause [5.6.55](#5655-hdenumalertstatus)). |
+|msgType |[hd:enumAlertMsgType](#5656-hdenumalertmsgtype) |RW |false | |The code to represent the nature of the alert message. The value of this DataPoint is specified the CAP 1.2 specification <a href="#_ref_22">[22]</a> (see clause [5.6.56](#5656-hdenumalertmsgtype)). |
 |references |list of xs:string |RW |false | |The list of identifiers for earlier message(s) referenced by this alert message. |
-|urgency |hd:enumUrgency |RW |false | |The code representing the urgency of the subject event of the alert message (see clause 5.5.4). |
-|severity |hd:enumSeverty |RW |false | |The code representing the severity of the subject event of the alert message (see clause 5.5.5). |
-|certainty |hd:enumCertainty |RW |false | |The code representing the certainty of the subject event of the alert message (see clause 5.5.6). |
+|urgency |[hd:enumUrgency](#5657-hdenumurgency) |RW |false | |The code representing the urgency of the subject event of the alert message (see clause [5.6.57](#5657-hdenumurgency)). |
+|severity |[hd:enumSeverity](#5658-hdenumseverity) |RW |false | |The code representing the severity of the subject event of the alert message (see clause [5.6.5](#5658-hdenumseverity)). |
+|certainty |[hd:enumCertainty](#5659-hdenumcertainty) |RW |false | |The code representing the certainty of the subject event of the alert message (see clause [5.6.59](#5659-hdenumcertainty)). |
 |eventCodes |list of xs:string |RW |false | |The definitions of system-specific codes identifying the event type of the alert message. A code definition consists of valueName and value pair separated by colon. |
 |effective |xs:dateTime |RW |true | |The effective time of the information of the alert message. |
 |onset |xs:dateTime |RW |true | |The expected time of the beginning of the subject event of the alert message. |
@@ -2678,7 +2742,7 @@ This ModuleClass provides the capability of selecting the option that allows thi
 
 
 #### 5.4.1.2 subDevicePowerOutlet
-A powerOutlet is a subDevice that specifies the attachment device for deviceSmartPlug.
+A powerOutlet is a subDevice that specifies the attachment device for [deviceSmartPlug](#55111-devicesmartplug).
 
 
 **Table 5.4.1.2-1: Modules of subDevicePowerOutlet model**
@@ -2687,8 +2751,8 @@ A powerOutlet is a subDevice that specifies the attachment device for deviceSmar
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |0..1 |See clause [5.3.1.12](#53112-binaryswitch). |
 |energyConsumption |[energyConsumption](#53132-energyconsumption) |0..1 |See clause [5.3.1.32](#53132-energyconsumption). |
-|overcurrentSensor |overcurrentSensor |0..1 |See clause 5.3.1.58. |
-|dimmingLevel |numberValue |0..1 |See clause 5.3.1.55.<br />This provides the capability to change the energy. |
+|overcurrentSensor |[overcurrentSensor](#53158-overcurrentsensor) |0..1 |See clause [5.3.1.58](#53158-overcurrentsensor). |
+|dimmingLevel |[numberValue](#53155-numbervalue) |0..1 |See clause [5.3.1.55](#53155-numbervalue).<br />This provides the capability to change the energy. |
 
 
 
@@ -2706,8 +2770,8 @@ A cuff is a subDevice that expresses the attachment device for measuring blood p
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |0..1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|sphygmomanometer |sphygmomanometer |1 |See clause 5.3.1.83. |
-|pulsemeter |pulsemeter |1 |See clause 5.3.1.68. |
+|sphygmomanometer |[sphygmomanometer](#53183-sphygmomanometer) |1 |See clause [5.3.1.83](#53183-sphygmomanometer). |
+|pulsemeter |[pulsemeter](#53168-pulsemeter) |1 |See clause [5.3.1.68](#53168-pulsemeter). |
 
 
 
@@ -2733,9 +2797,9 @@ A 3D printer is a smart home appliance to provide 3D printing capabilities.
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
 |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). |
 |threeDprinter |[threeDprinter](#5311-threedprinter) |1 |See clause [5.3.1.1](#5311-threedprinter). |
-|runState |runState |1 |See clause 5.3.1.75. |
-|temperature |temperature |1 |See clause 5.3.1.87.<br />This value of "currentTemperature" in this module instance represents the temperature of the nozzle. This value SHALL be a float number in a range from 0.0 to 1000.0. |
-|printQueue |printQueue |1 |See clause 5.3.1.67. |
+|runState |[runState](#53175-runstate) |1 |See clause [5.3.1.75](#53175-runstate). |
+|temperature |[temperature](#53187-temperature) |1 |See clause [5.3.1.87](#53187-temperature).<br />This value of "currentTemperature" in this module instance represents the temperature of the nozzle. This value SHALL be a float number in a range from 0.0 to 1000.0. |
+|printQueue |[printQueue](#53167-printqueue) |1 |See clause [5.3.1.67](#53167-printqueue). |
 
 
 
@@ -2743,15 +2807,14 @@ A 3D printer is a smart home appliance to provide 3D printing capabilities.
 #### 5.5.1.2 deviceAirQualityMonitor
 An air quality monitor is an environmental monitoring device used to monitor the air quality.
 
-
 **Table 5.5.1.2-1: Modules of deviceAirQualityMonitor Device model**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|airQualitySensor |[airQualitySensor](#5316-airqualitysensor) |1 |See clause 5.3.1.6. |
+|airQualitySensor |[airQualitySensor](#5316-airqualitysensor) |1 |See clause [5.3.1.6](#5316-airqualitysensor). |
 |battery |[battery](#53110-battery) |0..1 |See clause [5.3.1.10](#53110-battery). |
 |connectivity |[connectivity](#53125-connectivity) |0..1 |See clause [5.3.1.25](#53125-connectivity). |
-|periodicalReportConfig |periodicalReportConfig |0..1 |See clause 5.3.1.63. |
+|periodicalReportConfig |[periodicalReportConfig](#53163-periodicalreportconfig) |0..1 |See clause [5.3.1.63](#53163-periodicalreportconfig). |
 
 
 
@@ -2766,8 +2829,8 @@ An audio receiver is a device that receives audio signals from a number of sourc
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
 |audioVolume |[audioVolume](#5318-audiovolume) |1 |See clause [5.3.1.8](#5318-audiovolume). |
-|mediaInput |mediaSelect |0..1 |See clause 5.3.1.53. |
-|mediaOutput |mediaSelect |0..1 |See clause 5.3.1.53. |
+|mediaInput |[mediaSelect](#53153-mediaselect) |0..1 |See clause [5.3.1.53](#53153-mediaselect). |
+|mediaOutput |[mediaSelect](#53153-mediaselect) |0..1 |See clause [5.3.1.53](#53153-mediaselect). |
 
 
 
@@ -2780,9 +2843,9 @@ A camera is an optical instrument for recording or capturing images, which may b
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|sessionDescription |sessionDescription |1 |See clause 5.3.1.77. |
-|playerControl |playerControl |0..1 |See clause 5.3.1.65. |
-|motionSensor |motionSensor |0..1 |See clause 5.3.1.54. |
+|sessionDescription |[sessionDescription](#53177-sessiondescription) |1 |See clause [5.3.1.77](#53177-sessiondescription). |
+|playerControl |[playerControl](#53165-playercontrol) |0..1 |See clause [5.3.1.65](#53165-playercontrol). |
+|motionSensor |[motionSensor](#53154-motionsensor) |0..1 |See clause [5.3.1.54](#53154-motionsensor). |
 
 
 
@@ -2795,9 +2858,9 @@ A door is a device that is used to open and close a door.
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|openLevel |openLevel |0..1 |See clause 5.3.1.56. |
+|openLevel |[openLevel](#53156-openlevel) |0..1 |See clause [5.3.1.56](#53156-openlevel). |
 |doorLock |[lock](#53152-lock) |0..1 |See clause [5.3.1.52](#53152-lock). |
-|doorStatus |[doorStatus](#53130-doorstatus) |0..1 |See clause[5.3.1.30](#53130-doorstatus). |
+|doorStatus |[doorStatus](#53130-doorstatus) |0..1 |See clause [5.3.1.30](#53130-doorstatus). |
 
 
 
@@ -2827,11 +2890,11 @@ A light is a device that is used to control the state of an illumination applian
 |-|-|-|-|
 |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). |
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
 |colour |[colour](#53123-colour) |0..1 |See clause [5.3.1.23](#53123-colour). |
 |colourSaturation |[colourSaturation](#53124-coloursaturation) |0..1 |See clause [5.3.1.24](#53124-coloursaturation). |
 |brightness |[brightness](#53117-brightness) |0..1 |See clause [5.3.1.17](#53117-brightness). |
-|timer |timer |0..1 |See clause 5.3.1.90. |
+|timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). |
 
 
 
@@ -2845,10 +2908,10 @@ A Multi Function Printer (MFP) is an office machine which incorporates the funct
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|printerRunState |runState |1 |See clause 5.3.1.75. |
-|scannerRunState |runState |0..1 |See clause 5.3.1.75. |
+|printerRunState |[runState](#53175-runstate) |1 |See clause [5.3.1.75](#53175-runstate). |
+|scannerRunState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
 |autoDocumentFeeder |[autoDocumentFeeder](#5319-autodocumentfeeder) |0..1 |See clause [5.3.1.9](#5319-autodocumentfeeder). |
-|printQueue |printQueue |0..1 |See clause 5.3.1.67. |
+|printQueue |[printQueue](#53167-printqueue) |0..1 |See clause [5.3.1.67](#53167-printqueue). |
 
 
 
@@ -2862,8 +2925,8 @@ A printer is a device that is used to monitor or control the state of a printing
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
-|printQueue |printQueue |0..1 |See clause 5.3.1.67. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
+|printQueue |[printQueue](#53167-printqueue) |0..1 |See clause [5.3.1.67](#53167-printqueue). |
 
 
 
@@ -2877,7 +2940,7 @@ A scanner is a device that optically scans images, printed text, handwriting or
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |1 |See clause 5.3.1.75. |
+|runState |[runState](#53175-runstate) |1 |See clause [5.3.1.75](#53175-runstate). |
 |autoDocumentFeeder |[autoDocumentFeeder](#5319-autodocumentfeeder) |0..1 |See clause [5.3.1.9](#5319-autodocumentfeeder). |
 
 
@@ -2893,7 +2956,7 @@ A smart plug is a device that can turn on and off a connected appliance.
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |0..1 |See clause [5.3.1.12](#53112-binaryswitch). |
 |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). |
-|remoteControlEnable |remoteControlEnable |0..1 |See clause 5.3.1.73. |
+|remoteControlEnable |[remoteControlEnable](#53173-remotecontrolenable) |0..1 |See clause [5.3.1.73](#53173-remotecontrolenable). |
 
 
 
@@ -2902,7 +2965,7 @@ A smart plug is a device that can turn on and off a connected appliance.
 
 |Subdevice Instance Name |Subdevice Name |Multiplicity |Description |
 |-|-|-|-|
-|powerOutlet0 |subDevicePowerOutlet |1..N |See clause 5.4.1.2. |
+|powerOutlet0<br/><mark>Discuss: This should be "powerOutlet"</mark> |[subDevicePowerOutlet](#5412-subdevicepoweroutlet) |1..N |See clause [5.4.1.2](#5412-subdevicepoweroutlet). |
 
 
 
@@ -2926,9 +2989,9 @@ A thermometer is a device that can be used to check, for example, the body or ot
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|temperature |temperature |1 |See clause 5.3.1.87. |
+|temperature |[temperature](#53187-temperature) |1 |See clause [5.3.1.87](#53187-temperature). |
 |battery |[battery](#53110-battery) |1 |See clause [5.3.1.10](#53110-battery). |
-|temperatureAlarm |temperatureAlarm |0..1 |See clause 5.3.1.88 |
+|temperatureAlarm |[temperatureAlarm](#53188-temperaturealarm) |0..1 |See clause [5.3.1.88](#53188-temperaturealarm). |
 
 
 
@@ -2936,14 +2999,13 @@ A thermometer is a device that can be used to check, for example, the body or ot
 #### 5.5.1.14 deviceThermostat
 A thermostat is used to control the ambient temperature of rooms within, for example, a house. This information model provides capabilities to interact with specific functions of thermostats.
 
-
 **Table 5.5.1.14-1: Modules of deviceThermostat Device model**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|runState |runState |0..1 |See clause 5.3.1.75.<br />The possible values of the "supportedModes" datapoint for the thermostat device are included in clause 5.6.23. |
-|timer |timer |0..1 |See clause 5.3.1.90. |
-|temperature |temperature |1 |See clause 5.3.1.87. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate).<br />The possible values of the "supportedModes" datapoint for the thermostat device are included in clause 5.6.23. |
+|timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). |
+|temperature |[temperature](#53187-temperature) |1 |See clause [5.3.1.87](#53187-temperature). |
 
 
 
@@ -2956,7 +3018,7 @@ A water valve is a device that is used to turn the water supply ON or OFF remote
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|openLevel |openLevel |1 |See clause 5.3.1.56. |
+|openLevel |[openLevel](#53156-openlevel) |1 |See clause [5.3.1.56](#53156-openlevel). |
 
 
 
@@ -2964,16 +3026,20 @@ A water valve is a device that is used to turn the water supply ON or OFF remote
 #### 5.5.1.16 deviceServiceButton
 A service button is a device that initiates and controls technical or business processes, such as ordering consumer and industrial goods over the Internet. It may support optional ModuleClasses to present information to a user, such as presenting textual and graphical information.
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
+
+
 
 **Table 5.5.1.16-1: Modules of deviceServiceButton Device model**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|pushButton |pushButton |1 |See clause 5.3.1.69. |
+|pushButton |[pushButton](#53169-pushbutton) |1 |See clause [5.3.1.69](#53169-pushbutton). |
 |connectivity |[connectivity](#53125-connectivity) |0..1 |See clause [5.3.1.25](#53125-connectivity). |
-|operationMode |operationMode |0..1 |See clause 5.3.1.57. |
+|operationMode |[operationMode](#53157-operationmode) |0..1 |See clause [5.3.1.57](#53157-operationmode). |
 |battery |[battery](#53110-battery) |0..1 |See clause [5.3.1.10](#53110-battery). |
-|textMessage |textMessage |0..1 |See clause 5.3.1.89. This ModuleClass may be used to present textual information to a user. |
+|textMessage |[textMessage](#53189-textmessage) |0..1 |See clause [5.3.1.89](#53189-textmessage). This ModuleClass may be used to present textual information to a user. |
 |image |[binaryObject](#53111-binaryobject) |0..1 |See clause [5.3.1.11](#53111-binaryobject). This ModuleClass may be used to present graphical information to a user. |
 |credentials |[credentials](#53127-credentials) |0..1 |See clause [5.3.1.27](#53127-credentials). |
 |geoLocation |[geoLocation](#53141-geolocation) |0..1 |See clause [5.3.1.41](#53141-geolocation). This ModuleClass may be used to detect and report the geo-location of a deviceServiceButton device. |
@@ -2983,18 +3049,22 @@ A service button is a device that initiates and controls technical or business p
 #### 5.5.1.17 deviceGenericSensor
 A device that is composed of one or more basic sensors. This generic model is proposed to represent very simple appliances that feature one or more sensing behaviors (mono/multi sensors).
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
+
+
 
 **Table 5.5.1.17-1: Modules of deviceGenericSensor Device model**
 
 |Module Instance Name |Module Class Name |Optional |Description |
 |-|-|-|-|
-|temperatureAlarm |temperatureAlarm |0..1 |See clause 5.3.1.88. |
+|temperatureAlarm |[temperatureAlarm](#53188-temperaturealarm) |0..1 |See clause [5.3.1.88](#53188-temperaturealarm). |
 |acousticSensor |[acousticSensor](#5312-acousticsensor) |0..1 |See clause [5.3.1.2](#5312-acousticsensor). |
 |impactSensor |[impactSensor](#53147-impactsensor) |0..1 |See clause [5.3.1.47](#53147-impactsensor). |
-|motionSensor |motionSensor |0..1 |See clause 5.3.1.54. |
-|smokeSensor |smokeSensor |0..1 |See clause 5.3.1.82. |
-|uvSensor |uvSensor |0..1 |See clause 5.3.1.92. |
-|waterSensor |waterSensor |0..1 |See clause 5.3.1.84. |
+|motionSensor |[motionSensor](#53154-motionsensor) |0..1 |See clause [5.3.1.54](#53154-motionsensor). |
+|smokeSensor |[smokeSensor](#53182-smokesensor) |0..1 |See clause [5.3.1.82](#53182-smokesensor). |
+|uvSensor |[uvSensor](#53192-uvsensor) |0..1 |See clause [5.3.1.92](#53192-uvsensor). |
+|waterSensor |[waterSensor](#53197-watersensor) |0..1 |See clause [5.3.1.97](#53197-watersensor). |
 
 
 
@@ -3002,6 +3072,10 @@ A device that is composed of one or more basic sensors. This generic model is pr
 #### 5.5.1.18 device3DDisplay
 A 3D display is a device to display 3D contents such as 3D character or holographic image. 
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
+
+
 
 **Table 5.5.1.18-1: Modules of device3DDisplay Device model**
 
@@ -3010,9 +3084,9 @@ A 3D display is a device to display 3D contents such as 3D character or holograp
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
 |clock |[clock](#53118-clock) |0..1 |See clause [5.3.1.18](#53118-clock). |
 |audioVolume |[audioVolume](#5318-audiovolume) |0..1 |See clause [5.3.1.8](#5318-audiovolume). |
-|threeDDisplay |threeDDisplay |1 |See clause 5.3.1.116. |
+|threeDDisplay |[threeDDisplay](#531116-threeddisplay) |1 |See clause [5.3.1.116](#531116-threeddisplay). |
 |connectivity |[connectivity](#53125-connectivity) |1 |See clause [5.3.1.25](#53125-connectivity). |
-|machineState |runState |1 |See clause 5.3.1.75. |
+|machineState |[runState](#53175-runstate) |1 |See clause [5.3.1.75](#53175-runstate). |
 |lock |[lock](#53152-lock) |0..1 |See clause [5.3.1.52](#53152-lock). |
 
 
@@ -3021,6 +3095,8 @@ A 3D display is a device to display 3D contents such as 3D character or holograp
 #### 5.5.1.19 device3DScanner
 A 3D scanner is a device to scan 3D objects such as a statue of a character. 
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 
 **Table 5.5.1.19-1: Modules of device3DScanner device model**
 
@@ -3028,8 +3104,8 @@ A 3D scanner is a device to scan 3D objects such as a statue of a character.
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
 |clock |[clock](#53118-clock) |0..1 |See clause [5.3.1.18](#53118-clock). |
-|threeDScanState |runState |1 |See clause 5.3.1.75. |
-|threeDScanner |threeDScanner |1 |See clause 5.3.1.117. |
+|threeDScanState |[runState](#53175-runstate) |1 |See clause [5.3.1.75](#53175-runstate). |
+|threeDScanner |[threeDScanner](#531117-threedscanner) |1 |See clause [5.3.1.117](#531117-threedscanner). |
 |connectivity |[connectivity](#53125-connectivity) |1 |See clause [5.3.1.25](#53125-connectivity). |
 
 
@@ -3047,10 +3123,10 @@ An outdoor lamp is a smart home appliance to provide lights and information for
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
 |brightness |[ brightness](#53117-brightness) |0..1 |See clause [5.3.1.17](#53117-brightness). |
-|motionSensor |motionSensor |0..1 |See clause 5.3.1.54. |
+|motionSensor |[motionSensor](#53154-motionsensor) |0..1 |See clause [5.3.1.54](#53154-motionsensor). |
 |airQualitySensor |[airQualitySensor](#5316-airqualitysensor) |0..1 |See clause [5.3.1.6](#5316-airqualitysensor). |
-|uvSensor |uvSensor |0..1 |See clause 5.3.1.92. |
-|timer |timer |0..1 |See clause 5.3.1.90.<br />The timer is used to set duration of giving lights from the moment of triggering by the "[brightness](#53117-brightness)" module or "motionSensor" module. |
+|uvSensor |[uvSensor](#53192-uvsensor) |0..1 |See clause [5.3.1.92](#53192-uvsensor). |
+|timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer).<br />The timer is used to set duration of giving lights from the moment of triggering by the "[brightness](#53117-brightness)" module or "[motionSensor](#53154-motionsensor)" module. |
 |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). |
 
 
@@ -3059,6 +3135,8 @@ An outdoor lamp is a smart home appliance to provide lights and information for
 
 A parking detector is used to detect the state of the parking space. When the vehicle enters the parking space, the detector measure the change of the geomagnetic field strength, and report the state of the parking space to a server.
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 
 **Table 5.5.2.2-1: Modules of deviceMagneticParkingMonitor Device model**
 
@@ -3066,9 +3144,9 @@ A parking detector is used to detect the state of the parking space. When the ve
 |-|-|-|-|
 |battery |[battery](#53110-battery) |0..1 |See clause [5.3.1.10](#53110-battery). |
 |connectivity |[connectivity](#53125-connectivity) |0..1 |See clause [5.3.1.25](#53125-connectivity). |
-|periodicalReportConfig  |periodicalReportConfig  |0..1 |See clause 5.3.1.63. |
-|ParkingStatus |ParkingStatus |1 |See clause 5.3.1.62. |
-|magneticSensorParameters |magneticSensorParameter |1 |See clause 5.3.1.61. |
+|periodicalReportConfig  |[periodicalReportConfig](#53163-periodicalreportconfig)  |0..1 |See clause [5.3.1.63](#53163-periodicalreportconfig). |
+|ParkingStatus |[parkingStatus](#53162-parkingstatus) |1 |See clause [5.3.1.62](#53162-parkingstatus). |
+|magneticSensorParameters |[magneticSensorParameters](#53161-magneticsensorparameters) |1 |See clause [5.3.1.61](#53161-magneticsensorparameters). |
 
 
 
@@ -3084,7 +3162,7 @@ A smart electric meter is a metering device that is used to measure consumption
 |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). |
 |battery |[battery](#53110-battery) |0..1 |See clause [5.3.1.10](#53110-battery). |
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |0..1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
 |clock |[clock](#53118-clock) |0..1 |See clause [5.3.1.18](#53118-clock). |
 |energyConsumption |[energyConsumption](#53132-energyconsumption) |1 |See clause [5.3.1.32](#53132-energyconsumption). |
 |energyGeneration |[energyGeneration](#53133-energygeneration) |0..1 |See clause [5.3.1.33](#53133-energygeneration). |
@@ -3095,6 +3173,8 @@ A smart electric meter is a metering device that is used to measure consumption
 #### 5.5.2.4 deviceSmartGasMeter
 A smart gas meter is a metering device that is used to measure consumption data for gas.
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 
 **Table 5.5.2.4-1: Modules of deviceSmartGasMeter Device model**
 
@@ -3103,7 +3183,7 @@ A smart gas meter is a metering device that is used to measure consumption data
 |battery |[battery](#53110-battery) |0..1 |See clause [5.3.1.10](#53110-battery). |
 |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). |
 |connectivity |[connectivity](#53125-connectivity) |0..1 |See clause [5.3.1.25](#53125-connectivity).  |
-|periodicalReportConfig  |periodicalReportConfig  |0..1 |See clause 5.3.1.63. |
+|periodicalReportConfig  |[periodicalReportConfig](#53163-periodicalreportconfig)  |0..1 |See clause [5.3.1.63](#53163-periodicalreportconfig). |
 |gasMeterReportInfo |[gasMeterReportInfo](#53140-gasmeterreportinfo) |1 |See clause [5.3.1.40](#53140-gasmeterreportinfo). |
 |gasMeterControl |[binarySwitch](#53112-binaryswitch) |0..1 |See clause [5.3.1.12](#53112-binaryswitch). |
 |gasMeterAlarm |[gasMeterAlarm](#53139-gasmeteralarm) |0..1 |See clause [5.3.1.39](#53139-gasmeteralarm). |
@@ -3114,6 +3194,8 @@ A smart gas meter is a metering device that is used to measure consumption data
 #### 5.5.2.5 deviceSmartWaterMeter
 A smart water meter is a metering device that is used to measure consumption data for water.
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 
 **Table 5.5.2.5-1: Modules of deviceSmartWaterMeter Device model**
 
@@ -3122,11 +3204,11 @@ A smart water meter is a metering device that is used to measure consumption dat
 |battery |[battery](#53110-battery) |0..1 |See clause [5.3.1.10](#53110-battery). |
 |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). |
 |connectivity |[connectivity](#53125-connectivity) |0..1 |See clause [5.3.1.25](#53125-connectivity).  |
-|periodicalReportConfig |periodicalReportConfig |0..1 |See clause 5.3.1.63. |
-|waterMeterSetting |waterMeterSetting |0..1 |See clause 5.3.1.96. |
-|waterMeterReportInfo |waterMeterReportInfo |1 |See clause 5.3.1.95. |
+|periodicalReportConfig |[periodicalReportConfig](#53163-periodicalreportconfig) |0..1 |See clause [5.3.1.63](#53163-periodicalreportconfig). |
+|waterMeterSetting |[waterMeterSetting](#53196-watermetersetting) |0..1 |See clause 5.3.1.96. |
+|waterMeterReportInfo |[waterMeterReportInfo](#53195-watermeterreportinfo) |1 |See clause 5.3.1.95. |
 |waterMeterControl |[binarySwitch](#53112-binaryswitch) |0..1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|waterMeterAlarm |waterMeterAlarm |0..1 |See clause 5.3.1.94. |
+|waterMeterAlarm |[waterMeterAlarm](#53194-watermeteralarm) |0..1 |See clause 5.3.1.94. |
 
 
 
@@ -3134,6 +3216,8 @@ A smart water meter is a metering device that is used to measure consumption dat
 #### 5.5.2.6 deviceStreetLightController
 A street light controller is used to control the opening and closing of the street light.
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 
 **Table 5.5.2.6-1: Modules of deviceStreetLightController Device model**
 
@@ -3141,10 +3225,10 @@ A street light controller is used to control the opening and closing of the stre
 |-|-|-|-|
 |geoLocation |[geoLocation](#53141-geolocation) |0..1 |See clause [5.3.1.41](#53141-geolocation). |
 |connectivity |[connectivity](#53125-connectivity) |0..1 |See clause [5.3.1.25](#53125-connectivity). |
-|periodicalReportConfig |periodicalReportConfig |0..1 |See clause 5.3.1.63. |
-|slcReportInfo |slcReportInfo |1 |See clause 5.3.1.81. |
-|slcParameterSetting |slcParameterSetting |1 |See clause 5.3.1.80. |
-|slcAlarm |slcAlarm |1 |See clause 5.3.1.79. |
+|periodicalReportConfig |[periodicalReportConfig](#53163-periodicalreportconfig) |0..1 |See clause [5.3.1.63](#53163-periodicalreportconfig). |
+|slcReportInfo |[slcReportInfo](#53181-slcreportinfo) |1 |See clause [5.3.1.81](#53181-slcreportinfo). |
+|slcParameterSetting |[slcParameterSetting](#53180-slcparametersetting) |1 |See clause [5.3.1.80](#53180-slcparametersetting). |
+|slcAlarm |[slcAlarm](#53179-slcalarm) |1 |See clause [5.3.1.79](#53179-slcalarm). |
 
 
 
@@ -3152,6 +3236,8 @@ A street light controller is used to control the opening and closing of the stre
 #### 5.5.2.7 deviceWaterQualityMonitor
 An water quality monitor is an environmental monitoring device used to monitor water quality.
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 
 **Table 5.5.2.7-1: Modules of deviceWaterQualityMonitor Device model**
 
@@ -3159,8 +3245,8 @@ An water quality monitor is an environmental monitoring device used to monitor w
 |-|-|-|-|
 |battery |[battery](#53110-battery) |0..1 |See clause [5.3.1.10](#53110-battery). |
 |connectivity |[connectivity](#53125-connectivity) |0..1 |See clause [5.3.1.25](#53125-connectivity). |
-|periodicalReportConfig |periodicalReportConfig |0..1 |See clause 5.3.1.63. |
-|waterQualityMonitor |waterQualityMonitor |1 |See clause 5.3.1.98. |
+|periodicalReportConfig |[periodicalReportConfig](#53163-periodicalreportconfig) |0..1 |See clause [5.3.1.63](#53163-periodicalreportconfig). |
+|waterQualityMonitor |[waterQualityMonitor](#53198-waterqualitymonitor) |1 |See clause [5.3.1.98](#53198-waterqualitymonitor). |
 
 
 
@@ -3168,19 +3254,21 @@ An water quality monitor is an environmental monitoring device used to monitor w
 #### 5.5.2.8 deviceWeatherStation
 A weather station is a device that measures various atmospheric parameters.
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 
 **Table 5.5.2.8-1: Modules of deviceWeatherStation Device model**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|outdoorTemperature	 |temperature |1 |See clause 5.3.1.87. |
-|indoorTemperature	 |temperature |0..1 |See clause 5.3.1.87. |
+|outdoorTemperature	 |[temperature](#53187-temperature) |1 |See clause [5.3.1.87](#53187-temperature). |
+|indoorTemperature	 |[temperature](#53187-temperature) |0..1 |See clause [5.3.1.87](#53187-temperature). |
 |airQualitySensor	 |[airQualitySensor](#5316-airqualitysensor) |0..1 |See clause [5.3.1.6](#5316-airqualitysensor). |
-|anemometer |anemometer |0..1 |See clause 5.3.1.100. |
-|barometer	 |barometer |0..1 |See clause 5.3.1.101. |
-|rainGauge |rainGauge |0..1 |See clause 5.3.1.102. |
+|anemometer |[anemometer](#531100-anemometer) |0..1 |See clause [5.3.1.100](#531100-anemometer). |
+|barometer	 |[barometer](#531101-barometer) |0..1 |See clause [5.3.1.101](#531101-barometer). |
+|rainGauge |[rainGauge](#531102-raingauge) |0..1 |See clause [5.3.1.102](#531102-raingauge). |
 |acousticSensor |[acousticSensor](#5312-acousticsensor) |0..1 |See clause [acousticSensor](#5312-acousticsensor). |
-|uvSensor	 |uvSensor |0..1 |See clause 5.3.1.92. |
+|uvSensor	 |[uvSensor](#53192-uvsensor) |0..1 |See clause [5.3.1.92](#53192-uvsensor). |
 
 
 
@@ -3202,7 +3290,7 @@ A blood pressure monitor is a device that can be used to monitor the blood press
 
 |Subdevice Instance Name |Subdevice Name |Multiplicity |Description |
 |-|-|-|-|
-|cuff |subDeviceCuff |1..N |See clause 5.4.3.1. |
+|cuff |[subDeviceCuff](#5431-subdevicecuff) |1..N |See clause [5.4.3.1](#5431-subdevicecuff). |
 
 
 
@@ -3228,7 +3316,7 @@ A heart rate monitor is a device that can be used to monitor the heart rate.
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|pulsemeter |pulsemeter |1 |See clause 5.3.1.68. |
+|pulsemeter |[pulsemeter](#53168-pulsemeter) |1 |See clause [5.3.1.68](#53168-pulsemeter). |
 |battery |[battery](#53110-battery) |1 |See clause [5.3.1.10](#53110-battery). |
 
 
@@ -3242,8 +3330,8 @@ A pulseoximeter is a device that can be used to monitor the blood characteristic
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|pulsemeter |pulsemeter |0..1 |See clause 5.3.1.68.<br />When the "oximeter" module doesn't exist, then the "pulsemeter" module is mandatory. |
-|oximeter |oximeter |0..1 |See clause 5.3.1.59.<br />When the "pulsemeter" module doesn't exist, then the "oximeter" module is mandatory. |
+|pulsemeter |[pulsemeter](#53168-pulsemeter) |0..1 |See clause [5.3.1.68](#53168-pulsemeter).<br />When the "[oximeter](#53159-oximeter)" module doesn't exist, then the "[pulsemeter](#53168-pulsemeter)" module is mandatory. |
+|oximeter |[oximeter](#53159-oximeter) |0..1 |See clause [5.3.1.59](#53159-oximeter).<br />When the "[pulsemeter](#53168-pulsemeter)" module doesn't exist, then the "[oximeter](#53159-oximeter)" module is mandatory. |
 |battery |[battery](#53110-battery) |1 |See clause [5.3.1.10](#53110-battery). |
 
 
@@ -3256,7 +3344,7 @@ A weight scale and body composition analyser is a device that can be used to mon
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|weight |weight |1 |See clause 5.3.1.99. |
+|weight |[weight](#53199-weight) |1 |See clause [5.3.1.99](#53199-weight). |
 |bodyCompositionAnalyser |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |1 |See clause [5.3.1.14](#53114-bodycompositionanalyser). |
 |bioElectricalImpedanceAnalysis |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |1 |See clause [5.3.1.13](#53113-bioelectricalimpedanceanalysis). |
 |battery |[battery](#53110-battery) |1 |See clause [5.3.1.10](#53110-battery). |
@@ -3275,16 +3363,16 @@ An air conditioner is a home appliance used to alter the properties of air (prim
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
 |airConJobMode |[airConJobMode](#5313-airconjobmode) |0..1 |See clause [5.3.1.3](#5313-airconjobmode). |
-|airConOperationMode |operationMode |0..1 |See clause 5.3.1.57.<br />This module instance is used to trigger an airCon operation that is pre-set in "[airConJobMode](#5313-airconjobmode)". If this data point is not present, then the air conditioner's job mode can be triggered by setting the "[airConJobMode](#5313-airconjobmode)". |
-|airCleanOperationMode |operationMode |0..1 |See clause 5.3.1.57.<br />This module instance is used to trigger airClean operation. |
-|temperature |temperature |0..1 |See clause 5.3.1.87. |
-|timer |timer |0..1 |See clause 5.3.1.90. |
-|sleepTimer |timer |0..1 |See clause 5.3.1.90.<br />The sleep function, which is vendor-specific algorithm (for example increasing the remperature by one degree for every 30 minutes), is triggered instantly when "targetDuration" is set, and it indicates the time to the end of appliance operation. It is set at runtime by a user application. |
-|turbo |turbo |0..1 |See clause 5.3.1.91. |
+|airConOperationMode |[operationMode](#53157-operationmode) |0..1 |See clause [5.3.1.57](#53157-operationmode).<br />This module instance is used to trigger an airCon operation that is pre-set in "[airConJobMode](#5313-airconjobmode)". If this data point is not present, then the air conditioner's job mode can be triggered by setting the "[airConJobMode](#5313-airconjobmode)". |
+|airCleanOperationMode |[operationMode](#53157-operationmode) |0..1 |See clause [5.3.1.57](#53157-operationmode).<br />This module instance is used to trigger airClean operation. |
+|temperature |[temperature](#53187-temperature) |0..1 |See clause [5.3.1.87](#53187-temperature). |
+|timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). |
+|sleepTimer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer).<br />The sleep function, which is vendor-specific algorithm (for example increasing the remperature by one degree for every 30 minutes), is triggered instantly when "targetDuration" is set, and it indicates the time to the end of appliance operation. It is set at runtime by a user application. |
+|turbo |[turbo](#53191-turbo) |0..1 |See clause [5.3.1.91](#53191-turbo). |
 |airFlow |[airFlow](#5314-airflow) |0..1 |See clause [5.3.1.4](#5314-airflow). |
-|powerSave |powerSave |0..1 |See clause 5.3.1.66. |
+|powerSave |[powerSave](#53166-powersave) |0..1 |See clause [5.3.1.66](#53166-powersave). |
 |airQualitySensor |[airQualitySensor](#5316-airqualitysensor) |0..1 |See clause [5.3.1.6](#5316-airqualitysensor). |
 |filterInfo |[filterInfo](#53135-filterinfo) |0..1 |See clause [5.3.1.35](#53135-filterinfo). |
 
@@ -3300,11 +3388,11 @@ An airPurifieris a home appliance is used to prevent dust and other particles fr
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
 |airPurifierJobMode |[airPurifierJobMode](#5315-airpurifierjobmode) |0..1 |See clause [5.3.1.5](#5315-airpurifierjobmode). |
-|airPurifierOperationMode |operationMode |0..1 |See clause 5.3.1.57.<br />This module instance is used to trigger the airPurifier operation. |
-|timer |timer |0..1 |See clause 5.3.1.90. |
-|powerSave |powerSave |0..1 |See clause 5.3.1.66. |
+|airPurifierOperationMode |[operationMode](#53157-operationmode) |0..1 |See clause [5.3.1.57](#53157-operationmode).<br />This module instance is used to trigger the airPurifier operation. |
+|timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). |
+|powerSave |[powerSave](#53166-powersave) |0..1 |See clause [5.3.1.66](#53166-powersave). |
 |airQualitySensor |[airQualitySensor](#5316-airqualitysensor) |0..1 |See clause [5.3.1.6](#5316-airqualitysensor). |
 |filterInfo |[filterInfo](#53135-filterinfo) |0..1 |See clause [5.3.1.35](#53135-filterinfo). |
 
@@ -3319,9 +3407,9 @@ A clothes dryer is a home appliance for drying clothes. This clothesDryer inform
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
-|clothesDryerJobMode |clothesDryerJobMode |0..1 |See clause 5.3.1.19. |
-|clothesDryerOperationMode |operationMode |0..1 |See clause 5.3.1.57.<br />This module instance is used to trigger the clothesDryer operation. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
+|clothesDryerJobMode |[clothesDryerJobMode](#53119-clothesdryerjobmode) |0..1 |See clause [5.3.1.19](#53119-clothesdryerjobmode). |
+|clothesDryerOperationMode |[operationMode](#53157-operationmode) |0..1 |See clause [5.3.1.57](#53157-operationmode).<br />This module instance is used to trigger the clothesDryer operation. |
 
 
 
@@ -3335,12 +3423,12 @@ A clothes washer is a home appliance that is used to wash laundry, such as cloth
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|clothesWasherOperationMode |operationMode |0..1 |See clause 5.3.1.57. |
-|runState |runState |1 |See clause 5.3.1.75. |
+|clothesWasherOperationMode |[operationMode](#53157-operationmode) |0..1 |See clause [5.3.1.57](#53157-operationmode). |
+|runState |[runState](#53175-runstate) |1 |See clause [5.3.1.75](#53175-runstate). |
 |clothesWasherJobMode |[clothesWasherJobMode](#53120-clotheswasherjobmode) |1 |See clause [5.3.1.20](#53120-clotheswasherjobmode). |
 |clothesWasherJobModeOption |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |0..1 |See clause [5.3.1.22](#53122-clotheswasherjobmodeoption). |
-|remoteControlEnable |remoteControlEnable |0..1 |See clause 5.3.1.73. |
-|timer |timer |0..1 |See clause 5.3.1.90. |
+|remoteControlEnable |[remoteControlEnable](#53173-remotecontrolenable) |0..1 |See clause [5.3.1.73](#53173-remotecontrolenable). |
+|timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). |
 
 
 
@@ -3348,18 +3436,17 @@ A clothes washer is a home appliance that is used to wash laundry, such as cloth
 #### 5.5.4.5 deviceClothesWasherDryer
 A clothes washer dryer is a home appliance that is a combination of cloth washer and cloth dryer in a single cabinet. This information model provides capabilities to interact with specific functions and resources of clothes washers and dryers.
 
-Table 5.5.4.5-1: Modules of deviceClothesWasherDryer Device model
-
+**Table 5.5.4.5-1: Modules of deviceClothesWasherDryer Device model**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|clothesWasherDryerOperationMode |operationMode |0..1 |See clause 5.3.1.57. |
-|runState |runState |1 |See clause 5.3.1.75. |
+|clothesWasherDryerOperationMode |[operationMode](#53157-operationmode) |0..1 |See clause [5.3.1.57](#53157-operationmode). |
+|runState |[runState](#53175-runstate) |1 |See clause [5.3.1.75](#53175-runstate). |
 |clothesWasherDryerJobMode |[clothesWasherDryerJobMode](#53121-clotheswasherdryerjobmode) |1 |See clause [5.3.1.21](#53121-clotheswasherdryerjobmode). |
 |clothesWasherJobModeOption |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |0..1 |See clause [5.3.1.22](#53122-clotheswasherjobmodeoption). |
-|remoteControlEnable |remoteControlEnable |0..1 |See clause 5.3.1.73. |
-|timer |timer |0..1 |See clause 5.3.1.90. |
+|remoteControlEnable |[remoteControlEnable](#53173-remotecontrolenable) |0..1 |See clause [5.3.1.73](#53173-remotecontrolenable). |
+|timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). |
 
 
 
@@ -3373,7 +3460,7 @@ A coffee machine is a device that is used to brew a coffee, may add foamed milk,
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
 |clock |[clock](#53118-clock) |0..1 |See clause [5.3.1.18](#53118-clock). |
 |brewing |[brewing](#53116-brewing) |1 |See clause [5.3.1.16](#53116-brewing). |
 |waterStatus |[liquidRemaining](#53151-liquidremaining) |0..1 |See clause [5.3.1.51](#53151-liquidremaining). |
@@ -3395,7 +3482,7 @@ A cooker hood is a device containing a mechanical fan that hangs above the stove
 |Module Instance Name |Module Class Name |Optional |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
 |airFlow |[airFlow](#5314-airflow) |0..1 |See clause [5.3.1.4](#5314-airflow). |
 |cookerHoodJobMode |[cookerHoodJobMode](#53126-cookerhoodjobmode) |0..1 |See clause [5.3.1.26](#53126-cookerhoodjobmode). |
 
@@ -3412,7 +3499,7 @@ A cooktop is a device that is a kitchen appliance designed for the purpose of co
 |-|-|-|-|
 |heatingZone0 |[heatingZone](#53144-heatingzone) |1..N |See clause [5.3.1.44](#53144-heatingzone).  |
 
-==Editor Note: *heatingZone0* needs to be just *heatingZone*. Bring CR.==
+<mark>Editor Note: *heatingZone0* needs to be just *heatingZone*. Bring CR.</mark>
 
 
 
@@ -3426,12 +3513,12 @@ A dehumidifier is a device that is used to monitor or control the state of a deh
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|relativeHumidity |relativeHumidity |0..1 |See clause 5.3.1.72. |
-|runState |runState |0..1 |See clause 5.3.1.75. |
+|relativeHumidity |[relativeHumidity](#53172-relativehumidity) |0..1 |See clause [5.3.1.72](#53172-relativehumidity). |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
 |dehumidifierJobMode |[dehumidifierJobMode](#53128-dehumidifierjobmode) |0..1 |See clause [5.3.1.28](#53128-dehumidifierjobmode). |
-|dehumidifierOperationMode |operationMode |0..1 |See clause 5.3.1.57.<br />This module instance is used to trigger dehumidifier operation. |
-|Timer |timer |0..1 |See clause 5.3.1.90. |
-|powerSave |powerSave |0..1 |See clause 5.3.1.66. |
+|dehumidifierOperationMode |[operationMode](#53157-operationmode) |0..1 |See clause [5.3.1.57](#53157-operationmode).<br />This module instance is used to trigger dehumidifier operation. |
+|Timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). |
+|powerSave |[powerSave](#53166-powersave) |0..1 |See clause [5.3.1.66](#53166-powersave). |
 
 
 
@@ -3439,14 +3526,16 @@ A dehumidifier is a device that is used to monitor or control the state of a deh
 #### 5.5.4.10 deviceDigitalGallery
 A digital gallery is a device that is used to display picture, e.g., paintings from artists, photos from photographers or personals etc.
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 Table 5.5.4.10-1: Modules of deviceDigitalGallery Device model
 
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|galleryMode |[galleryMode](#53137-gallerymode) |1 |See clause 5.3.1.37. |
-|pictureInput |mediaSelect |1 |See clause 5.3.1.53. |
-|powerSave |powerSave |0..1 |See clause 5.3.1.66. |
+|galleryMode |[galleryMode](#53137-gallerymode) |1 |See clause [5.3.1.37](#53137-gallerymode). |
+|pictureInput |[mediaSelect](#53153-mediaselect) |1 |See clause [5.3.1.53](#53153-mediaselect). |
+|powerSave |[powerSave](#53166-powersave) |0..1 |See clause [5.3.1.66](#53166-powersave). |
 |clock |[clock](#53118-clock) |0..1 |See clause [5.3.1.18](#53118-clock). |
 
 ​    
@@ -3455,13 +3544,12 @@ Table 5.5.4.10-1: Modules of deviceDigitalGallery Device model
 #### 5.5.4.11 deviceDishWasher
 A dish washer is a home appliance used to wash dishes. This information model provides capabilities to interact with specific functions and resources of a dish washer. 
 
-
 **Table 5.5.4.11-1: Modules of deviceDishWasher Device model**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
 |dishWasherJobMode |[dishWasherJobMode](#53129-dishwasherjobmode) |0..1 |See clause [5.3.1.29](#53129-dishwasherjobmode). |
 
 
@@ -3488,7 +3576,7 @@ A food probe is a device that is used to measure the internal temperature of foo
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|temperature |temperature |1 |See clause 5.3.1.87. |
+|temperature |[temperature](#53187-temperature) |1 |See clause [5.3.1.87](#53187-temperature). |
 
 
 
@@ -3501,7 +3589,7 @@ A freezer is a large container like a fridge in which the temperature is kept be
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|temperature |temperature |1 |See clause 5.3.1.87. |
+|temperature |[temperature](#53187-temperature) |1 |See clause [5.3.1.87](#53187-temperature). |
 
 
 
@@ -3515,13 +3603,13 @@ A home CCTV is a smart home appliance to provide monitoring capabilities when pe
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|sessionDescription |sessionDescription |1 |See clause 5.3.1.77. |
-|playerControl |playerControl |0..1 |See clause 5.3.1.65. |
-|runState |runState |0..1 |See clause 5.3.1.75. |
-|motionSensor |motionSensor |0..1 |See clause 5.3.1.54. |
+|sessionDescription |[sessionDescription](#53177-sessiondescription) |1 |See clause [5.3.1.77](#53177-sessiondescription). |
+|playerControl |[playerControl](#53165-playercontrol) |0..1 |See clause [5.3.1.65](#53165-playercontrol). |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
+|motionSensor |[motionSensor](#53154-motionsensor) |0..1 |See clause [5.3.1.54](#53154-motionsensor). |
 |airQualitySensor |[airQualitySensor](#5316-airqualitysensor) |0..1 |See clause [5.3.1.6](#5316-airqualitysensor). |
-|ozoneMeter |ozoneMeter |0..1 |See clause [5.3.1.60](#53160-ozonemeter). |
-|smokeSensor |smokeSensor |0..1 |See clause 5.3.1.82. |
+|ozoneMeter |[ozoneMeter](#53160-ozonemeter) |0..1 |See clause [5.3.1.60](#53160-ozonemeter). |
+|smokeSensor |[smokeSensor](#53182-smokesensor) |0..1 |See clause [5.3.1.82](#53182-smokesensor). |
 |acousticSensor |[acousticSensor](#5312-acousticsensor) |0..1 |See clause [5.3.1.2](#5312-acousticsensor). |
 |impactSensor |[impactSensor](#53147-impactsensor) |0..1 |See clause [5.3.1.47](#53147-impactsensor). |
 |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). |
@@ -3546,16 +3634,15 @@ A humidifier is a device that is used to monitor or control the state of a humid
 #### 5.5.4.17 deviceKettle
 Kettle is a device used to boil water. It may set a desired temperature for water and may keep water warm for a desired time.
 
-
 **Table 5.5.4.17-1: Modules of deviceKettle Device model**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
 |waterStatus |[liquidRemaining](#53151-liquidremaining) |0..1 |See clause [5.3.1.51](#53151-liquidremaining). |
 |boilingSwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|temperature |temperature |0..1 |See clause 5.3.1.87. |
+|temperature |[temperature](#53187-temperature) |0..1 |See clause [5.3.1.87](#53187-temperature). |
 |keepWarm |[keepWarm](#53148-keepwarm) |0..1 |See clause [5.3.1.48](#53148-keepwarm). |
 
 
@@ -3571,7 +3658,7 @@ A microgeneration is a Home Energy Management System (HEMS) device that is used
 |-|-|-|-|
 |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). |
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |0..1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
 |energyGeneration |[energyGeneration](#53133-energygeneration) |1 |See clause [5.3.1.33](#53133-energygeneration). |
 
 
@@ -3586,9 +3673,9 @@ An oven is a home appliance used to roast and heat food in a complete stove. Thi
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch).<br />Depending on the manufacturer policies or regulations, the binary switch might only be used to turn the device off. |
-|runState |runState |0..1 |See clause 5.3.1.75. |
-|timer |timer |0..1 |See clause 5.3.1.90. |
-|temperature |temperature |1 |See clause 5.3.1.87. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
+|timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). |
+|temperature |[temperature](#53187-temperature) |1 |See clause [5.3.1.87](#53187-temperature). |
 
 ​    
 
@@ -3602,12 +3689,12 @@ A refrigerator is a home appliance used to store food at temperatures which are
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |0..1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|powerSave |powerSave |0..1 |See clause 5.3.1.66. |
+|powerSave |[powerSave](#53166-powersave) |0..1 |See clause [5.3.1.66](#53166-powersave). |
 |doorStatus |[doorStatus](#53130-doorstatus) |0..1 |See clause [5.3.1.30](#53130-doorstatus). |
-|frozenTemperature |temperature |0..1 |See clause 5.3.1.87. |
-|fridgeTemperature |temperature |1 |See clause 5.3.1.87. |
-|customTemperature |temperature |0..1 |See clause 5.3.1.87.<br />This module can be configured to fridge temperature or frozen temperature based on its usage by manufacturer |
-|refrigeration |refrigeration |0..1 |See clause 5.3.1.71. |
+|frozenTemperature |[temperature](#53187-temperature) |0..1 |See clause [5.3.1.87](#53187-temperature). |
+|fridgeTemperature |[temperature](#53187-temperature) |1 |See clause [5.3.1.87](#53187-temperature). |
+|customTemperature |[temperature](#53187-temperature) |0..1 |See clause [5.3.1.87](#53187-temperature).<br />This module can be configured to fridge temperature or frozen temperature based on its usage by manufacturer |
+|refrigeration |[refrigeration](#53171-refrigeration) |0..1 |See clause [5.3.1.71](#53171-refrigeration). |
 |controlPanelLock |[lock](#53152-lock) |0..1 |See clause [5.3.1.52](#53152-lock). |
 |waterFilterInfo |[filterInfo](#53135-filterinfo) |0..1 |See clause [5.3.1.35](#53135-filterinfo). |
 
@@ -3617,6 +3704,8 @@ A refrigerator is a home appliance used to store food at temperatures which are
 #### 5.5.4.21 deviceRiceCooker
 An rice cooker is a home appliance used to cook and heat food. It may set a desired heating time for food and may keep food warm for a desired time.
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 
 **Table 5.5.4.21-1: Modules of deviceRiceCooker Device model**
 
@@ -3624,8 +3713,8 @@ An rice cooker is a home appliance used to cook and heat food. It may set a desi
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch).<br />Depending on the manufacturer policies or regulations, the binary switch might only be used to turn the device off. |
 |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
-|timer |timer |0..1 |See clause 5.3.1.90. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
+|timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). |
 |keepWarm |[keepWarm](#53148-keepwarm) |0..1 |See clause [5.3.1.48](#53148-keepwarm). |
 
 
@@ -3639,12 +3728,12 @@ A robot cleaner is an autonomous robotic vacuum cleaner that has intelligent pro
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
-|robotCleanerJobMode |robotCleanerJobMode |1 |See clause 5.3.1.74. |
-|robotCleanerOperationMode |operationMode |0..1 |See clause 5.3.1.57. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
+|robotCleanerJobMode |[robotCleanerJobMode](#53174-robotcleanerjobmode) |1 |See clause [5.3.1.74](#53174-robotcleanerjobmode). |
+|robotCleanerOperationMode |[operationMode](#53157-operationmode) |0..1 |See clause [5.3.1.57](#53157-operationmode). |
 |battery |[battery](#53110-battery) |0..1 |See clause [5.3.1.10](#53110-battery). |
-|timer |timer |0..1 |See clause 5.3.1.90. |
-|remoteControlEnable |remoteControlEnable |0..1 |See clause 5.3.1.73. |
+|timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). |
+|remoteControlEnable |[remoteControlEnable](#53173-remotecontrolenable) |0..1 |See clause [5.3.1.73](#53173-remotecontrolenable). |
 
 
 
@@ -3656,7 +3745,7 @@ A security pannel is a device that can change the security mode of, for example,
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|securityMode |securityMode |1 |See clause 5.3.1.76. |
+|securityMode |[securityMode](#53176-securitymode) |1 |See clause [5.3.1.76](#53176-securitymode). |
 
 
 
@@ -3671,9 +3760,9 @@ A set top box is a device that in general contains a TV tuner input and displays
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
 |audioVolume |[audioVolume](#5318-audiovolume) |0..1 |See clause [5.3.1.8](#5318-audiovolume). |
-|Channel |televisionChannel |0..1 |See clause 5.3.1.86. |
-|mediaInput |mediaSelect |0..1 |See clause 5.3.1.53. |
-|mediaOutput |mediaSelect |0..1 |See clause 5.3.1.53. |
+|Channel |[televisionChannel](#53186-televisionchannel) |0..1 |See clause [5.3.1.86](#53186-televisionchannel). |
+|mediaInput |[mediaSelect](#53153-mediaselect) |0..1 |See clause [5.3.1.53](#53153-mediaselect). |
+|mediaOutput |[mediaSelect](#53153-mediaselect) |0..1 |See clause [5.3.1.53](#53153-mediaselect). |
 
 
 
@@ -3687,9 +3776,9 @@ A deviceSteamCloset is a home appliance that de-wrinkles, sanitizes and dries to
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
-|steamClosetJobMode |steamClosetJobMode |1 |See clause 5.3.1.85. |
-|steamClosetOperationMode |operationMode |0..1 |See clause 5.3.1.57. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
+|steamClosetJobMode |[steamClosetJobMode](#53185-steamclosetjobmode) |1 |See clause [5.3.1.85](#53185-steamclosetjobmode). |
+|steamClosetOperationMode |[operationMode](#53157-operationmode) |0..1 |See clause [5.3.1.57](#53157-operationmode). |
 
 
 
@@ -3697,14 +3786,13 @@ A deviceSteamCloset is a home appliance that de-wrinkles, sanitizes and dries to
 #### 5.5.4.26 deviceStorageBattery
 A storage battery is a Home Energy Management System HEMS device that is used to provide the home with electrical energy. 
 
-
 **Table 5.5.4.26-1: Modules of deviceStorageBattery Device model**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). |
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |0..1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
 |battery |[battery](#53110-battery) |1 |See clause [5.3.1.10](#53110-battery). |
 
 
@@ -3719,10 +3807,10 @@ A television (TV) is a home appliance used to show audio and visual content such
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
 |audioVolume |[audioVolume](#5318-audiovolume) |0..1 |See clause [5.3.1.8](#5318-audiovolume). |
-|televisionChannel |televisionChannel |0..1 |See clause 5.3.1.86. |
-|playerControl |playerControl |0..1 |See clause 5.3.1.65. |
-|mediaInput |mediaSelect |0..1 |See clause 5.3.1.53. |
-|mediaOutput |mediaSelect |0..1 |See clause 5.3.1.53. |
+|televisionChannel |[televisionChannel](#53186-televisionchannel) |0..1 |See clause [5.3.1.86](#53186-televisionchannel). |
+|playerControl |[playerControl](#53165-playercontrol) |0..1 |See clause [5.3.1.65](#53165-playercontrol). |
+|mediaInput |[mediaSelect](#53153-mediaselect) |0..1 |See clause [5.3.1.53](#53153-mediaselect). |
+|mediaOutput |[mediaSelect](#53153-mediaselect) |0..1 |See clause [5.3.1.53](#53153-mediaselect). |
 
 
 
@@ -3730,14 +3818,13 @@ A television (TV) is a home appliance used to show audio and visual content such
 #### 5.5.4.28 deviceWaterHeater
 A water heater is a device that is used to provide hot water through home facilities.
 
-
 **Table 5.5.4.28-1: Modules of deviceWaterHeater Device model**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). |
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
 |clock |[clock](#53118-clock) |0..1 |See clause [5.3.1.18](#53118-clock). |
 |boiler |[boiler](#53115-boiler) |0..1 |See clause [5.3.1.15](#53115-boiler). |
 |hotWaterSupply |[hotWaterSupply](#53146-hotwatersupply) |0..1 |See clause [hotWaterSupply](#53146-hotwatersupply). |
@@ -3753,9 +3840,9 @@ The window shade is an appliance that provides the ability to cover windows. Thi
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|openLevel |openLevel |1 |See clause 5.3.1.56. |
+|openLevel |[openLevel](#53156-openlevel) |1 |See clause [5.3.1.56](#53156-openlevel). |
 |battery |[battery](#53110-battery) |0..1 |See clause [5.3.1.10](#53110-battery). |
-|timer |timer |0..1 |See clause 5.3.1.90. |
+|timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). |
 
 
 
@@ -3769,7 +3856,7 @@ A bottle warmer is an appliance designed for the purpose of warming the feeding
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
 |keepWarm |[keepWarm](#53148-keepwarm) |0..1 |See clause [5.3.1.48](#53148-keepwarm). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
 
 
 
@@ -3777,14 +3864,13 @@ A bottle warmer is an appliance designed for the purpose of warming the feeding
 #### 5.5.4.31 deviceGarbageDisposal
 A Garbage Disposal is an appliance designed for the purpose of disposing the kitchen waste.
 
-
 **Table 5.5.4.31-1: Modules of deviceGarbageDisposal Device model**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |0..1 |See clause 5.3.1.87. |
-|disposal |disposal |1 |See clause 5.3.1.104. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
+|disposal |[disposal](#531104-disposal) |1 |See clause [5.3.1.104](#531104-disposal). |
 
 
 
@@ -3798,12 +3884,12 @@ A Water Purifier is an appliance to filter the impurity substance in water by di
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
-|timer |timer |0..1 |See clause 5.3.1.90. |
-|waterQualityMonitor |waterQualityMonitor |0..1 |See clause 5.3.1.90. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
+|timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). |
+|waterQualityMonitor |[waterQualityMonitor](#53198-waterqualitymonitor) |0..1 |See clause [5.3.1.98](#53198-waterqualitymonitor). |
 |filterInfo |[filterInfo](#53135-filterinfo) |0..1 |See clause [5.3.1.35](#53135-filterinfo). |
 |waterLevel |[liquidRemaining](#53151-liquidremaining) |0..1 |See clause [5.3.1.51](#53151-liquidremaining). |
-|waterFilter |waterFilterType |0..1 |See clause 5.3.1.90. |
+|waterFilter |[waterFilterType](#531105-waterfiltertype) |0..1 |See clause [5.3.1.105](#531105-waterfiltertype). |
 
 
 
@@ -3817,9 +3903,9 @@ An air heater is a home appliance used to increase the temperature of an indoor
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|airHeating |runState |0..1 |See clause 5.3.1.75.<br />This module class is used to control and monitor the state of an air heater. |
-|temperature  |temperature  |1 |See clause 5.3.1.87. |
-|timer |timer |0..1 |See clause 5.3.1.90. |
+|airHeating |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate).<br />This module class is used to control and monitor the state of an air heater. |
+|temperature  |[temperature](#53187-temperature)  |1 |See clause [5.3.1.87](#53187-temperature). |
+|timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). |
 
 
 
@@ -3834,9 +3920,9 @@ Juicer is a machine that can quickly press fruits and vegetables into juice. It
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch).<br />Depending on the manufacturer policies or regulations, the binary switch might only be used to turn the device off. |
 |faultDetection |[faultDetection](#53134-faultdetection) |0..1 |See clause [5.3.1.34](#53134-faultdetection). |
-|runState |runState |0..1 |See clause 5.3.1.75. |
-|blender |blender |0..1 |See clause 5.3.1.118 |
-|timer |timer |0..1 |See clause 5.3.1.90. |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
+|blender |[blender](#531118-blender) |0..1 |See clause [5.3.1.118](#531118-blender). |
+|timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). |
 
 
 
@@ -3844,15 +3930,14 @@ Juicer is a machine that can quickly press fruits and vegetables into juice. It
 #### 5.5.4.35 deviceShoesWasher
 A shoes washer is a home appliance used to wash shoes. This information model provides capabilities to interact with specific functions and resources of a shoes washer. 
 
-
 **Table 5.5.4.35-1: Modules of deviceShoesWasher Device model**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |1 |See clause 5.3.1.75. |
-|shoesWasherJobMode |shoesWasherJobMode |1 |See clause5.3.1.119 |
-|timer |timer |0..1 |See clause 5.3.1.90. |
+|runState |[runState](#53175-runstate) |1 |See clause [5.3.1.75](#53175-runstate). |
+|shoesWasherJobMode |[shoesWasherJobMode](#531119-shoeswasherjobmode) |1 |See clause [5.3.1.119](#531119-shoeswasherjobmode). |
+|timer |[timer](#53190-timer) |0..1 |See clause [5.3.1.90](#53190-timer). |
 
 
 
@@ -3871,7 +3956,7 @@ An electric vehicle charger is a device that is used for charging or discharging
 |-|-|-|-|
 |faultDetection |[faultDetection](#53134-faultdetection) |1 |See clause [5.3.1.34](#53134-faultdetection). |
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |1 |See clause 5.3.1.75. |
+|runState |[runState](#53175-runstate) |1 |See clause [5.3.1.75](#53175-runstate). |
 |battery |[battery](#53110-battery) |1 |See clause [5.3.1.10](#53110-battery). |
 |electricVehicleConnector |[electricVehicleConnector](#53131-electricvehicleconnector) |1 |See clause [5.3.1.31](#53131-electricvehicleconnector). |
 
@@ -3886,7 +3971,7 @@ An electric motorcycle is a plug-in electric vehicle with two wheels. The electr
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|runState |runState |1 |See clause 5.3.1.75.<br />This module class is used to control and monitor the state of an electric motorcycle. |
+|runState |[runState](#53175-runstate) |1 |See clause [5.3.1.75](#53175-runstate).<br />This module class is used to control and monitor the state of an electric motorcycle. |
 |battery |[battery](#53110-battery) |1..N |See clause [5.3.1.10](#53110-battery). |
 |geoLocation |[geoLocation](#53141-geolocation) |1 |See clause [5.3.1.41](#53141-geolocation). |
 |clock |[clock](#53118-clock) |0..1 |See clause [5.3.1.18](#53118-clock). |
@@ -3902,15 +3987,17 @@ An electric motorcycle is a plug-in electric vehicle with two wheels. The electr
 #### 5.5.7.1 deviceCowActivityMonitor
 A cow activity monitor device is a battery-powered wireless metering device that is used to measure the activity data (e.g. step count) of a cow in the dairy farming industry. The collected data can be used to analyze and predict the estrus of the cow for better mating and milk production.
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 
 **Table 5.5.7.1-1: Modules of deviceCowActivityMonitor Device model**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|cowActivityMonitor |cowActivityMonitor |1 |See clause5.3.7.1. |
+|cowActivityMonitor |[cowActivityMonitor](#5371-cowactivitymonitor) |1 |See clause [5.3.7.1](#5371-cowactivitymonitor). |
 |battery |[battery](#53110-battery) |0..1 |See clause [5.3.1.10](#53110-battery). |
 |connectivity |[connectivity](#53125-connectivity) |0..1 |See clause [5.3.1.25](#53125-connectivity). |
-|periodicalReportConfig  |periodicalReportConfig  |0..1 |See clause 5.3.1.63 |
+|periodicalReportConfig  |[periodicalReportConfig](#53163-periodicalreportconfig)  |0..1 |See clause [5.3.1.63](#53163-periodicalreportconfig). |
 
 
 
@@ -3920,6 +4007,8 @@ A cow activity monitor device is a battery-powered wireless metering device that
 #### 5.5.8.1 deviceHandheldPTTTerminal
 A handheld PTT (Push-to-Talk) terminal is a device of the Railway Domain. The terminal is usually used between the railway workers including train driver, crew and rail-side worker to share their work status via voice communication.
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 
 **Table 5.5.8.1-1: Modules of deviceHandheldPTTTerminal Device model**
 
@@ -3931,11 +4020,11 @@ A handheld PTT (Push-to-Talk) terminal is a device of the Railway Domain. The te
 |clock |[clock](#53118-clock) |0..1 |See clause [5.3.1.18](#53118-clock). |
 |energyConsumption |[energyConsumption](#53132-energyconsumption) |0..1 |See clause [5.3.1.32](#53132-energyconsumption). |
 |keypad |[keypad](#53149-keypad) |1 |See clause [5.3.1.49](#53149-keypad). |
-|operationMode |operationMode |0..1 |See clause 5.3.1.57. |
-|phoneCall |phoneCall |1 |See clause 5.3.1.64. |
-|PTTButton |pushButton |1 |See clause 5.3.1.69. |
-|runState |runState |0..1 |See clause 5.3.1.75. |
-|signalStrength |signalStrength |0..1 |See clause 5.3.1.78. |
+|operationMode |[operationMode](#53157-operationmode) |0..1 |See clause [5.3.1.57](#53157-operationmode). |
+|phoneCall |[phoneCall](#53164-phonecall) |1 |See clause [5.3.1.64](#53164-phonecall). |
+|PTTButton |[pushButton](#53169-pushbutton) |1 |See clause [5.3.1.69](#53169-pushbutton). |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
+|signalStrength |[signalStrength](#53178-signalstrength) |0..1 |See clause [5.3.1.78](#53178-signalstrength). |
 
 
 
@@ -3943,6 +4032,8 @@ A handheld PTT (Push-to-Talk) terminal is a device of the Railway Domain. The te
 #### 5.5.8.2 deviceTrainborneTerminal
 A handheld PTT (Push-to-Talk) terminal is a device of the Railway Domain. The terminal is usually used between the railway workers including train driver, crew and rail-side worker to share their work status via voice communication.
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 
 **Table 5.5.8.2-1: Modules of deviceTrainborneTerminal Device model**
 
@@ -3953,12 +4044,12 @@ A handheld PTT (Push-to-Talk) terminal is a device of the Railway Domain. The te
 |clock |[clock](#53118-clock) |0..1 |See clause [5.3.1.18](#53118-clock). |
 |energyConsumption |[energyConsumption](#53132-energyconsumption) |0..1 |See clause [5.3.1.32](#53132-energyconsumption). |
 |keypad |[keypad](#53149-keypad) |1 |See clause [5.3.1.49](#53149-keypad). |
-|operationMode |operationMode |0..1 |See clause 5.3.1.57. |
-|phoneCall |phoneCall |1 |See clause 5.3.1.64. |
-|PTTButton |pushButton |1 |See clause 5.3.1.69. |
-|runState |runState |0..1 |See clause 5.3.1.75. |
-|signalStrength |signalStrength |0..1 |See clause 5.3.1.78. |
-|baliseTransmission |baliseTransmissionModule |0..1 |See clause 5.3.8.1. |
+|operationMode |[operationMode](#53157-operationmode) |0..1 |See clause [5.3.1.57](#53157-operationmode). |
+|phoneCall |[phoneCall](#53164-phonecall) |1 |See clause [5.3.1.64](#53164-phonecall). |
+|PTTButton |[pushButton](#53169-pushbutton) |1 |See clause [5.3.1.69](#53169-pushbutton). |
+|runState |[runState](#53175-runstate) |0..1 |See clause [5.3.1.75](#53175-runstate). |
+|signalStrength |[signalStrength](#53178-signalstrength) |0..1 |See clause [5.3.1.78](#53178-signalstrength). |
+|baliseTransmission |[baliseTransmissionModule](#5381-balisetransmissionmodule) |0..1 |See clause [5.3.8.1](#5381-balisetransmissionmodule). |
 |connectivity |[connectivity](#53125-connectivity) |0..1 |See clasue [5.3.1.25](#53125-connectivity). |
 
 
@@ -3967,6 +4058,8 @@ A handheld PTT (Push-to-Talk) terminal is a device of the Railway Domain. The te
 #### 5.5.8.3 deviceCardRechargingMachine
 A card recharging machine is a device of the Railway Domain. The machine provides recharging service for pre-paid card for transportation. Railway users simply recharging their cards and use it as a payment method for transportation fare.
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 
 **Table 5.5.8.3-1: Modules of deviceCardRechargingMachine Device model**
 
@@ -3974,18 +4067,18 @@ A card recharging machine is a device of the Railway Domain. The machine provide
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
 |clock |[clock](#53118-clock) |1 |See clause [5.3.1.18](#53118-clock). |
-|touchScreen |touchScreen |1 |See clause 5.3.1.106. |
+|touchScreen |[touchScreen](#531106-touchscreen) |1 |See clause [5.3.1.106](#531106-touchscreen). |
 |keypad |[keypad](#53149-keypad) |0..1 |See clause [5.3.1.49](#53149-keypad). |
-|emergencyButton |pushButton |1 |See clause 5.3.1.69. |
+|emergencyButton |[pushButton](#53169-pushbutton) |1 |See clause [5.3.1.69](#53169-pushbutton). |
 |audioVolume |[audioVolume](#5318-audiovolume) |0..1 |See clause [5.3.1.8](#5318-audiovolume). |
-|prePaidCardReader |prePaidCardReader |1 |See clause 5.3.1.107. |
-|billDeposit |billDeposit |1 |See clause 5.3.1.108. |
-|billWithdrawal |billWithdrawal |1 |See clause 5.3.1.109. |
-|coinDeposit |coinDeposit |1 |See clause 5.3.1.110. |
-|cashDispensor |cashDispenser |1 |See clause 5.3.1.111. |
-|cardScanner |cardScanner |0..1 |See clause 5.3.1.112. |
+|prePaidCardReader |[prePaidCardReader](#531107-prepaidcardreader) |1 |See clause [5.3.1.107](#531107-prepaidcardreader). |
+|billDeposit |[billDeposit](#531108-billdeposit) |1 |See clause [5.3.1.108](#531108-billdeposit). |
+|billWithdrawal |[billWithdrawal](#531109-billwithdrawal) |1 |See clause [5.3.1.109](#531109-billwithdrawal). |
+|coinDeposit |[coinDeposit](#531110-coindeposit) |1 |See clause [5.3.1.110](#531110-coindeposit). |
+|cashDispensor |[cashDispenser](#531111-cashdispenser) |1 |See clause [5.3.1.111](#531111-cashdispenser). |
+|cardScanner |[cardScanner](#531112-cardscanner) |0..1 |See clause [5.3.1.112](#531112-cardscanner). |
 |connectivity |[connectivity](#53125-connectivity) |1 |See clause [5.3.1.25](#53125-connectivity). |
-|machineState |runState |1 |See clause 5.3.1.75. |
+|machineState |[runState](#53175-runstate) |1 |See clause [5.3.1.75](#53175-runstate). |
 |lock |[lock](#53152-lock) |1 |See clause [5.3.1.52](#53152-lock). |
 
 
@@ -3994,6 +4087,8 @@ A card recharging machine is a device of the Railway Domain. The machine provide
 #### 5.5.8.4 deviceSmartGate
 A smart gate is a device of the Railway Domain. The gate provides passenger service for checking ticket and control the gate usage. A railway users simply use the gate with their ticket (e.g. passenger card) which have pre-paid card function.
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 
 **Table 5.5.8.4-1: Modules of deviceSmartGate Device model**
 
@@ -4001,18 +4096,18 @@ A smart gate is a device of the Railway Domain. The gate provides passenger serv
 |-|-|-|-|
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
 |clock |[clock](#53118-clock) |1 |See clause [5.3.1.18](#53118-clock). |
-|touchScreen |touchScreen |0..1 |See clause 5.3.1.106. |
-|emergencyButton |pushButton |0..1 |See clause 5.3.1.69. |
+|touchScreen |[touchScreen](#531106-touchscreen) |0..1 |See clause [5.3.1.106](#531106-touchscreen). |
+|emergencyButton |[pushButton](#53169-pushbutton) |0..1 |See clause [5.3.1.69](#53169-pushbutton). |
 |audioVolume |[audioVolume](#5318-audiovolume) |0..1 |See clause [5.3.1.8](#5318-audiovolume). |
-|ticketReader |prePaidCardReader |1 |See clause 5.3.1.107. |
-|crossingSensor |traceSensor |1 |See clause 5.3.1.113. |
+|ticketReader |[prePaidCardReader](#531107-prepaidcardreader) |1 |See clause [5.3.1.107](#531107-prepaidcardreader). |
+|crossingSensor |[crossingBarrier](#531115-crossingbarrier) |1 |See clause [5.3.1.115](#531115-crossingbarrier). |
 |connectivity |[connectivity](#53125-connectivity) |1 |See clause [5.3.1.25](#53125-connectivity). |
-|gateState |runState |1 |See clause 5.3.1.75. |
-|directionPanel |directionPanel |0..1 |See clause 5.3.1.114. |
+|gateState |[runState](#53175-runstate) |1 |See clause [5.3.1.75](#53175-runstate). |
+|directionPanel |[headingSensor](#531113-headingsensor) |0..1 |See clause [5.3.1.113](#531113-headingsensor). |
 |crossingIndicatorColour |[colour](#53123-colour) |1 |See clause [5.3.1.23](#53123-colour). |
 |crossingIndicatorColourSaturation |[colourSaturation](#53124-coloursaturation) |1 |See clause [5.3.1.24](#53124-coloursaturation). |
 |crossingIndicatorColourBrightness |[brightness](#53117-brightness) |1 |See clause [5.3.1.17](#53117-brightness). |
-|crossingBarrier |crossingBarrier |1 |See clause 5.3.1.115. |
+|crossingBarrier |[crossingBarrier](#531115-crossingbarrier) |1 |See clause [5.3.1.115](#531115-crossingbarrier). |
 
 
 
@@ -4020,6 +4115,8 @@ A smart gate is a device of the Railway Domain. The gate provides passenger serv
 #### 5.5.8.5 deviceSmartScreenDoor
 A smart screen door is a device of the Railway Domain. The screen doors are pairs of sliding doors in a platform with synchronization of doors of a train that is staying in the platform. When the train doors are open, the smart screen doors are open in simultaneously, and vice versa. The screen doors are used in the metro platform mostly.
 
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 
 **Table 5.5.8.5-1: Modules of deviceSmartScreenDoor Device Model**
 
@@ -4028,12 +4125,12 @@ A smart screen door is a device of the Railway Domain. The screen doors are pair
 |binarySwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
 |screenDoor |[doorStatus](#53130-doorstatus) |1..N |See clause [5.3.1.30](#53130-doorstatus). |
 |releaseSwitch |[binarySwitch](#53112-binaryswitch) |1 |See clause [5.3.1.12](#53112-binaryswitch). |
-|emergencyButton |pushButton |1 |See clause 5.3.1.69. |
+|emergencyButton |[pushButton](#53169-pushbutton) |1 |See clause [5.3.1.69](#53169-pushbutton). |
 |audioVolume |[audioVolume](#5318-audiovolume) |0..1 |See clause [audioVolume](#5318-audiovolume). |
-|crossingSensor |traceSensor |1 |See clause 5.3.1.113. |
+|crossingSensor |[crossingBarrier](#531115-crossingbarrier) |1 |See clause [5.3.1.115](#531115-crossingbarrier). |
 |connectivity |[connectivity](#53125-connectivity) |1 |See clause [5.3.1.25](#53125-connectivity). |
-|gateState |runState |1 |See clause 5.3.1.75. |
-|directionPanel |directionPanel |0..1 |See clause 5.3.1.114. |
+|gateState |[runState](#53175-runstate) |1 |See clause [5.3.1.75](#53175-runstate). |
+|directionPanel |[headingSensor](#531113-headingsensor) |0..1 |See clause [5.3.1.113](#531113-headingsensor). |
 |crossingIndicatorColour |[colour](#53123-colour) |0..1 |See clause [5.3.1.23](#53123-colour). |
 |crossingIndicatorColourSaturation |[colourSaturation](#53124-coloursaturation) |0..1 |See clause [5.3.1.24](#53124-coloursaturation). |
 |crossingIndicatorColourBrightness |[brightness](#53117-brightness) |0..1 |See clause [5.3.1.17](#53117-brightness). |
@@ -4045,23 +4142,30 @@ A smart screen door is a device of the Railway Domain. The screen doors are pair
 
 #### 5.5.9.1 devicePWSCenter
 
-**Table 5.5.9.1-1: Modules of devicePWSEquipment Device**
+<mark>Missing description</mark>
+
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
+**Table 5.5.9.1-1: Modules of devicePWSCenter Device**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|disseminator |disseminator |1 |See clause 5.3.10.1 |
-
+|disseminator |[Disseminator](#53101-disseminator) |1 |See clause [5.3.10.1 Disseminator](#53101-disseminator). |
 
 
 
 #### 5.5.9.2 devicePWSEquipment
 
+<mark>Missing description</mark>
+
+<mark>Editor note: the device is missing from the short name tables in 6.3</mark>
+
 **Table 5.5.9.2-1: Modules of devicePWSEquipment Device**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|emergencyHandler |emergencyHandler |1 |See clause 5.3.10.2 |
-|settings |settings |1 |See clause 5.3.10.3 |
+|emergencyHandler |[emergencyHandler](#53102-emergencyhandler) |1 |See clause [5.3.10.2](#53102-emergencyhandler). |
+|settings |[settings](#53103-settings) |1 |See clause [settings](#53103-settings). |
 
 
 
@@ -4108,7 +4212,7 @@ Used for the "currentAdfState" and "adfStates" data points of the "[autoDocument
 |10 |inputTrayFailed | |
 |11 |inputTrayOverloaded | |
 
-NOTE: See clause [5.3.1.9 autoDocumentFeeder](#5319-autodocumentfeeder). Negative values are reserved for vendor specific modes.
+NOTE: See clause [5.3.1.9 autoDocumentFeeder](#5319-autodocumentfeeder). <mark>Negative values are reserved for vendor specific modes.</mark>
 
 
 
@@ -4116,6 +4220,8 @@ NOTE: See clause [5.3.1.9 autoDocumentFeeder](#5319-autodocumentfeeder). Negativ
 ### 5.6.3 hd:enumAirConJobMode
 Used for the "currentJobMode" and "jobModes" data point of the "[airConJobMode](#5313-airconjobmode)" ModuleClass.
 
+<mark>Editor note: The notes below refer to the deviceAirConditioner, but are actually for attributes of the ModuleClass</mark>
+
 
 **Table 5.6.31: Interpretation of hd:enumAirConJobMode**
 
@@ -4130,7 +4236,7 @@ Used for the "currentJobMode" and "jobModes" data point of the "[airConJobMode](
 |7 |ACO |This value is for deviceAirConditioner and indicates Auto Change Over mode. |
 |8 |aroma |This value is for deviceAirConditioner and indicates aroma mode. |
 
-NOTE: See clause [5.3.1.3 airConJobMode](#5313-airconjobmode). Negative values are reserved for vendor specific modes.
+NOTE: See clause [5.3.1.3 airConJobMode](#5313-airconjobmode). <mark>Negative values are reserved for vendor specific modes</mark>.
 
 
 
@@ -4151,7 +4257,7 @@ Used for the "currentJobMode" and "jobModes" data points of the "[airPurifierJob
 |6 |dual |This indicates the dual mode that operates both the upper and lower parts of the air purifier |
 |7 |auto |This indicates the auto mode that first measures the pollution level (e.g., good, normal, bad, very bad) and then, triggers appropriate modes based on the measured level. In case of bad and very bad condition, the rotating fan on the upper side starts its operation |
 
-NOTE: See clause [5.3.1.5 airPurifierJobMode](#5315-airpurifierjobmode). Negative values are reserved for vendor specific modes.
+NOTE: See clause [5.3.1.5 airPurifierJobMode](#5315-airpurifierjobmode). <mark>Negative values are reserved for vendor specific modes.</mark>
 
 
 
@@ -4173,7 +4279,7 @@ NOTE: See clause [5.3.1.7 alarmSpeaker](#5317-alarmspeaker).
 
 
 ### 5.6.6 hd:enumCallState
-Used for the "callState" data point in the "phoneCall" ModuleClass.
+Used for the "callState" data point in the "[phoneCall](#53164-phonecall)" ModuleClass.
 
 
 **Table 5.6.61: Interpretation of hd:enumCallState**
@@ -4189,7 +4295,7 @@ Used for the "callState" data point in the "phoneCall" ModuleClass.
 |7 |voicemail | |
 |8 |redirected | |
 
-NOTE: See clause 5.3.1.64 "phoneCall"
+NOTE: See clause [5.3.1.64 "phoneCall"](#53164-phonecall).
 
 
 
@@ -4209,13 +4315,13 @@ Used for the "currentJobMode" and "jobModes" data points of the "[clothesDryerJo
 |6 |airDry |A cool-air setting for items that can't take any heat, such as plastic tablecloths and rubber-backed rugs. |
 |7 |extendedTumble |Periodically tumbles clothes without heats for a preset amount of time after they're dry to prevent wrinkles. |
 
-NOTE: See clause [5.3.1.19 "clothesDryerJobMode"](#53119-clothesdryerjobmode). ==Negative values are reserved for vendor specific modes==.
+NOTE: See clause [5.3.1.19 “clothesDryerJobMode”](#53119-clothesdryerjobmode). <mark>Negative values are reserved for vendor specific modes</mark>.
 
 
 
 
 ### 5.6.8 hd:enumClothesWasherDryerJobMode
-Used for "currentJobModes" and "jobModes" data points of "[clothesWasherDryerJobMode](#53121-clotheswasherdryerjobmode)" ModuleClass. ==Manufacturers can define their own courses by setting this value to negative values.==
+Used for "currentJobModes" and "jobModes" data points of "[clothesWasherDryerJobMode](#53121-clotheswasherdryerjobmode)" ModuleClass. <mark>Manufacturers can define their own courses by setting this value to negative values.</mark>
 
 **Table 5.6.81: Interpretation of hd:enumClothesWasherDryerJobMode**
 
@@ -4227,13 +4333,13 @@ Used for "currentJobModes" and "jobModes" data points of "[clothesWasherDryerJob
 |4 |delicates | |
 |5 |heavy duty | |
 
-NOTE: See clause [5.3.1.21 "clothesWasherDryerJobMode"](#53121-clotheswasherdryerjobmode). ==Negative values are reserved for vendor specific modes.==
+NOTE: See clause [5.3.1.21 "clothesWasherDryerJobMode"](#53121-clotheswasherdryerjobmode). <mark>Negative values are reserved for vendor specific modes.</mark>
 
 
 
 
 ### 5.6.9 hd:enumClothesWasherJobMode
-Used for the "currentJobModes" and "jobModes " data points of the "[clothesWasherJobMode](#53120-clotheswasherjobmode)" ModuleClass. Washing options such as water temperature and spin speed are decided to pre-set values upon selected washing course. ==Manufacturers can define their own courses by setting this value to negative values==.
+Used for the "currentJobModes" and "jobModes " data points of the "[clothesWasherJobMode](#53120-clotheswasherjobmode)" ModuleClass. Washing options such as water temperature and spin speed are decided to pre-set values upon selected washing course. <mark>Manufacturers can define their own courses by setting this value to negative values</mark>.
 
 
 **Table 5.6.91: Interpretation of hd:enumClothesWasherJobMode**
@@ -4249,7 +4355,7 @@ Used for the "currentJobModes" and "jobModes " data points of the "[clothesWashe
 |7 |kidsWear | |
 |8 |workoutWears | |
 
-NOTE: See clause [5.3.1.20 "clothesWasherJobMode"](#53120-clotheswasherjobmode). ==Negative values are reserved for vendor specific modes==.
+NOTE: See clause [5.3.1.20 "clothesWasherJobMode"](#53120-clotheswasherjobmode). <mark>Negative values are reserved for vendor specific modes</mark>.
 
 
 
@@ -4265,7 +4371,7 @@ Used for the "currentJobMode" and "jobModes" DataPoints of the "[cookerHoodJobMo
 |2 |Intensive |This value indicates the intensive mode used when a large volume of cooking fume is being produced. |
 |3 |Sensor |This value indicates the sensor mode which changes fan speed depend on the volume and heat of cooking fume. |
 
-NOTE: See clause [5.3.1.26 "cookerHoodJobMode"](#53126-cookerhoodjobmode). ==Negative values are reserved for vendor specific modes==.
+NOTE: See clause [5.3.1.26 "cookerHoodJobMode"](#53126-cookerhoodjobmode). <mark>Negative values are reserved for vendor specific modes</mark>.
 
 
 
@@ -4284,7 +4390,7 @@ Used for "currentJobMode" and "jobModes" data points of the "[dehumidifierJobMod
 |4 |focus |This value indicates the focus mode that dehumidifies focusing on a particular part. |
 |5 |clothes |This value indicates the clothes mode that dehumidifies adjusting the wind direction vertically. It is normally used to dehumidify clothes. |
 
-NOTE: See clause [5.3.1.28 "dehumidifierJobMode"](#53128-dehumidifierjobmode). ==Negative values are reserved for vendor specific modes==.
+NOTE: See clause [5.3.1.28 "dehumidifierJobMode"](#53128-dehumidifierjobmode). <mark>Negative values are reserved for vendor specific modes</mark>.
 
 
 
@@ -4305,7 +4411,7 @@ Used for the "currentJobMode" and "jobModes" DataPoints of the "[dishWasherJobMo
 |6 |Quiet wash | |
 |7 |Maintenance wash | |
 
-NOTE: See clause [5.3.1.29 "dishWasherJobMode"](#53129-dishwasherjobmode). ==Negative values are reserved for vendor specific modes.==
+NOTE: See clause [5.3.1.29 "dishWasherJobMode"](#53129-dishwasherjobmode). <mark>Negative values are reserved for vendor specific modes.</mark>
 
 
 
@@ -4485,8 +4591,8 @@ Used for the "horizontalDirection" and "supportedHorizontalDirection" of the "[a
 
 
 
-### 5.6.23 hd:enumJobStates
-Used for the "currentJobState" and "jobStates" data points of the "runState" ModuleClass.
+### 5.6.23 hd:enumJobState
+Used for the "currentJobState" and "jobStates" data points of the "[printQueue](#53167-printqueue)" and "[runState](#53175-runstate)" ModuleClasses.
 
 
 **Table 5.6.231: Interpretation of hd:enumJobState**
@@ -4500,7 +4606,7 @@ Used for the "currentJobState" and "jobStates" data points of the "runState" Mod
 |5 |pending | |
 |6 |processing | |
 
-NOTE: See clause 5.3.1.75 "runstate".
+NOTE: See clause [5.3.1.67 "printQueue"](#53167-printqueue) and [5.3.1.75 "runState"](#53175-runstate).
 
 
 
@@ -4524,7 +4630,7 @@ NOTE: See clause  [5.3.1.50 "liquidLevel"](#53150-liquidlevel) and clause [5.3.1
 
 
 ### 5.6.25 hd:enumMachineState
-Used for the "currentMachineState" and "machineStates" data points of the "runState" ModuleClass.
+Used for the "currentMachineState" and "machineStates" data points of the "[runState](#53175-runstate)" ModuleClass.
 
 **Table 5.6.251: Interpretation of hd:enumMachineState**
 
@@ -4542,7 +4648,7 @@ Used for the "currentMachineState" and "machineStates" data points of the "runSt
 |10 |clear |The result is not removed yet |
 |11 |charging |Machine is being charged |
 
-NOTE: See clause 5.3.1.75 "runState".
+NOTE: See clause [5.3.1.75 "runState"](#53175-runstate).
 
 
 
@@ -4567,7 +4673,7 @@ The examples in the notes are references from the Korean Environmental Standard
 
 
 ### 5.6.27 hd:enumPlayerMode
-Used for the "currentMode" and "supportedModes" data points in the "playerControl" ModuleClass.
+Used for the "currentMode" and "supportedModes" data points in the "[playerControl](#53165-playercontrol)" ModuleClass.
 
 
 **Table 5.6.271: Interpretation of hd:enumPlayerMode**
@@ -4586,13 +4692,13 @@ Used for the "currentMode" and "supportedModes" data points in the "playerContro
 |10 |searchPrevious | |
 |11 |searchNext | |
 
-NOTE: See clause 5.3.1.65 "playerControl".
+NOTE: See clause [5.3.1.65 "playerControl"](#53165-playercontrol).
 
 
 
 
 ### 5.6.28 hd:enumRobotCleanerJobMode
-Used for the "currentJobMode" and "jobModes" data points of the "robotCleanerJobMode" ModuleClass.
+Used for the "currentJobMode" and "jobModes" data points of the "[robotCleanerJobMode](#53174-robotcleanerjobmode)" ModuleClass.
 
 
 **Table 5.6.281: Interpretation of hd:enumRobotCleanerJobMode**
@@ -4603,13 +4709,13 @@ Used for the "currentJobMode" and "jobModes" data points of the "robotCleanerJob
 |2 |sectorBase |The machine first cleans a specific sector (fo example, 1x1m), then moves to another sector. |
 |3 |spot |The machine cleans a targeted area of about specific spot |
 
-NOTE: See clause 5.3.1.74 "robotCleanerJobMode". Negative values are reserved for vendor specific modes.
+NOTE: See clause [5.3.1.74 "robotCleanerJobMode"](#53174-robotcleanerjobmode). <mark>Negative values are reserved for vendor specific modes.</mark>
 
 
 
 
 ### 5.6.29 hd:enumSecurityMode
-Used for the "currentSecurityMode" and "securityModes" data points of the "securityMode" ModuleClass. 
+Used for the "currentSecurityMode" and "securityModes" data points of the "[securityMode](#53176-securitymode)" ModuleClass. 
 
 
 **Table 5.6.291: Interpretation of hd:enumSecurityMode**
@@ -4623,13 +4729,13 @@ Used for the "currentSecurityMode" and "securityModes" data points of the "secur
 |5 |armedNightStay |Unit is armed in night stay |
 |6 |armedStay |Unit is armed in stay mode |
 
-NOTE: See clause 5.3.1.76 "securityMode".
+NOTE: See clause [5.3.1.76 "securityMode"](#53176-securitymode).
 
 
 
 
 ### 5.6.30 hd:enumSpinLevelStrength
-Used for the "spinLevelStrength" data points of the "spinLevel" ModuleClass, and used for the "spinSpeed"  data points of the "blender" ModuleClass, indicating the strength of a spinLevel.
+Used for the "spinLevelStrength" data points of the "[spinLevel](#53184-spinlevel)" ModuleClass, and used for the "spinSpeed"  data points of the "[blender](#531118-blender)" ModuleClass, indicating the strength of a spinLevel.
 
 
 **Table 5.6.301: Interpretation of hd:enumSpinLevelStrength**
@@ -4643,13 +4749,13 @@ Used for the "spinLevelStrength" data points of the "spinLevel" ModuleClass, and
 |5 |strong | |
 |6 |maximum | |
 
-NOTE: See clause 5.3.1.84 "spinLevel" and clause 5.3.1.118 "blender".
+NOTE: See clause [5.3.1.84 "spinLevel"](#53184-spinlevel) and clause [5.3.1.118 "blender"](#531118-blender).
 
 
 
 
 ### 5.6.31 hd:enumSteamClosetJobMode
-Used for "currentJobMode" and "jobModes" data points of the "steamClosetJobMode" ModuleClass.
+Used for "currentJobMode" and "jobModes" data points of the "[steamClosetJobMode](#53185-steamclosetjobmode)" ModuleClass.
 
 
 **Table 5.6.311: Interpretation of hd:enumSteamClosetJobMode**
@@ -4661,13 +4767,13 @@ Used for "currentJobMode" and "jobModes" data points of the "steamClosetJobMode"
 |3 |helpClean |Using pure water without chemical additives, the machine sanitizes fabrics and items that are difficult to wash. |
 |4 |gentleDry |The machine dries fragile garments without worrying about shrinkage or damage. |
 
-NOTE:	See clause 5.3.1.85 "steamClosetJobMode". Negative values are reserved for vendor specific modes.
+NOTE:	See clause [5.3.1.85 "steamClosetJobMode"](#53185-steamclosetjobmode). <mark>Negative values are reserved for vendor specific modes</mark>.
 
 
 
 
 ### 5.6.32 hd:enumSupportedMediaSources
-Used for the "supportedMediaSources" data point of the "mediaSelect" ModuleClass.
+Used for the "supportedMediaSources" data point of the "[mediaSelect](#53153-mediaselect)" ModuleClass.
 
 
 **Table 5.6.321: Interpretation of hd:enumSupportedMediaSources**
@@ -4686,7 +4792,7 @@ Used for the "supportedMediaSources" data point of the "mediaSelect" ModuleClass
 |10 |externalStorage | |
 |11 |network | |
 
-NOTE:	See clause 5.3.1.53"mediaSelect". Negative values are reserved for vender specific sources.
+NOTE:	See clause [5.3.1.53 "mediaSelect"](#53153-mediaselect). <mark>Negative values are reserved for vender specific sources</mark>.
 
 
 
@@ -4730,8 +4836,7 @@ NOTE:	See clause [5.3.1.7 alarmSpeaker](#5317-alarmspeaker).
 
 
 ### 5.6.35 hd:enumUvStatus
-Used for the "uvStatus" data point of the "uvSensor" ModuleClass.
-
+Used for the "uvStatus" data point of the "[uvSensor](#53192-uvsensor)" ModuleClass.
 
 **Table 5.6.351: Interpretation of hd:enumUvStatus**
 
@@ -4743,7 +4848,7 @@ Used for the "uvStatus" data point of the "uvSensor" ModuleClass.
 |4 |Very Bad | |
 |5 |Danger | |
 
-NOTE: See clause 5.3.1.92 "uvSensor".
+NOTE: See clause [5.3.1.92 "uvSensor"](#53192-uvsensor).
 
 
 
@@ -4766,7 +4871,7 @@ NOTE: See clause [5.3.1.4 airFlow](#5314-airflow).
 
 
 ### 5.6.37 hd:enumWaterFlowStrength
-Used for the "waterLevelStrength" data point of the "waterFlow" ModuleClass,  indicating the strength of a waterflow.
+Used for the "waterLevelStrength" data point of the "[waterFlow](#53193-waterflow)" ModuleClass,  indicating the strength of a waterflow.
 
 
 **Table 5.6.371: Interpretation of hd:enumWaterFlowStrength**
@@ -4780,14 +4885,13 @@ Used for the "waterLevelStrength" data point of the "waterFlow" ModuleClass,  in
 |5 |strong | |
 |6 |maximum | |
 
-NOTE: See clause 5.3.1.93 "waterFlow".
+NOTE: See clause [5.3.1.93 "waterFlow"](#53193-waterflow).
 
 
 
 
 ### 5.6.38 hd:enumBaliseSystemIndicator
-Used for the "baliseTransmissionModule" ModuleClass.
-
+Used for the "[baliseTransmissionModule](#5381-balisetransmissionmodule)" ModuleClass.
 
 **Table 5.6.381: Interpretation of hd:enumBaliseSystemIndicator**
 
@@ -4802,8 +4906,8 @@ NOTE: The Note shows countries which are using a balise system which is indicate
 
 
 
-### 5.6.39 hd:enumWeight
-Used for the "unit" data point related to all ModuleClass which contains weight, indicating the units of the weight..
+### 5.6.39 hd:enumWeightUnit
+Used for the "unit" data point related to all ModuleClass which contains weight, indicating the units of the weight.
 
 
 **Table 5.6.391: Interpretation of hd:enumWeight**
@@ -4814,13 +4918,13 @@ Used for the "unit" data point related to all ModuleClass which contains weight,
 |2 |lb |pound |
 |3 |oz |ounce |
 
-  NOTE: See clause 5.3.1.99 "weight".  NOTE:	See clause 5.3.1.99 "weight".
+  NOTE: See clause [5.3.1.99 "weight"](#53199-weight). 
 
 
 
 
 ### 5.6.40 hd:enumTemperatureUnit
-Used for the "unit" data point related to "temperature" and "temperatureAlarm" ModuleClass which contains temperature,  indicating the units of the temperature.
+Used for the "unit" data point related to "[temperature](#53187-temperature)" and "[temperatureAlarm](#53188-temperaturealarm)" ModuleClasses which contains temperature,  indicating the units of the temperature.
 
 
 **Table 5.6.401: Interpretation of hd:enumTemperatureUnit**
@@ -4831,13 +4935,13 @@ Used for the "unit" data point related to "temperature" and "temperatureAlarm" M
 |2 |F |Fahrenheit |
 |3 |K |Kelvin |
 
-NOTE: See clause 5.3.1.87 "temperature" and clause 5.3.1.88 "temperatureAlarm".
+NOTE: See clause [5.3.1.87 "temperature"](#53187-temperature) and clause [5.3.1.88 "temperatureAlarm"](#53188-temperaturealarm).
 
 
 
 
 ### 5.6.41 hd:enumWaterFilterType
-Used for the "filterType" data point of the "waterFilterType" ModuleClass.
+Used for the "filterType" data point of the "[waterFilterType](#531105-waterfiltertype)" ModuleClass.
 
 
 **Table 5.6.411: Interpretation of hd:enumWaterFilterType**
@@ -4850,13 +4954,13 @@ Used for the "filterType" data point of the "waterFilterType" ModuleClass.
 |4 |AC |This value indicates the Activate Carbon type water filter. |
 |5 |SF |This value indicates the Sediment type water filter. |
 
-NOTE: See clause 5.3.1.105 "waterFilterType".
+NOTE: See clause [5.3.1.105 "waterFilterType"](#531105-waterfiltertype).
 
 
 
 
 ### 5.6.42 hd:enumDataModelType
-Used for the "dataModelType" DataPoint of the "dmAgent" ModuleClass.
+Used for the "dataModelType" DataPoint of the "[dmDataModelIO](#585-dmdatamodelio)" ModuleClass.
 
 
 **Table 5.6.42-1 Interpretation of hd:enumDataModelType**
@@ -4875,7 +4979,7 @@ Used for the "dataModelType" DataPoint of the "dmAgent" ModuleClass.
 
 
 ### 5.6.43 hd:enumDmAgentState
-Used for the "state" DataPoint of the "dmAgent" ModuleClass.
+Used for the "state" DataPoint of the "[dmAgent](#583-dmagent)" ModuleClass.
 
 **Table 5.6.43-1 Interpretation of hd:enumDmAgentState**
 
@@ -4890,8 +4994,7 @@ Used for the "state" DataPoint of the "dmAgent" ModuleClass.
 
 
 ### 5.6.44 hd:enumFirmwareState
-Used for the "state" DataPoint of the "dmFirmware" ModuleClass.
-
+Used for the "state" DataPoint of the "[dmFirmware](#586-dmfirmware)" ModuleClass.
 
 **Table 5.6.44-1 Interpretation of hd:enumFirmwareState**
 
@@ -4908,7 +5011,7 @@ Used for the "state" DataPoint of the "dmFirmware" ModuleClass.
 
 
 ### 5.6.45 hd:enumPowerState
-Used for the "powerStatus" DataPoint of the "dmAgent" ModuleClass.
+Used for the "powerStatus" DataPoint of the "[dmAgent](#583-dmagent)" ModuleClass.
 
 **Table 5.6.45-1 Interpretation of hd:enumPowerState**
 
@@ -4926,7 +5029,7 @@ Used for the "powerStatus" DataPoint of the "dmAgent" ModuleClass.
 
 
 ### 5.6.46 hd:enumRebootType
-Used for the "rebootType" argument of the "reboot" action of the "dmAgent" ModuleClass.
+Used for the "rebootType" argument of the "[reboot](#583-dmagent)" action of the "[dmAgent](#583-dmagent)" ModuleClass.
 
 
 **Table 5.6.46-1 Interpretation of hd:enumRebootType**
@@ -4942,7 +5045,7 @@ Used for the "rebootType" argument of the "reboot" action of the "dmAgent" Modul
 
 
 ### 5.6.47 hd:enumSoftwareState
-Used for the "state" data point of the "dmSoftware" ModuleClass.
+Used for the "state" data point of the "[dmSoftware](#587-dmsoftware)" ModuleClass.
 
 
 **Table 5.6.47-1 Interpretation of hd:enumSoftwareState**
@@ -4957,9 +5060,8 @@ Used for the "state" data point of the "dmSoftware" ModuleClass.
 
 
 
-### 5.6.49 hd:enumPackageState
-Used for the "state" data point of the "dmPackage" ModuleClass.
-
+### 5.6.48 hd:enumPackageState
+Used for the "state" data point of the "[dmPackage](#589-dmpackage)" ModuleClass.
 
 **Table 5.6.48-1 Interpretation of hd:enumPackageState**
 
@@ -4974,10 +5076,9 @@ Used for the "state" data point of the "dmPackage" ModuleClass.
 
 
 
-### 5.6.50 hd:enumPackageType
-
-Used for the "type" data point of the "dmPackage" ModuleClass.
+### 5.6.49 hd:enumPackageType
 
+Used for the "type" data point of the "[dmPackage](#589-dmpackage)" ModuleClass.
 
 **Table 5.6.49-1 Interpretation of hd:enumPackageType**
 
@@ -4992,7 +5093,7 @@ Used for the "type" data point of the "dmPackage" ModuleClass.
 
 
 
-### 5.6.51 hd:enumBatteryMaterial
+### 5.6.50 hd:enumBatteryMaterial
 
 Used for the "batteryMaterial" DataPoint of the "[battery](#53110-battery)" ModuleClass.
 
@@ -5019,7 +5120,7 @@ Used for the "batteryMaterial" DataPoint of the "[battery](#53110-battery)" Modu
 
 
 
-### 5.6.52 hd:enumBatteryShape
+### 5.6.51 hd:enumBatteryShape
 
 Used for the "batteryShape" DataPoint of the "[battery](#53110-battery)" ModuleClass.
 
@@ -5055,8 +5156,8 @@ Used for the "batteryShape" DataPoint of the "[battery](#53110-battery)" ModuleC
 
 
 
-### 5.6.53 hd:enum3DDisplayType
-Used for the "threeDDisplayType" DataPoint of the "threeDDisplay" ModuleClass.
+### 5.6.52 hd:enum3DDisplayType
+Used for the "threeDDisplayType" DataPoint of the "[threeDDisplay](#531116-threeddisplay)" ModuleClass.
 
 **Table 5.6.52-1 Interpretation of hd:enum3DDisplayType**
 
@@ -5070,8 +5171,8 @@ Used for the "threeDDisplayType" DataPoint of the "threeDDisplay" ModuleClass.
 
 
 
-### 5.6.54 hd:enum3DScannerType
-Used for the "3DScannerType" DataPoint of the "3DScanner" ModuleClass.
+### 5.6.53 hd:enum3DScannerType
+Used for the "threeDScannerType" DataPoint of the "[threeDScanner](#531117-threedscanner)" ModuleClass.
 
 **Table 5.6.53-1 Interpretation of hd:enum3DScannerType**
 
@@ -5086,11 +5187,10 @@ Used for the "3DScannerType" DataPoint of the "3DScanner" ModuleClass.
 
 
 
-### 5.6.55 hd:enumShoesWasherJobMode
-Used for the "currentJobMode" and "jobModes" DataPoints of the "shoedWasherJobMode" ModuleClass.
+### 5.6.54 hd:enumShoesWasherJobMode
+Used for the "currentJobMode" and "jobModes" DataPoints of the "[shoesWasherJobMode](#531119-shoeswasherjobmode)" ModuleClass.
 
-
-**Table 5.6.541: Interpretation of hd:enumShoesWasherJobMode**
+**Table 5.6.54-1: Interpretation of hd:enumShoesWasherJobMode**
 
 |Value |Interpretation |Note |
 |-|-|-|
@@ -5099,16 +5199,16 @@ Used for the "currentJobMode" and "jobModes" DataPoints of the "shoedWasherJobMo
 |3 |quickWash | |
 |4 |maintenanceWash | |
 |5 |antibacterialWash | |
-|NOTE:	See clause 5.3.1.119 "shoesWasherJobMode". Negative values are reserved for vendor specific modes. |NOTE:	See clause 5.3.1.119 "shoesWasherJobMode". Negative values are reserved for vendor specific modes. |NOTE:	See clause 5.3.1.119 "shoesWasherJobMode". Negative values are reserved for vendor specific modes. |
 
+NOTE:	See clause [5.3.1.119 "shoesWasherJobMode"](#531119-shoeswasherjobmode). <mark>Negative values are reserved for vendor specific modes</mark>.
 
 
 
-### 5.6.56 hd:enumAlertStatus
-The enumeration type, hd:enumAlertStatus, enables things to identify the alert status that describes whether a received public warning message as oneM2M based information is an actual alert issued by authorities or an alert for testing the public warning service over oneM2M system.
 
+### 5.6.55 hd:enumAlertStatus
+The enumeration type, hd:enumAlertStatus, enables things to identify the alert status that describes whether a received public warning message as oneM2M based information is an actual alert issued by authorities or an alert for testing the public warning service over oneM2M system.
 
-**Table 5.6.551: Interpretation of hd:enumAlertStatus**
+**Table 5.6.55-1: Interpretation of hd:enumAlertStatus**
 
 |Value |Interpretation |Note |
 |-|-|-|
@@ -5123,7 +5223,7 @@ NOTE:  Listed names for this enumeration are specified on the CAP 1.2 specificat
 
 
 
-### 5.6.57 hd:enumAlertMsgType
+### 5.6.56 hd:enumAlertMsgType
 The enumeration type, hd:enumAlertMsgType, describes the message type of oneM2M based information transformed from CAP based information issued by authorities.
 
 
@@ -5140,7 +5240,7 @@ NOTE:  Listed names for this enumeration are specified on the CAP 1.2 specificat
 
 
 
-### 5.6.58 hd:enumUrgency
+### 5.6.57 hd:enumUrgency
 The enumeration type, hd:enumUrgency, describes the urgency of the event defined in oneM2M based information transformed from CAP based information issued by authorities.
 
 
@@ -5159,7 +5259,7 @@ NOTE:  Listed names for this enumeration are specified on the CAP 1.2 specificat
 
 
 
-### 5.6.59 hd:enumSeverity
+### 5.6.58 hd:enumSeverity
 The enumeration type, hd:enumSeverity, describes the severity of the event defined in oneM2M based information transformed from CAP based information issued by authorities.
 
 
@@ -5178,7 +5278,7 @@ NOTE:  Listed names for this enumeration are specified on the CAP 1.2 specificat
 
 
 
-### 5.6.60 hd:enumCertainty
+### 5.6.59 hd:enumCertainty
 The enumeration type, hd:enumCertainty, describes the certainty of the event defined in oneM2M based information transformed from CAP based information issued by authorities.
 
 
@@ -5201,14 +5301,12 @@ NOTE: Listed names for this enumeration are specified on the CAP 1.2 specificati
 Universal and common properties are defined either 
 
 
-- As specialized custom attributes of a [dmDeviceInfo] &lt;flexContainer> specialization, defined in 5.8.4, when the &lt;node> resource targeted by the nodeLink attribute of the Device model contains a [flexNode] child,
+- As specialized custom attributes of a [[dmDeviceInfo]](#584-dmdeviceinfo] &lt;flexContainer> specialization, defined in [clause 5.8.4](#584-dmdeviceinfo), when the &lt;node> resource targeted by the nodeLink attribute of the Device model contains a [[flexNode](#582-flexnode)] child,
 - Or as specialized object attributes of the [deviceInfo] &lt;mgmtObj> specialization, defined in Annex D.8 of TS-0001<a href="#_ref_3">[3]</a>, child of this &lt;node> resource, otherwise.
 
-
-
 Some properties are mandatory for all device models and called "Universal Properties", since they are universally seen in typical device types and carry necessary information to identify each device instance. Others are optional for all device models and called "Common Properties", since they are commonly used in many device types but not always. 
 
-Universal and common properties are applicable to all device models. They are not repeated in the property table of each device model in clause 5.5, where only device specific properties shall be specified. 
+Universal and common properties are applicable to all device models. They are not repeated in the property table of each device model in [clause 5.5](#55-device-models), where only device specific properties shall be specified. 
 
 NOTE: The instantiated values of the universal properties might be empty in case of exceptional scenarios, e.g. interworking with non-oneM2M device models.
 
@@ -5222,37 +5320,40 @@ In the case of a NoDN, it is the IPE in charge of exposing the device to oneM2M
 
 The architecture of IPE-based Device Management is presented in oneM2M TS-0001 <a href="#_ref_3">[3]</a> clause 6.2.4.1, and the details of CRUD operations on the resources defined here are defined in oneM2M TS-0033 <a href="#_ref_21">[21]</a> clause 8. A developer's guide on Device Management can be found in oneM2M TR-0035 <a href="#_ref_i.11">[i.11]</a>.
 
+<mark>Editor note: Some attributes are missing from the short name tables in 6.3</mark>
+
 
 
 
 ### 5.8.2 flexNode
-This flexContainer specialization is the root for SDT-based Device Management modules.
+This flexContainer specialization is the root for SDT-based Device Maagement modules.
 
 The containerDefinition attribute of this specialization shall be "org.onem2m.management.device.flexNode".
 
-This resource is a &lt;flexContainer> child of the &lt;node> resource targeted by the nodeLink attribute of &lt;flexContainer> SDT devices (see in 6.2.2 the rule 1.7).
-
+This resource is a &lt;flexContainer> child of the &lt;node> resource targeted by the nodeLink attribute of &lt;flexContainer> SDT devices (see in [6.2.2](#622-resource-mapping-for-device-model) the rule 1.7).
 
 **Table 5.8.21: Child resources of [flexNode] resource**
 
 |Child Resources of [flexNode] |Child Resource Type |Multiplicity |Description |
 |-|-|-|-|
-|dmAreaNwkInfo_&lt;i> |[dmAreaNwkInfo] |0..n |See clause 5.8.10. |
-|dmAgent |[dmAgent]	 |0..1 |See clause 5.8.3. |
-|dmDeviceInfo	 |[dmDeviceInfo] |1 |See clause 5.8.4. |
-|dmDataModelIO_&lt;i> |[dmDataModelIO] |0..N |See clause 5.8.5. |
-|dmFirmware_&lt;i> |[dmFirmware] |1..N |See clause 5.8.6. |
-|dmSoftware_&lt;i> |[dmSoftware] |0..N |See clause 5.8.7. |
-|dmEventLog_&lt;i> |[dmEventLog] |0..N |See clause 5.8.8. |
-|dmPackage_&lt;i> |[dmPackage] |0..N |See clause 5.8.9, |
-|battery_&lt;i> |[[battery](#53110-battery)] |0..N |See clause [5.3.1.10](#53110-battery). |
-|dmCapability_&lt;i>	 |[dmCapability] |0..N |See clause 5.8.12. |
-|dmStorage_&lt;i> |[dmStorage] |0..N |See clause 5.8.13. |
+|dmAreaNwkInfo_&lt;i> |[[dmAreaNwkInfo]](#5810-dmareanwkinfo)] |0..n |See clause [5.8.10](#5810-dmareanwkinfo). |
+|dmAgent |[[dmAgent]](#583-dmagent)	 |0..1 |See clause [5.8.3](#583-dmagent). |
+|dmDeviceInfo	 |[[dmDeviceInfo]](#584-dmdeviceinfo) |1 |See clause [5.8.4](#584-dmdeviceinfo). |
+|dmDataModelIO_&lt;i> |[[dmDataModelIO]](#585-dmdatamodelio) |0..N |See clause [5.8.5](#585-dmdatamodelio). |
+|dmFirmware_&lt;i> |[[dmFirmware]](#586-dmfirmware) |1..N |See clause [5.8.6](#586-dmfirmware). |
+|dmSoftware_&lt;i> |[[dmSoftware]](#587-dmsoftware) |0..N |See clause [5.8.7](#587-dmsoftware). |
+|dmEventLog_&lt;i> |[[dmEventLog]](#588-dmeventlog) |0..N |See clause [5.8.8](#588-dmeventlog). |
+|dmPackage_&lt;i> |[[dmPackage]](#589-dmpackage)] |0..N |See clause [5.8.9](#589-dmpackage), |
+|battery_&lt;i> |[[battery]](#53110-battery) |0..N |See clause [5.3.1.10](#53110-battery). |
+|dmCapability_&lt;i>	 |[[dmCapability]](#5812-dmcapability)] |0..N |See clause [5.8.12](#5812-dmcapability). |
+|dmStorage_&lt;i> |[[dmStorage]](#5813-dmstorage)] |0..N |See clause [5.8.13](#5813-dmstorage). |
 
 NOTES:
 
 - the notation '&lt;i>' for child resources indicates that the resource name is the name of the child ModuleClass or SubDevice flexContainer, appended with an underscore '' and an incrementing index so that it is unique in the [flexNode] children (e.g. "dmFirmware_0", "dmFirmware_1", etc.). The index shall not have leading 0's.
-- the current list of modules for Device Management is not fixed and can evolve with new optional features.
+- the current list of modules for Device Management is not fixed and can evolve with new optional features
+
+
 
 
 ### 5.8.3 dmAgent
@@ -5263,10 +5364,10 @@ This ModuleClass is the entry point module of [flexNode]; it provides capabiliti
 
 |Return Type |Name |Arguments |Optional |Description |
 |-|-|-|-|-|
-|none	 |reboot |rebootType: hd:enumRebootType<br /> |false |Execute a reboot or a factory reset |
-|M2MID |deployPackage |name: xs:string<br />version: xs:string<br />url: xs:url |true |Create a dmPackage.<br />Return the ID of the created package. |
+|none	 |reboot |rebootType: [hd:enumRebootType](#5646-hdenumreboottype) |false |Execute a reboot or a factory reset |
+|M2MID |deployPackage |name: xs:string<br />version: xs:string<br />url: xs:url |true |Create a [dmPackage](#589-dmpackage).<br />Return the ID of the created package. |
 
-The deployPackage action allows creating a new [dmPackage] module class (see clause 5.8.9), child of this dmAgent's parent flexNode. The returned value is the ID of this created &lt;flexContainer>. The created dmPackage is in NotInstalled state.
+The deployPackage action allows creating a new [[dmPackage](#589-dmpackage)] module class (see clause [5.8.9](#589-dmpackage)), child of this dmAgent's parent flexNode. The returned value is the ID of this created &lt;flexContainer>. The created [dmPackage](#589-dmpackage) is in *NotInstalled* state.
 The DataPoints of dmAgent Module Class are as follows: 
 
 - 'state' represents the state of the agent for DM purposes (ready, sleeping, etc.).
@@ -5276,12 +5377,12 @@ The DataPoints of dmAgent Module Class are as follows:
 
 |Name |Type |R/W |Optional |Unit |Description |
 |-|-|-|-|-|-|
-|state |hd:enumDmAgentState |R |false | |The current state of the agent (ready, error, etc.) |
+|state |[hd:enumDmAgentState](#5643-hdenumdmagentstate) |R |false | |The current state of the agent (ready, error, etc.) |
 |storageAvailable |xs:integer |R |true |KB |The size of available storage memory. |
 |storageTotal |xs:integer |R |true |KB |The size of total storage memory. |
 |ramAvailable |xs:integer |R |true |KB |The size of available RAM memory. |
 |ramTotal |xs:integer |R |true |KB |Total size of the RAM memory. |
-|powerStatus |hd:enumPowerState |R |true | |The status of the electrical power. |
+|powerStatus |[hd:enumPowerState](#5645-hdenumpowerstate) |R |true | |The status of the electrical power. |
 |cpuUsage |xs:integer |R |true |pct |Current CPU usage in percent. |
 |systemTime |m2m:timestamp |RW |true | |Reference time for the device.  |
 
@@ -5309,7 +5410,9 @@ This ModuleClass is used to share static information regarding the device.
 |friendlyName |xs:string |RW |true | |The device friendly name.  |
 |description |xs:string |RW |true | |A human readable description of the device (e.g. Alice's cell phone, kitchen's fridge...) |
 
-NOTE:  although all datapoints are optional, depending on the underlying DM technology, some datapoints should be filled, for instance serialNumber, manufacturer and model when this information is available.
+NOTE:  although all datapoints are optional, depending on the underlying DM technology, some datapoints should be filled, for instance *serialNumber*, *manufacturer* and *model* when this information is available.
+
+
 
 ### 5.8.5 dmDataModelIO
 
@@ -5320,7 +5423,7 @@ This ModuleClass provides capabilities to handle the device's Data Model for cas
 
 |Return Type |Name |Arguments |Optional |Description |
 |-|-|-|-|-|
-|xs:string |readIO |address: xs:string |true |Read the current values of parameters. Argument: the list of the parameter names. <br />Returns a JSON serialization of the parameters (see Rules 3-2 and 3-6 in clause 6.2.4). |
+|xs:string |readIO |address: xs:string |true |Read the current values of parameters. Argument: the list of the parameter names. <br />Returns a JSON serialization of the parameters (see Rules 3-2 and 3-6 in clause [6.2.4](#624-resource-mapping-for-action)). |
 |xs:string |writeIO |address: xs:string<br />payload: xs:string |true |Update the current values of parameters. Arguments: <br />'address': the list of the parameter names, <br />'payload': the list of the parameter values. <br />Returns the list of the modified parameter names. |
 
 
@@ -5329,39 +5432,37 @@ This ModuleClass provides capabilities to handle the device's Data Model for cas
 
 |Name |Type |R/W |Optional |Unit |Description |
 |-|-|-|-|-|-|
-|dataModelType |hd:enumDataModelType |R |false | |The type of the data model (OMA DM, OMA LwM2M, BBF TR-181, etc.). |
+|dataModelType |[hd:enumDataModelType](#5642-hdenumdatamodeltype) |R |false | |The type of the data model (OMA DM, OMA LwM2M, BBF TR-181, etc.). |
 
 
 
-The readIO and writeIO actions are defined for handling parameters of the underlying Device Management protocol using the APIs defined by those technologies. The values used in the address argument are dependent on the value of the dataModelType data point of the dmAgent module.
+The readIO and writeIO actions are defined for handling parameters of the underlying Device Management protocol using the APIs defined by those technologies. The values used in the address argument are dependent on the value of the dataModelType data point of the [dmAgent](#583-dmagent) ModuleClass.
 
 Example of address values could be ```'Device.WiFi.SSID.1' if dataModelType=6``` (BBF TR-181 USP) or ```'/9/1/1' if dataModelType=4``` (OMA LwM2M).
 
 These address and payload argument can contain several values separated by a comma ','. The payload argument's value types are the valid JSON primitive types (string, number, boolean, null).
 
-<mark>Examples:</mark>mark>
+Examples:
 
-- readIO(address="Device.WiFi.SSID.SSID")
-
-
--  {"Device.WiFi.SSID.SSID": "SSIDName"}
-
-- readIO(address="/3/0/1,/3/0/2")
 
+```
+readIO(address="Device.WiFi.SSID.SSID")
+    -> {"Device.WiFi.SSID.SSID": "SSIDName"}
 
-- {"/3/0/1":"MyCompany","/3/0/2":"SN376575A86"}
+readIO(address="/3/0/1,/3/0/2")
+    -> {"/3/0/1":"MyCompany","/3/0/2":"SN376575A86"}
 
-- writeIO(address="Device.DeviceInfo.FriendlyName,Device.WiFi.SSID.SSID",
+writeIO(address="Device.DeviceInfo.FriendlyName,Device.WiFi.SSID.SSID", payload="my device,my ssid"}
+    -> {"Device.DeviceInfo.FriendlyName,Device.WiFi.SSID.SSID"}
 
-- payload="my device,my ssid"}
+writeIO(address="/3/0/15", payload="[Europe/Paris](Europe/Paris)")
+    -> {"/3/0/15"}
+```
 
-- {"Device.DeviceInfo.FriendlyName,Device.WiFi.SSID.SSID"}
+NOTE: some datapoints of the [dmAgent](#583-dmagent) and [dmDeviceInfo](#584-dmdeviceinfo) ModuleClasses correspond to fixed parameters in OMA & BBF data models. The corresponding concepts in OMA DM / LwM2M data models (resp. BBF TR-181) are specified in oneM2M TS-0005 (resp. TS-0006). For instance the datapoint memAvailable corresponds to 'Device.DeviceInfo.MemoryStatus.Free' in TR-181 (see TS-0006 clause 7.3) and to '/3/0/10' in LwM2M (TS-0005 clause 6.3.4).
 
-- writeIO(address="/3/0/15", payload="[Europe/Paris](Europe/Paris)")
 
-- {"/3/0/15"}
 
-NOTE: some datapoints of the dmAgent and dmDeviceInfo moduleClasses correspond to fixed parameters in OMA & BBF data models. The corresponding concepts in OMA DM / LwM2M data models (resp. BBF TR-181) are specified in oneM2M TS-0005 (resp. TS-0006). For instance the datapoint memAvailable corresponds to 'Device.DeviceInfo.MemoryStatus.Free' in TR-181 (see TS-0006 clause 7.3) and to '/3/0/10' in LwM2M (TS-0005 clause 6.3.4).
 ### 5.8.6 dmFirmware
 
 This ModuleClass provides Device Management capabilities to control and monitor the firmware of a device.
@@ -5390,11 +5491,11 @@ Table 5.8.6-2 DataPoints of dmFirmware ModuleClass
 |Name |Type |R/W |Optional |Unit |Description |
 |-|-|-|-|-|-|
 |multiFirmware |xs:boolean |R |false | |Indicates if the device/sub-component supports toggling between  multiple preinstalled firmware versions |
-|primaryState |hd:enumFirmwareState |R |false | |The current state of the primary firmware image (active, downloading, etc.) |
+|primaryState |[hd:enumFirmwareState](#5644-hdenumfirmwarestate) |R |false | |The current state of the primary firmware image (active, downloading, etc.) |
 |primaryName	 |xs:string |R |false | |The name of the primary firmware image. |
 |primaryVersion	 |xs:string |R |false | |The version of the primary firmware image. |
-|primaryUrl |xs:url |R |true | |The URL from which the primary firmware image was downloaded |
-|secondaryState |hd:enumFirmwareState |R |true | |The current state of the secondary firmware image (active, downloading, etc.). Mandatory when updateFirmware is available |
+|primaryUrl |xs:url |R |true | |The URL from which the primary firmware image was downloaded. |
+|secondaryState |[hd:enumFirmwareState](#5644-hdenumfirmwarestate) |R |true | |The current state of the secondary firmware image (active, downloading, etc.). Mandatory when *updateFirmware* is available. |
 |secondaryName	 |xs:string |R |true | |The name of the secondary firmware image. |
 |secondaryVersion	 |xs:string |R |true | |The version of the secondary firmware image. |
 |secondaryUrl |xs:url |R |true | |The URL from which the secondary firmware image was downloaded |
@@ -5402,7 +5503,7 @@ Table 5.8.6-2 DataPoints of dmFirmware ModuleClass
 
 
 
-NOTE: both primary and secondary firmware image related dataPoints are mandatory when updateFirmware is available, however depending on the device capabilities one of the two state machines - the one presented in Figure 5.8.6-1 or the one shown in Figure 5.8.6-2 should be used.
+NOTE: both primary and secondary firmware image related dataPoints are mandatory when *updateFirmware* is available, however depending on the device capabilities one of the two state machines - the one presented in Figure 5.8.6-1 or the one shown in Figure 5.8.6-2 should be used.
 
 
 
@@ -5416,7 +5517,7 @@ For devices that support toggling between multiple preinstalled firmware images
 
 - There is always one firmware image that is in "Active" state.
 - Toggling between firmware images is only possible if one image is in "Ready" state and the other image is in "Active" state. 
-- updateFirmware action is always performed on the  image that  is in "Ready" or "Failure" state.
+- *updateFirmware* action is always performed on the  image that  is in "Ready" or "Failure" state.
 
 NOTE: it is the AE/IPE responsibility to provide the appropriate action result pointing if the action was triggered on the device or not (e.g. if the current firmware state did not allow it).
 
@@ -5427,17 +5528,17 @@ NOTE: it is the AE/IPE responsibility to provide the appropriate action result p
 **Figure 5.8.6-2: Lifecycle of a dmFirmware for devices that can have only one firmware version installed**
 
 
-In case of a device that can have only one firmware version installed the additional firmware image is used differently. First of all it's treated as a temporary storage for the updateFirmware action that triggers the download process. When the download process is finished the status of the firmware image is changed to "Ready". It's important to note that in this case the installation/flashing process is started after the toggle action is issued, making it a "long toggle". At the very same moment the toggle is issued, the previously active firmware image is moved to "Archival" state, making it a historical record that cannot be restored. The reason why it cannot be restored is trivial - it was just overwritten by the flashing process.
+In case of a device that can have only one firmware version installed the additional firmware image is used differently. First of all it's treated as a temporary storage for the *updateFirmware* action that triggers the download process. When the download process is finished the status of the firmware image is changed to "Ready". It's important to note that in this case the installation/flashing process is started after the toggle action is issued, making it a "long toggle". At the very same moment the toggle is issued, the previously active firmware image is moved to "Archival" state, making it a historical record that cannot be restored. The reason why it cannot be restored is trivial - it was just overwritten by the flashing process.
 
 For devices that can have only one firmware version installed the following rules apply:
 
 - There is always no more than one firmware image that is in "Active" or "Installing" state.
 - Toggling between firmware images is only possible if one image is in "Ready" state and the other image is in "Active" state. 
-- The toggle action moves the image that was previously in "Active" state to the "Archival" state.
-- The toggle action moves the image that was previously in "Ready" state to the "Installing" state.
-- updateFirmware action is always performed on the  image that  is in "Archival" or "Failure" state.
+- The *toggle* action moves the image that was previously in "Active" state to the "Archival" state.
+- The *toggle* action moves the image that was previously in "Ready" state to the "Installing" state.
+- *updateFirmware* action is always performed on the  image that  is in "Archival" or "Failure" state.
 
-If one image is in "Archival" state and the other is in "Failure" state the updateFirmware action is always performed on the image that is in "Archival" state.
+If one image is in "Archival" state and the other is in "Failure" state the *updateFirmware* action is always performed on the image that is in "Archival" state.
 
 NOTE: it is the AE/IPE responsibility to provide the appropriate action result pointing if the action was triggered on the device or not (e.g. if the current firmware state did not allow it).
 
@@ -5445,13 +5546,13 @@ NOTE: it is the AE/IPE responsibility to provide the appropriate action result p
 
 This ModuleClass provides DM capabilities to control and monitor software modules of the device.
 
-An instance of this module class represents a software module hosted by the device.
+An instance of this ModuleClass represents a software module hosted by the device.
 
-A [dmSoftware] module is created on a Hosting CSE by the IPE in charge of the device, either at the initialization if it represents a software module that is pre-installed on the device, or after installation of one or more [dmPackage] modules (see clause 5.8.9) that have been dynamically created (for instance a software image with associated configuration files and libraries).
+A [dmSoftware] module is created on a Hosting CSE by the IPE in charge of the device, either at the initialization if it represents a software module that is pre-installed on the device, or after installation of one or more [[5.8.9 dmPackage]](#589-dmpackage) modules (see clause [5.8.9](#589-dmpackage)) that have been dynamically created (for instance a software image with associated configuration files and libraries).
 
-The association between one or more dmPackage modules and a dmSoftware module are under the responsibility of the IPE: dmSoftware modules are created, deleted or updated only by the IPE (for instance updating a dmPackage can trigger the modification of the version datapoint of an associated dmSoftware).
+The association between one or more [dmPackage](#589-dmpackage) modules and a dmSoftware module are under the responsibility of the IPE: dmSoftware modules are created, deleted or updated only by the IPE (for instance updating a [dmPackage](#589-dmpackage) can trigger the modification of the version datapoint of an associated dmSoftware).
 
-From external applications, [dmSoftware] modules can only be discovered from the parent [flexNode], not created, and afterwards they can only be activated / deactivated. They can be seen as 'high level' information ("there is such software that is running on the device"), whereas dmPackages are 'low level' information ("there is such executable file that is deployed on the device").
+From external applications, [dmSoftware] modules can only be discovered from the parent [flexNode], not created, and afterwards they can only be activated / deactivated. They can be seen as 'high level' information ("there is such software that is running on the device"), whereas [dmPackage](#589-dmpackage) are 'low level' information ("there is such executable file that is deployed on the device").
 
 
 **Table 5.8.7-1 Actions of dmSoftware ModuleClass**
@@ -5465,7 +5566,7 @@ From external applications, [dmSoftware] modules can only be discovered from the
 
 |Name |Type |R/W |Optional |Unit |Description |
 |-|-|-|-|-|-|
-|state<br /> |hd:enumSoftwareState |R |false | |The current state of the software module (see clause 5.6.47). |
+|state<br /> |[hd:enumSoftwareState](#5647-hdenumsoftwarestate) |R |false | |The current state of the software module (see clause [5.6.47](#5647-hdenumsoftwarestate)). |
 |name |xs:string |R |true | |The name of the software module. |
 |version |xs:string |R |true | |The version of the software module. |
 
@@ -5501,7 +5602,7 @@ For devices using the dmEventLog ModuleClass, the following rules apply:
 - Instances of this module should only be created by the IPE (one per log type supported by the device for instance).
 - The IPE can create a [dmEventLog] instance with status datapoint 'NotPresent' for a given log type, to indicate that this log type is not supported by the device. Otherwise status should have value 'Started' (resp. 'Stopped') if the enabled datapoint is set to true (resp. false). The status datapoint can be given 'Error' value if the log processing dysfunctions.
 - The IPE should use the &lt;flexContainerInstance> history mechanism (see TS-0001 § 9.6.59) by setting on [dmEventLog] at least one attribute maxNrOfInstances, maxByteSize or maxInstanceAge. Then for each log event read by the IPE from the device, and if the enabled datapoint has value true, a &lt;flexContainerInstance> resource shall be created, child of this module &lt;flexContainer>. The [dmEventLog] module itself just contains the last logged event from the device for this log type.
-- The [dmEventLog] &lt;flexContainer>, and therefore its &lt;flexContainerInstance> children resources, should have a dataGenerationTime custom attribute that indicates the time the event was logged on the device (see Rule 2-5 in section 6.2.3).
+- The [dmEventLog] &lt;flexContainer>, and therefore its &lt;flexContainerInstance> children resources, should have a *dataGenerationTime* custom attribute that indicates the time the event was logged on the device (see Rule 2-5 in section 6.2.3).
 
 When the enabled datapoint is set to false, the IPE shall set the status datapoint to 'Stopped' and shall not modify the data datapoint of the module, and therefore shall not create any &lt;flexContainerInstance> child resource.
 
@@ -5512,8 +5613,8 @@ When the enabled datapoint is set to false, the IPE shall set the status datapoi
 This ModuleClass provides DM capabilities to deploy, control and monitor packages of the device. 
 
 - These packages can be simple resource files such as software libraries, configuration files, etc. In this case the softwares datapoint will be empty.
-- They also can correspond to software images, in which case their installation will trigger the creation by the IPE of one or more [dmSoftware] SDT modules classes that can be activated / deactivated (see clause 5.8.7). In this case the softwares datapoint will contain the list of IDs of this(these) dmSoftware module(s).
-- Instances of the dmPackage module class can be dynamically created by the deployPackage action of the dmAgent module class (see clause 5.8.2).
+- They also can correspond to software images, in which case their installation will trigger the creation by the IPE of one or more [[dmSoftware]](#587-dmsoftware) SDT modules classes that can be activated / deactivated (see clause [5.8.7](#587-dmsoftware)). In this case the softwares datapoint will contain the list of IDs of this(these) [dmSoftware](#587-dmsoftware) module(s).
+- Instances of the dmPackage module class can be dynamically created by the "[deployPackage](#583-dmagent)" action of the [dmAgent](#583-dmagent) module class (see clause [5.8.3](#583-dmagent)).
 
 
 **Table 5.8.9-1 Actions of dmPackage ModuleClass**
@@ -5524,12 +5625,14 @@ This ModuleClass provides DM capabilities to deploy, control and monitor package
 |none |uninstall |none |false |Uninstall the package. |
 |none |update |version: xs:string<br />url: xs:string |false |Update the package. |
 
+<mark>Editor's note: *update* is missing in Table 6.3.2-4</mark>
+
 
 
 **Notes**:
 
 - The package can be pre-downloaded when the [dmPackage] resource is created.
-- In the update action, the arguments version and url can be empty strings (case for instance of updating a package on a Linux-type system).
+- In the *update* action, the arguments version and url can be empty strings (case for instance of updating a package on a Linux-type system).
 - When the [dmPackage] resource is deleted, the package shall be removed from the device.
 
 
@@ -5537,21 +5640,23 @@ This ModuleClass provides DM capabilities to deploy, control and monitor package
 
 |Name |Type |R/W |Optional |Unit |Description |
 |-|-|-|-|-|-|
-|type |hd:enumPackageType |R |false | |The type of the package (software, library, config file, web content, etc. See clause 5.6.49) |
-|state |hd:enumPackageState |R |false | |The current state of the package (see clause 5.6.48) |
+|type |[hd:enumPackageType](#5649-hdenumpackagetype) |R |false | |The type of the package (software, library, config file, web content, etc. See clause [5.6.49](#5649-hdenumpackagetype)) |
+|state |[hd:enumPackageState](#5648-hdenumpackagestate) |R |false | |The current state of the package (see clause [5.6.48](#5648-hdenumpackagestate)) |
 |name	 |xs:string |R |true | |The name of the package. |
 |version	 |xs:string |R |true | |The version of the package. |
 |url |xs:url |R |true | |The URL from which the package can be downloaded |
-|softwares |m2m:listOfM2MID |R |true | |The list of dmSoftware modules, if any, that are associated with this dmPackage |
+|softwares |m2m:listOfM2MID |R |true | |The list of [dmSoftware](#587-dmsoftware) modules, if any, that are associated with this [dmPackage] module |
 
 
 
 **Notes**: 
 
-- The dmPackage name and version datapoints are optional because they can be deduced from the downloaded resource. The url datapoint is optional because the package can be pre-installed or downloaded from a default repository (for instance a package on a Linux-type system).
-- The possible dependencies between dmPackage modules (for instance the dmPackage of an executable software image depends on the deployment of other dmPackage that correspond to libraries needed by this software) is out of scope of this document.
+- The [dmPackage] *name* and *version* datapoints are optional because they can be deduced from the downloaded resource. The url datapoint is optional because the package can be pre-installed or downloaded from a default repository (for instance a package on a Linux-type system).
+- The possible dependencies between [dmPackage] modules (for instance the [dmPackage] of an executable software image depends on the deployment of other dmPackage that correspond to libraries needed by this software) is out of scope of this document.
+
+The control of the association between a dmPackage and an associated [dmSoftware](#587-dmsoftware) module, for instance updating a [dmPackage] when the [dmSoftware](#587-dmsoftware) is active, is out of scope of this document.
+
 
-The control of the association between a dmPackage and an associated dmSoftware, for instance updating a dmPackage when the dmSoftware is active, is out of scope of this document.
 
 
 ### 5.8.10 dmAreaNwkInfo
@@ -5571,7 +5676,7 @@ A dmAreaNwkInfo is a SDT SubDevice entity, mapped as a &lt;flexContainer> resour
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|dmAreaNwkDeviceInfo |dmAreaNwkDeviceInfo |0..N |See clause 5.8.11 |
+|dmAreaNwkDeviceInfo |[dmAreaNwkDeviceInfo](#5811-dmareanwkdeviceinfo) |0..N |See clause [5.8.11](#5811-dmareanwkdeviceinfo). |
 
 
 
@@ -5613,7 +5718,7 @@ This ModuleClass is used to model the service capabilities of a managed device.
 |-|-|-|-|-|-|
 |name |xs:string |R |false | |The name of the device capability. |
 |attached |xs:boolean |R |false | |Indicates whether the capability is currently attached to the device or not. |
-|currentState |xs: boolean |R |false | |Indicates the current state of the capability (e.g. enabled or disabled). |
+|currentState |xs:boolean |R |false | |Indicates the current state of the capability (e.g. enabled or disabled). |
 
 
 
@@ -5658,7 +5763,7 @@ This ModuleClass is used to model the storage on a managed device.
 # 6 The Principle of Resource Mapping for Home Appliance Information Model
 
 ## 6.1 Introduction
-Home appliance information models which are defined in clause 5need to be represented as resources in the oneM2M system. This clause defines the principle of resource mapping based on &lt;flexContainer>. The individual information mapping is provided in annexes A, B, C and D.
+Home appliance information models which are defined in clause 5need to be represented as resources in the oneM2M system. This clause defines the principle of resource mapping based on &lt;flexContainer>. The individual information mapping is provided in annexes [A](#annex-a-(informative)--resource-mapping-examples), [B](#annex-b-(informative)--introduction-of-external-organizations'-data-models), [C](#annex-c-(informative)--mapping-to-content-attribute) and D. <mark>Editor note: check validity to annexes. e.g. Annex D is the document history.</mark>
 
 
 ## 6.2 The Resource Mapping Rules
@@ -5668,28 +5773,28 @@ The present clause specifies the rule to map the "Harmonized Information Model"
 
 
 ### 6.2.2 Resource mapping for Device model
-When the AE exposes a controlling interface for a home domain device which is specified as an information model in clause 5.5, a specialization of the &lt;flexContainer> resource shall be created as the mapping of the model following conversion rules:
+When the AE exposes a controlling interface for a home domain device which is specified as an information model in clause [5.5](#55-device-models), a specialization of the &lt;flexContainer> resource shall be created as the mapping of the model following conversion rules:
 
 
-- Rule 1-1: Each Device model defined in clause 5.5 shall be mapped to a specialization of &lt;flexContainer>. The *containerDefinition* attribute shall be set according to 6.4.2.
+- Rule 1-1: Each Device model defined in clause [5.5](#55-device-models) shall be mapped to a specialization of &lt;flexContainer>. The *containerDefinition* attribute shall be set according to [6.4.2](#642-device-models).
 
-- Rule 1-2: Each entry in the 'Module' table shall be mapped to a child resource(s) which is mapped as a specialised &lt;flexContainer> following the rule in clause 6.2.3.
+- Rule 1-2: Each entry in the 'Module' table shall be mapped to a child resource(s) which is mapped as a specialised &lt;flexContainer> following the rule in clause [6.2.3](#623-resource-mapping-for-moduleclass).
 
 - Rule 1-3: The specialized &lt;flexContainer> resource of the Device model may contain an optional attribute *nodeLink* (as defined in TS-0001<a href="#_ref_3">[3]</a> and in TS-0004<a href="#_ref_4">[4]</a>). The value of *nodeLink* shall be set to the resource identifier of a &lt;node> resource described in Rule 1-5 below. See also Rule 1-8.
 
-- Rule 1-4: XSD file for each Device model shall be named according to 6.5.2.
+- Rule 1-4: XSD file for each Device model shall be named according to [6.5.2](#652-xsd-definitions-for-device-models).
 
 - Rule 1-5:  A &lt;node> resource shall be created on the same hosting CSE as the &lt;flexContainer> representing this Device model. If the &lt;node> resource does not contain a [flexNode] child resource (see Rule 1.7), then it contains all the management information as specialized &lt;mgmtObj> resources (e.g. [firmware]) about the Device model instance for device management purposes. 
 
 - Rule 1-6: Void.
 
-- Rule 1-7:The &lt;node> resource targeted by the *nodeLink* attribute may have a [flexNode] child resource. This [flexNode] resource contains all the Device Management information as specialized &lt;flexContainer> resources defined in 5.8 (e.g. [dmFirmware]) about the device model instance for Device Management purposes.
+- Rule 1-7:The &lt;node> resource targeted by the *nodeLink* attribute may have a [flexNode] child resource. This [flexNode] resource contains all the Device Management information as specialized &lt;flexContainer> resources defined in [5.8](#58-device-management) (e.g. [[dmFirmware](#586-dmfirmware)]) about the device model instance for Device Management purposes.
 
 - Rule 1-8: Void.
 
-- Rule 1-9: Each entry in the 'SubDevice' table shall be mapped to a child resource(s) which is mapped as a specialised &lt;flexContainer> following the rule in clause 6.2.7.
+- Rule 1-9: Each entry in the 'SubDevice' table shall be mapped to a child resource(s) which is mapped as a specialised &lt;flexContainer> following the rule in clause [6.2.7](#627-resource-mapping-for-subdevice-model).
 
-- Rule 1-10: Each &lt;flexContainer> associated to a Device model may have as child resource any &lt;flexContainer> associated to a ModuleClass model of the Metadata domain defined in clause 5.3.9.
+- Rule 1-10: Each &lt;flexContainer> associated to a Device model may have as child resource any &lt;flexContainer> associated to a ModuleClass model of the Metadata domain defined in clause [5.3.9](#539-metadata-domain).
 
   In other words, all devices implicitly have the following lines in their modules table:
 
@@ -5697,18 +5802,18 @@ When the AE exposes a controlling interface for a home domain device which is sp
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|&lt;any module in mdd domain> |&lt;any module in mdd domain> |0..N |See clauses 5.3.9. |
+|&lt;any module in mdd domain> |&lt;any module in mdd domain> |0..N |See clauses [5.3.9](#539-metadata-domain). |
 
 
 ### 6.2.3 Resource mapping for ModuleClass
 The ModuleClass models shall be mapped to the specializations of a &lt;flexContainer> resource. The following rules shall be applied: 
 
-When the Device or SubDevice models in clauses 5.4, 5.5, 5.8.2 or 5.8.10 are mapped to the &lt;flexContainer> resource, and if the device or sub-device supports the functionality associated with a ModuleClass in the model, a &lt;flexContainer> resource which is mapped from ModuleClass definitions shall be created as a child resource:
+When the Device or SubDevice models in clauses [5.4](#54-subdevice-models), [5.5](#55-device-models), [5.8.2](#582-flexnode) or [5.8.10](#5810-dmareanwkinfo)  are mapped to the &lt;flexContainer> resource, and if the device or sub-device supports the functionality associated with a ModuleClass in the model, a &lt;flexContainer> resource which is mapped from ModuleClass definitions shall be created as a child resource:
 
 
-- Rule 2-1: The *containerDefinition* attribute shall be set according to 6.4.3.
-- Rule 2-2: Each entry of 'Action', 'Property', and 'DataPoint' in ModuleClass definitions shall be mapped following the resource mapping rules described in clauses 6.2.4 - 6.2.7.
-- Rule 2-3: XSD file for each ModuleClass shall be named according to 6.5.3.
+- Rule 2-1: The *containerDefinition* attribute shall be set according to [6.4.3](#643-moduleclasses).
+- Rule 2-2: Each entry of 'Action', 'Property', and 'DataPoint' in ModuleClass definitions shall be mapped following the resource mapping rules described in clauses [6.2.4](#624-resource-mapping-for-action) - [6.2.7 ](#627-resource-mapping-for-subdevice-model).
+- Rule 2-3: XSD file for each ModuleClass shall be named according to [6.5.3](#653-xsd-definitions-for-moduleclass).
 - Rule 2-4: The *resourceName* attribute for each module class that appears as a child of a Device or SubDevice model shall be CREATED    with the value set to "Module Instance Name". If the module class is contained in a list (multiplicity 0..N or 1..N), its *resourceName* attribute shall be set to "Module Instance Name" appended with an underscore '_' and an incrementing index so that it is unique in the parent's children (e.g. "firmware_0", "firmware_1", etc.). The index shall not have leading 0's.
 - Rule 2-5: The specialized &lt;flexContainer> resource of the Module model may contain an optional [customAttribute] named *dataGenerationTime*. The value of *dataGenerationTime* contains the time when the data was generated by the device. The data type of this custom attribute is m2m:timestamp.
 
@@ -5717,51 +5822,53 @@ When the Device or SubDevice models in clauses 5.4, 5.5, 5.8.2 or 5.8.10 are map
 Actions defined as part of  a ModuleClass model shall be mapped to the specializations of a &lt;flexContainer> resource. The following rules shall be applied: 
 
 
-- Rule 3-1: The *containerDefinition* attribute shall be set according to 6.4.4.
+- Rule 3-1: The *containerDefinition* attribute shall be set according to [6.4.](#644-actions).
 - Rule 3-2: When the Action supports any 'Arguments', they are mapped to [customizedAttribute] with their variable names (short names are given in clause 6.3.4). When the Action supports a 'Return Type', it is mapped to a [customizedAttribute] named 'result' (short name 'resut'). The keyword 'result' is reserved and cannot be used as an Argument name.
-- Rule 3-3: XSD file for each Action shall be named according to 6.5.4.
+- Rule 3-3: XSD file for each Action shall be named according to [6.5.4 XSD definitions for Action](#654-xsd-definitions-for-action).
 - Rule 3-4: The Action shall be triggered:
-- by updating at least one of the Arguments custom attributes with any value, if the action has at least one argument, or
-- by updating the &lt;flexContainer> resource with empty content if it has no argument
+
+  - by updating at least one of the Arguments custom attributes with any value, if the action has at least one argument, or
+  - by updating the &lt;flexContainer> resource with empty content if it has no argument
+
 - Rule 3-5: The resourceName attribute for each Action model that appears as a child of a ModuleClass model shall be CREATED with the value set to "Action name".
 - Rule 3-6: If an action returns a value that is of a complex data type, i.e. not one of the standard scalar types, then this value shall be encoded as a JSON structure and returned serialized in an xs:string.
 
 ### 6.2.5 Resource mapping for Property
 
-When the Device model (in clause 5.5) or the ModuleClass model (in clause 5.3) is mapped to the &lt;flexContainer> resource, and if the device supports a Property, the following rules shall be applied:
+When the Device model (in clause [5.5](#55-device-models)) or the ModuleClass model (in clause [5.3](#53-moduleclasses)) is mapped to the &lt;flexContainer> resource, and if the device supports a Property, the following rules shall be applied:
 
 
 - Rule 4-1: Each entry of 'Property' table in ModuleClass model, shall be mapped to the [customAttribute] of &lt;flexContainer> resource which is mapped from associated ModuleClass model, with its Property name with prefix 'prop'.
-- Rule 4-2: If the &lt;node> resource targeted by the nodeLink attribute of a Device model does not have a [flexNode] child resource, then each 'Property' of the Device model is mapped to a specialized [objectAttribute] of a [deviceInfo] &lt;mgmtObj> resource child of this &lt;node>, otherwise it is mapped to a [customAttribute] of a [dmDeviceInfo] &lt;flexContainer> resource child of this [flexNode].
+- Rule 4-2: If the &lt;node> resource targeted by the nodeLink attribute of a Device model does not have a [flexNode] child resource, then each 'Property' of the Device model is mapped to a specialized [objectAttribute] of a [deviceInfo] &lt;mgmtObj> resource child of this &lt;node>, otherwise it is mapped to a [customAttribute] of a [[dmDeviceInfo](#584-dmdeviceinfo)] &lt;flexContainer> resource child of this [flexNode].
 - Rule 4-3: Each entry of 'Property' table in SubDevice model, shall be mapped to the [customAttribute] of &lt;flexContainer> resource which is mapped from associated SubDevice model, with its Property name with prefix 'prop'.
 
 ### 6.2.6 Resource mapping for DataPoint
 
-When the ModuleClass model (in clause 5.3) is mapped to the &lt;flexContainer> resouce, and if the ModuleClass supports a DataPoint, the following rules shall be applied:
+When the ModuleClass model (in clause [5.3](#53-moduleclasses)) is mapped to the &lt;flexContainer> resouce, and if the ModuleClass supports a DataPoint, the following rules shall be applied:
 
 
 - Rule 5-1: Each entry of DataPoint table in ModuleClass model, shall be mapped to [customAttribute] of &lt;flexContainer> resource which is mapped from associated ModuleClass model, with its DataPoint name.
 
 ### 6.2.7 Resource mapping for SubDevice model
 
-The SubDevice models (in clause 5.4 or 5.8.10) shall be mapped to the specializations of a &lt;flexContainer> resource. The following rules shall be applied: 
+The SubDevice models (in clause [5.4](#54-subdevice-models) or [5.8.10](#5810-dmareanwkinfo)) shall be mapped to the specializations of a &lt;flexContainer> resource. The following rules shall be applied: 
 
-When the SubDevice model in clause 5.4 or 5.8.10 is mapped to the &lt;flexContainer> resource, and if the device supports the functionality associated with a SubDevice in the model, a &lt;flexContainer> resource which is mapped from SubDevices definitions shall be created as a child resource.
+When the SubDevice model in clause [5.4](#54-subdevice-models) or [5.8.10](#5810-dmareanwkinfo) is mapped to the &lt;flexContainer> resource, and if the device supports the functionality associated with a SubDevice in the model, a &lt;flexContainer> resource which is mapped from SubDevices definitions shall be created as a child resource.
 
 
-- Rule 7-1: The containerDefinition attribute shall be set according to 6.4.5.
-- Rule 7-1a: Each entry in the 'Module' table shall be mapped to a child resource(s) which is mapped as a specialised &lt;flexContainer> following the rule in clause 6.2.3.
-- Rule 7-2: The XSD file for each SubDevice model shall be named according to clause 6.5.5.
+- Rule 7-1: The containerDefinition attribute shall be set according to [6.4.5](#645-subdevices).
+- Rule 7-1a: Each entry in the 'Module' table shall be mapped to a child resource(s) which is mapped as a specialised &lt;flexContainer> following the rule in clause [6.2.3](#623-resource-mapping-for-moduleclass).
+- Rule 7-2: The XSD file for each SubDevice model shall be named according to clause [6.5.5](#655-xsd-definitions-for-subdevices).
 - Rule 7-3: void
 - Rule 7-4: The resourceName attribute for each SubDevice that appears as a child of a Device or FlexNode model shall be created with the value set to "SubDevice Instance Name". If the SubDevice is contained in a list (multiplicity 0..N or 1..N), its resourceName attribute shall be set to "SubDevice Instance Name" appended with an underscore '_' and an incrementing index so that it is unique in the parent's children (e.g. "cuff_0", "cuff_1", etc.). The index shall not have leading 0's.
-- Rule 7-5: Each &lt;flexContainer> associated to a SubDevice model may have as child resource any &lt;flexContainer> associated to a ModuleClass model of the Metadata domain defined in clause 5.3.9.
+- Rule 7-5: Each &lt;flexContainer> associated to a SubDevice model may have as child resource any &lt;flexContainer> associated to a ModuleClass model of the Metadata domain defined in clause [5.3.9](#539-metadata-domain).
 - In other words, all subdevices implicitly have the following lines in their modules table:
 
 **Table 6.2.7-1: Modules of subDeviceXXX model**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
 |-|-|-|-|
-|&lt;any module in mdd domain> |&lt;any module in mdd domain> |0..N |See clauses 5.3.9. |
+|&lt;any module in mdd domain> |&lt;any module in mdd domain> |0..N |See clauses [5.3.9](#539-metadata-domain). |
 
 
 ## 6.3 Short names
@@ -5774,106 +5881,103 @@ The mapping between the full names and their shortened form is given in the clau
 
 
 ### 6.3.2 Resource types
-In protocol bindings resource type names for device models shall be translated into short names of Table 6.3.21.
+In protocol bindings resource type names for device models shall be translated into short names of Table 6.3.2-1.
 
 
 
-
-**Table 6.3.21: Specialization type short names (Device models)**
+**Table 6.3.2-1: Specialization type short names (Device models)**
 
 |Resource Type Name |Short Name |
 |-|-|
-|device3DPrinter |dTDPr |
-|deviceAirConditioner |deACr |
-|deviceAirHeater |deAHr |
-|deviceAirPurifier |deAPr |
-|deviceAirQualityMonitor |dAQMr |
-|deviceAudioReceiver |deARr |
-|deviceBloodPressureMonitor |dBPMr |
-|deviceCamera |devCa |
-|deviceClothesDryer |deCDr |
-|deviceClothesWasher |deCWr |
-|deviceClothesWasherDryer |dCWDr |
-|deviceCoffeeMachine |deCMe |
-|deviceCookerHood |deCHd |
-|deviceCooktop |devCp |
-|deviceDehumidifier |devDr |
-|deviceDishWasher |deDWr |
-|deviceDoor |devD0 |
-|deviceDoorLock |deDLk |
-|deviceElectricMotorcycle |deEMe |
-|deviceElectricVehicleCharger |dEVCr |
-|deviceFan |devFn |
-|deviceFoodProbe |deFPe |
-|deviceFreezer |devFr |
-|deviceGlucosemeter |devGr |
-|deviceHeartRateMonitor |dHRMr |
-|deviceHomeCCTV |dHCCT |
-|deviceHumidifier |devHr |
-|deviceJuicer |devJr |
-|deviceKettle |devKe |
-|deviceLight |devLt |
-|deviceMicrogeneration |devMn |
-|deviceMultiFunctionPrinter |dMFPr |
-|deviceOutdoorLamp |deOLp |
-|deviceOven |devOn |
-|devicePrinter |devPr |
-|devicePulseOximeter |dePOr |
-|deviceRefrigerator |devRr |
-|deviceRobotCleaner |deRCr |
-|deviceScanner |devSr |
-|deviceSecurityPanel |deSPl |
-|deviceSetTopBox |dSTBx |
-|deviceShoesWasher |deSWr |
-|deviceSmartElectricMeter |dSEMr |
-|deviceSmartPlug |deSPg |
-|deviceSteamCloset |deSCt |
-|deviceStorageBattery |deSBy |
-|deviceSwitch |devSh |
-|deviceTelevision |devTn |
-|deviceThermometer |devTr |
-|deviceThermostat |devTt |
-|deviceWaterHeater |deWHr |
-|deviceWaterValve |deWVe |
-|deviceWeightScaleAndBodyCompositionAnalyser |dWSAB |
-|deviceWindowShade |deWSe |
-|deviceBottleWarmer |deBWr |
-|deviceGarbageDisposal |deGDp |
-|deviceWaterPurifier |deWPr |
-|flexNode |fleNe |
-
-
-
-In protocol bindings resource type names for SubDevice model shall be translated into short names of Table 6.3.22.
-
-
-**Table 6.3.22: Specialization type short names (SubDevice models)**
+|[device3DPrinter](#5511-device3dprinter) |dTDPr |
+|[deviceAirConditioner](#5541-deviceairconditioner) |deACr |
+|[deviceAirHeater](#55433-deviceairheater) |deAHr |
+|[deviceAirPurifier](#5542-deviceairpurifier) |deAPr |
+|[deviceAirQualityMonitor](#5512-deviceairqualitymonitor) |dAQMr |
+|[deviceAudioReceiver](#5513-deviceaudioreceiver) |deARr |
+|[deviceBloodPressureMonitor](#5531-devicebloodpressuremonitor) |dBPMr |
+|[deviceCamera](#5514-devicecamera) |devCa |
+|[deviceClothesDryer](#5543-deviceclothesdryer) |deCDr |
+|[deviceClothesWasher](#5544-deviceclotheswasher) |deCWr |
+|[deviceClothesWasherDryer](#5545-deviceclotheswasherdryer) |dCWDr |
+|[deviceCoffeeMachine](#5546-devicecoffeemachine) |deCMe |
+|[deviceCookerHood](#5547-devicecookerhood) |deCHd |
+|[deviceCooktop](#5548-devicecooktop) |devCp |
+|[deviceDehumidifier](#5549-devicedehumidifier) |devDr |
+|[deviceDishWasher](#55411-devicedishwasher) |deDWr |
+|[deviceDoor](#5515-devicedoor) |devD0 |
+|[deviceDoorLock](#5516-devicedoorlock) |deDLk |
+|[deviceElectricMotorcycle](#5562-deviceelectricmotorcycle) |deEMe |
+|[deviceElectricVehicleCharger](#5561-deviceelectricvehiclecharger) |dEVCr |
+|[deviceFan](#55412-devicefan) |devFn |
+|[deviceFoodProbe](#55413-devicefoodprobe) |deFPe |
+|[deviceFreezer](#55414-devicefreezer) |devFr |
+|[deviceGlucosemeter](#5532-deviceglucosemeter) |devGr |
+|[deviceHeartRateMonitor](#5533-deviceheartratemonitor) |dHRMr |
+|[deviceHomeCCTV](#55415-devicehomecctv) |dHCCT |
+|[deviceHumidifier](#55416-devicehumidifier) |devHr |
+|[deviceJuicer](#55434-devicejuicer) |devJr |
+|[deviceKettle](#55417-devicekettle) |devKe |
+|[deviceLight](#5517-devicelight) |devLt |
+|[deviceMicrogeneration](#55418-devicemicrogeneration) |devMn |
+|[deviceMultiFunctionPrinter](#5518-devicemultifunctionprinter) |dMFPr |
+|[deviceOutdoorLamp](#5521-deviceoutdoorlamp) |deOLp |
+|[deviceOven](#55419-deviceoven) |devOn |
+|[devicePrinter](#5519-deviceprinter) |devPr |
+|[devicePulseOximeter](#5534-devicepulseoximeter) |dePOr |
+|[deviceRefrigerator](#55420-devicerefrigerator) |devRr |
+|[deviceRobotCleaner](#55422-devicerobotcleaner) |deRCr |
+|[deviceScanner](#55110-devicescanner) |devSr |
+|[deviceSecurityPanel](#55423-devicesecuritypanel) |deSPl |
+|[deviceSetTopBox](#55424-devicesettopbox) |dSTBx |
+|[deviceShoesWasher](#55435-deviceshoeswasher) |deSWr |
+|[deviceSmartElectricMeter](#5523-devicesmartelectricmeter) |dSEMr |
+|[deviceSmartPlug](#55111-devicesmartplug) |deSPg |
+|[deviceSteamCloset](#55425-devicesteamcloset) |deSCt |
+|[deviceStorageBattery](#55426-devicestoragebattery) |deSBy |
+|[deviceSwitch](#55112-deviceswitch) |devSh |
+|[deviceTelevision](#55427-devicetelevision) |devTn |
+|[deviceThermometer](#55113-devicethermometer) |devTr |
+|[deviceThermostat](#55114-devicethermostat) |devTt |
+|[deviceWaterHeater](#55428-devicewaterheater) |deWHr |
+|[deviceWaterValve](#55115-devicewatervalve) |deWVe |
+|[deviceWeightScaleAndBodyCompositionAnalyser](#5535-deviceweightscaleandbodycompositionanalyser) |dWSAB |
+|[deviceWindowShade](#55429-devicewindowshade) |deWSe |
+|[deviceBottleWarmer](#55430-devicebottlewarmer) |deBWr |
+|[deviceGarbageDisposal](#55431-devicegarbagedisposal) |deGDp |
+|[deviceWaterPurifier](#55432-devicewaterpurifier) |deWPr |
+|[flexNode](#582-flexnode) |fleNe |
+
+
+
+In protocol bindings resource type names for SubDevice model shall be translated into short names of Table 6.3.2-2.
+
+**Table 6.3.2-2: Specialization type short names (SubDevice models)**
 
 |Resource Type Name |Short Name |
 |-|-|
-|cuff |cuff |
-|powerOutlet |powOt |
-|subDeviceCuff |suDCf |
-|subDevicePowerOutlet |sDPOt |
-|dmAreaNwkInfo |dANIo |
-
-NOTE: see section 6.2.7, rule 7-4
+|[cuff](#5431-subdevicecuff) |cuff |
+|[powerOutlet](#5412-subdevicepoweroutlet) |powOt |
+|[subDeviceCuff](#5431-subdevicecuff) |suDCf |
+|[subDeviceCuff](#5431-subdevicecuff) |sDPOt |
+|[dmAreaNwkInfo](#5810-dmareanwkinfo) |dANIo |
 
-In protocol bindings resource type names for module classes shall be translated into short names of Table 6.3.23.
+NOTE: see section [6.2.7](#627-resource-mapping-for-subdevice-model), rule 7-4
 
+In protocol bindings resource type names for module classes shall be translated into short names of Table 6.3.2-3.
 
-**Table 6.3.23: Specialization type short names (ModuleClasses and Module Instances)**
+**Table 6.3.2-3: Specialization type short names (ModuleClasses and Module Instances)**
 
 |Resource Type Name |Short Name |
 |-|-|
 |[threeDprinter](#5311-threedprinter) |thDPr |
 |[acousticSensor](#5312-acousticsensor) |acoSr |
-|airCleanOperationMode |aCOM0 |
+|[airCleanOperationMode](#53157-operationmode) |aCOM0 |
 |[airConJobMode](#5313-airconjobmode) |aCJMe |
-|airConOperationMode |aCOMe |
+|[airConOperationMode](#53157-operationmode) |aCOMe |
 |[airFlow](#5314-airflow) |airFw |
 |[airPurifierJobMode](#5315-airpurifierjobmode) |aPJMe |
-|airPurifierOperationMode |aPOMe |
+| [airPurifierOperationMode](#53157-operationmode) |aPOMe |
 |[airQualitySensor](#5316-airqualitysensor) |aiQSr |
 |[alarmSpeaker](#5317-alarmspeaker) |alaSr |
 |[audioVolume](#5318-audiovolume) |audVe |
@@ -5884,50 +5988,50 @@ In protocol bindings resource type names for module classes shall be translated
 |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |bEIAs |
 |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |boCAr |
 |[boiler](#53115-boiler) |boilr |
-|boilingSwitch |boiSh |
+|[boilingSwitch](#53112-binaryswitch) |boiSh |
 |[brewing](#53116-brewing) |brewg |
-|brewingSwitch |breSh |
+|[brewingSwitch](#53112-binaryswitch) |breSh |
 |[brightness](#53117-brightness) |brigs |
-|channel |chanl |
+|channel <mark>Editor's note: undefined</mark> |chanl |
 |[clock](#53118-clock) |clock |
-|clothesDryerJobMode |cDJMe |
-|clothesDryerOperationMode |cDOMe |
+|[clothesDryerJobMode](#53119-clothesdryerjobmode) |cDJMe |
+|[clothesDryerOperationMode](#53157-operationmode) |cDOMe |
 |[clothesWasherDryerJobMode](#53121-clotheswasherdryerjobmode) |cWDJM |
-|clothesWasherDryerOperationMode |cWDOM |
+|[clothesWasherDryerOperationMode](#53157-operationmode) |cWDOM |
 |[clothesWasherJobMode](#53120-clotheswasherjobmode) |cWJMe |
 |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |cWJMO |
-|clothesWasherOperationMode |cWOMe |
+|[clothesWasherOperationMode](#53157-operationmode) |cWOMe |
 |[colour](#53123-colour) |color |
 |[colourSaturation](#53124-coloursaturation) |colSn |
-|controlPanelLock |coPLk |
+|[controlPanelLock](#53152-lock) |coPLk |
 |[cookerHoodJobMode](#53126-cookerhoodjobmode) |cHJMe |
 |[credentials](#53127-credentials) |creds |
-|customTemperature |cusTe |
+|[customTemperature](#53187-temperature) |cusTe |
 |dataGenerationTime |dgt |
 |[dehumidifierJobMode](#53128-dehumidifierjobmode) |deJMe |
-|dehumidifierOperationMode |deOMe |
+|[dehumidifierOperationMode](#53157-operationmode) |deOMe |
 |[dishWasherJobMode](#53129-dishwasherjobmode) |dWJMe |
-|dmAgent |dmAgt |
-|dmAreaNwkDeviceInfo |dANDo |
-|dmCapability |dmCay |
-|dmDataModelIO |dDMIO |
-|dmDeviceInfo |dmDIo |
-|dmEventLog |dmELg |
-|dmFirmware |dmFie |
-|dmPackage |dmPae |
-|dmSoftware |dmSoe |
-|dmStorage |dmSte |
-|doorLock |dooLk |
+|[dmAgent](#583-dmagent) |dmAgt |
+|[dmAreaNwkDeviceInfo](#5811-dmareanwkdeviceinfo) |dANDo |
+|[dmCapability](#5812-dmcapability) |dmCay |
+|[dmDataModelIO](#585-dmdatamodelio) |dDMIO |
+|[dmDeviceInfo](#584-dmdeviceinfo) |dmDIo |
+|[dmEventLog](#588-dmeventlog) |dmELg |
+|[dmFirmware](#586-dmfirmware) |dmFie |
+|[dmPackage](#589-dmpackage) |dmPae |
+|[dmSoftware](#587-dmsoftware) |dmSoe |
+|[dmStorage](#5813-dmstorage) |dmSte |
+|[doorLock](#53152-lock) |dooLk |
 |[doorStatus](#53130-doorstatus) |dooSs |
 |[electricVehicleConnector](#53131-electricvehicleconnector) |elVCr |
 |[energyConsumption](#53132-energyconsumption) |eneCn |
 |[energyGeneration](#53133-energygeneration) |eneGn |
 |[faultDetection](#53134-faultdetection) |fauDn |
-|features |feats |
+|[features](#5391-features) |feats |
 |[filterInfo](#53135-filterinfo) |filIo |
 |[foaming](#53136-foaming) |foamg |
-|fridgeTemperature |friTe |
-|frozenTemperature |froTe |
+|[fridgeTemperature](#53187-temperature) |friTe |
+|[frozenTemperature](#53187-temperature) |froTe |
 |[geoLocation](#53141-geolocation) |geoLn |
 |[glucometer](#53142-glucometer) |glucr |
 |[grinder](#53143-grinder) |grinr |
@@ -5939,139 +6043,136 @@ In protocol bindings resource type names for module classes shall be translated
 |[keypad](#53149-keypad) |keypd |
 |[liquidLevel](#53150-liquidlevel) |liqLl |
 |[liquidRemaining](#53151-liquidremaining) |liqRg |
-|location |locan |
-|localization |loca0 |
+|[location](#5392-location) |locan |
+|[localization](#5393-localization) |loca0 |
 |[lock](#53152-lock) |lock |
-|mediaInput |medIt |
-|mediaOutput |medOt |
-|mediaSelect |medSt |
-|milkFoaming |milFg |
-|milkQuantity |milQy |
-|milkStatus |milSs |
-|motionSensor |motSr |
-|numberValue |numVe |
-|openLevel |opeLl |
-|operationMode |opeMe |
-|origin |orign |
-|overcurrentSensor |oveSr |
-|oximeter |oximr |
-|ozoneMeter |ozoMr |
-|phoneCall |phoCl |
-|playerControl |plaCl |
-|powerSave |powS0 |
-|printerRunState |prRSe |
-|printQueue |priQe |
-|pulsemeter |pulsr |
-|pushButton |pusBn |
-|recorder |recor |
-|refrigeration |refrn |
-|relativeHumidity |relHy |
-|remoteControlEnable |reCEe |
-|robotCleanerJobMode |rCJMe |
-|robotCleanerOperationMode |rCOMe |
-|runState |runSe |
-|scannerRunState |scRSe |
-|securityMode |secMe |
-|sessionDescription |sesDn |
-|signalStrength |sigSh |
-|sleepTimer |sleTr |
-|smokeSensor |smoSr |
-|sphygmomanometer |sphyr |
-|spinLevel |spiLl |
-|steamClosetJobMode |sCJMe |
-|steamClosetOperationMode |sCOMe |
-|televisionChannel |telCl |
-|temperature |tempe |
-|temperatureAlarm |temAm |
-|textMessage |texMe |
-|timer |timer |
-|turbo |turbo |
-|uvSensor |uveSr |
-|waterFilterInfo |waFIo |
-|waterFlow |watFw |
-|waterSensor |watSr |
-|waterStatus |watSs |
-|weight |weigt |
-
-
-
-In protocol bindings resource type names for actions shall be translated into short names of Table 6.3.24.
-
-
-**Table 6.3.24: Specialization type short names (Actions)**
+|[mediaInput](#53153-mediaselect) |medIt |
+|[mediaOutput](#53153-mediaselect) |medOt |
+|[mediaSelect](#53153-mediaselect) |medSt |
+|[milkFoaming](#53136-foaming) |milFg |
+|[milkQuantity](#53150-liquidlevel) |milQy |
+|[milkStatus](#53151-liquidremaining) |milSs |
+|[motionSensor](#53154-motionsensor) |motSr |
+|[numberValue](#53155-numbervalue) |numVe |
+|[openLevel](#53156-openlevel) |opeLl |
+|[operationMode](#53157-operationmode) |opeMe |
+|[origin](#5394-origin) |orign |
+|[overcurrentSensor](#53158-overcurrentsensor) |oveSr |
+|[oximeter](#53159-oximeter) |oximr |
+|[ozoneMeter](#53160-ozonemeter) |ozoMr |
+|[phoneCall](#53164-phonecall) |phoCl |
+|[playerControl](#53165-playercontrol) |plaCl |
+|[powerSave](#53166-powersave) |powS0 |
+|[printerRunState](#53175-runstate) |prRSe |
+|[printQueue](#53167-printqueue) |priQe |
+|[pulsemeter](#53168-pulsemeter) |pulsr |
+|[pushButton](#53169-pushbutton) |pusBn |
+|[recorder](#53170-recorder) |recor |
+|[refrigeration](#53171-refrigeration) |refrn |
+|[relativeHumidity](#53172-relativehumidity) |relHy |
+|[remoteControlEnable](#53173-remotecontrolenable) |reCEe |
+|[robotCleanerJobMode](#53174-robotcleanerjobmode) |rCJMe |
+|[robotCleanerOperationMode](#53157-operationmode) |rCOMe |
+|[runState](#53175-runstate) |runSe |
+|[scannerRunState](#53175-runstate) |scRSe |
+|[securityMode](#53176-securitymode) |secMe |
+|[sessionDescription](#53177-sessiondescription) |sesDn |
+|[signalStrength](#53178-signalstrength) |sigSh |
+|[sleepTimer](#53190-timer) |sleTr |
+|[smokeSensor](#53182-smokesensor) |smoSr |
+|[sphygmomanometer](#53183-sphygmomanometer) |sphyr |
+|[spinLevel](#53184-spinlevel) |spiLl |
+|[steamClosetJobMode](#53185-steamclosetjobmode) |sCJMe |
+|[steamClosetOperationMode](#53157-operationmode) |sCOMe |
+|[televisionChannel](#53186-televisionchannel) |telCl |
+|[temperature](#53187-temperature) |tempe |
+|[temperatureAlarm](#53188-temperaturealarm) |temAm |
+|[textMessage](#53189-textmessage) |texMe |
+|[timer](#53190-timer) |timer |
+|[turbo](#53191-turbo) |turbo |
+|[uvSensor](#53192-uvsensor) |uveSr |
+|[waterFilterInfo](#53135-filterinfo) |waFIo |
+|[waterFlow](#53193-waterflow) |watFw |
+|[waterSensor](#53197-watersensor) |watSr |
+|[waterStatus](#53151-liquidremaining) |watSs |
+|[weight](#53199-weight) |weigt |
+
+
+
+In protocol bindings resource type names for actions shall be translated into short names of Table 6.3.2-4.
+
+**Table 6.3.2-4: Specialization type short names (Actions)**
 
 |Resource Type Name |Short Name |
 |-|-|
-|activate |actie |
-|activateClockTimer |acCTr |
-|answer |answr |
-|call |call |
-|close |close |
-|deactivate |deace |
-|deactivateClockTimer |deCTr |
-|decrementNumberValue |deNVe |
-|deployPackage |depPe |
-|disable |disae |
-|downChannel |dowCl |
-|downVolume |dowVe |
-|enable |enabe |
-|format |formt |
-|hangup |hangp |
-|incrementNumberValue |inNVe |
-|install |instl |
-|nextTrack |nexTk |
-|open |open |
-|previousTrack |preTk |
-|reboot |rebot |
-|readIO |reaIO |
-|resetNumberValue |reNVe |
-|resetTextMessage |reTMe |
-|start3Dprint |staDt |
-|stop3Dprint |stoDt |
-|toggle |togge |
-|uninstall |uninl |
-|unmount |unmot |
-|upChannel |uphCl |
-|updateFirmware |updFe |
-|upVolume |upoVe |
-|writeIO |wriIO |
+|[activate](#587-dmsoftware) |actie |
+|[activateClockTimer](#53190-timer) |acCTr |
+|[answer](#53164-phonecall) |answr |
+|[call](#53164-phonecall) |call |
+|[close](#53156-openlevel) |close |
+|[deactivate](#587-dmsoftware) |deace |
+|[deactivateClockTimer](#53190-timer) |deCTr |
+|[decrementNumberValue](#53155-numbervalue) |deNVe |
+|[deployPackage](#583-dmagent) |depPe |
+|[disable](#5812-dmcapability) |disae |
+|[downChannel](#53186-televisionchannel) |dowCl |
+|[downVolume](#5318-audiovolume) |dowVe |
+|[enable](#5812-dmcapability) |enabe |
+|[format](#5813-dmstorage) |formt |
+|[hangup](#53164-phonecall) |hangp |
+|[incrementNumberValue](#53155-numbervalue) |inNVe |
+|[install](#589-dmpackage) |instl |
+|[nextTrack](#53165-playercontrol) |nexTk |
+|[open](#53156-openlevel) |open |
+|[previousTrack](#53165-playercontrol) |preTk |
+|[reboot](#583-dmagent) |rebot |
+|[readIO](#585-dmdatamodelio) |reaIO |
+|[resetNumberValue](#53155-numbervalue) |reNVe |
+|[resetTextMessage](#53189-textmessage) |reTMe |
+|[start3Dprint](#5311-threedprinter) |staDt |
+|[stop3Dprint](#5311-threedprinter) |stoDt |
+|[toggle](#586-dmfirmware) |togge |
+|[uninstall](#589-dmpackage) |uninl |
+|[unmount](#5813-dmstorage) |unmot |
+|[upChannel](#53186-televisionchannel) |uphCl |
+|[updateFirmware](#586-dmfirmware) |updFe |
+|[upVolume](#5318-audiovolume) |upoVe |
+|[writeIO](#585-dmdatamodelio) |wriIO |
 
 
 
 
 ### 6.3.3 Resource attributes for properties and data points
-In protocol bindings resource attributes names for properties of module classes shall be translated into short names of Table 6.3.31.
+In protocol bindings resource attributes names for properties of module classes shall be translated into short names of Table 6.3.3-1.
 
-
-**Table 6.3.31: Resource attribute short names (ModuleClass properties)**
+**Table 6.3.3-1: Resource attribute short names (ModuleClass properties)**
 
 |Attribute Name |Occurs in |Short Name |
 |-|-|-|
-|None | | |
-| | | |
-| | | |
-| | | |
-| | | |
+|chargingCapacity | [electricVehicleConnector](#53131-electricvehicleconnector) | chaCy |
+| dischargingCapacity | [5.3.1.31 electricVehicleConnector](#53131-electricvehicleconnector) | disCy |
+| electricEnergy | [battery](#53110-battery) | eleEy |
+| material | [battery](#53110-battery) | matel |
+| voltage | [battery](#53110-battery) | volte |
 
 
 
-In protocol bindings resource attributes names for data points of module classes shall be translated into short names of Table 6.3.32.
+In protocol bindings resource attributes names for data points of module classes shall be translated into short names of Table 6.3.3-2.
 
-
-**Table 6.3.32: Resource attribute short names (ModuleClass data points)**
+**Table 6.3.3-2: Resource attribute short names (ModuleClass data points)**
 
 |Attribute Name |Occurs in |Short Name |
 |-|-|-|
 |absoluteEnergyConsumption |[energyConsumption](#53132-energyconsumption) |abECn |
-|absoluteStartTime |timer |abSTe |
-|absoluteStopTime |timer |abST0 |
+|absoluteStartTime |[timer](#53190-timer) |abSTe |
+|absoluteStopTime |[timer](#53190-timer) |abST0 |
 |acousticStatus |[acousticSensor](#5312-acousticsensor) |acoSs |
 |adfStates |[autoDocumentFeeder](#5319-autodocumentfeeder) |adfSs |
-|alarm |motionSensor, smokeSensor, temperatureAlarm, waterSensor |alarm |
+|alarm |[motionSensor](#53154-motionsensor), [smokeSensor](#53182-smokesensor), [temperatureAlarm](#53188-temperaturealarm), [waterSensor](#53197-watersensor) |alarm |
 |alarmStatus |[alarmSpeaker](#5317-alarmspeaker) |alaSs |
-|altitude |[5.3.1.41 geoLocation](#53141-geolocation) |altie |
+|altitude |[geoLocation](#53141-geolocation) |altie |
 |automode |[airFlow](#5314-airflow) |autoe |
-|availableChannels |televisionChannel |avaCs |
+|availableChannels |[televisionChannel](#53186-televisionchannel) |avaCs |
 |basalMetabolism |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |basMm |
 |bath |[hotWaterSupply](#53146-hotwatersupply) |bath |
 |batteryThreshold |[battery](#53110-battery) |batTd |
@@ -6080,12 +6181,12 @@ In protocol bindings resource attributes names for data points of module classes
 |bodyLength |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |bodLh |
 |bone |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |bone |
 |brightness |[brightness](#53117-brightness) |brigs |
-|callerID |phoneCall |calID |
-|callState |phoneCall |calSe |
+|callerID |[phoneCall](#53164-phonecall) |calID |
+|callState |[phoneCall](#53164-phonecall) |calSe |
 |capacity |[battery](#53110-battery) |capay |
 |ch2o |[airQualitySensor](#5316-airqualitysensor) |ch2o |
-|channelId |televisionChannel |chaId |
-|channelName |televisionChannel |chaNe |
+|channelId |[televisionChannel](#53186-televisionchannel) |chaId |
+|channelName |[televisionChannel](#53186-televisionchannel) |chaNe |
 |charging |[battery](#53110-battery) |charg |
 |chargingCapacity |[electricVehicleConnector](#53131-electricvehicleconnector) |chaCy |
 |co |[airQualitySensor](#5316-airqualitysensor) |co |
@@ -6094,7 +6195,7 @@ In protocol bindings resource attributes names for data points of module classes
 |code |[faultDetection](#53134-faultdetection), [filterInfo](#53135-filterinfo) |code |
 |coldWash |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |colWh |
 |colourSaturation |[colourSaturation](#53124-coloursaturation) |colSn |
-|component |dmFirmware |compt |
+|component |[dmFirmware](#586-dmfirmware) |compt |
 |concentration |[glucometer](#53142-glucometer) |concn |
 |contextCarbohydratesAmount |[glucometer](#53142-glucometer) |coCAt |
 |contextCarbohydratesSource |[glucometer](#53142-glucometer) |coCSe |
@@ -6104,52 +6205,52 @@ In protocol bindings resource attributes names for data points of module classes
 |contextMeal |[glucometer](#53142-glucometer) |conMl |
 |contextMedication |[glucometer](#53142-glucometer) |conMn |
 |contextTester |[glucometer](#53142-glucometer) |conTr |
-|country |dmDeviceInfo |couny |
-|cpuUsage |dmAgent |cpuUe |
+|country |[dmDeviceInfo](#584-dmdeviceinfo) |couny |
+|cpuUsage |[dmAgent](#583-dmagent) |cpuUe |
 |cupsNumber |[brewing](#53116-brewing) |cupNr |
 |current |[energyConsumption](#53132-energyconsumption) |currt |
 |currentAdfState |[autoDocumentFeeder](#5319-autodocumentfeeder) |cuASe |
 |currentDate |[clock](#53118-clock) |curDe |
-|currentJobMode |[airConJobMode](#5313-airconjobmode), [airPurifierJobMode](#5315-airpurifierjobmode), clothesDryerJobMode, [clothesWasherDryerJobMode](#53121-clotheswasherdryerjobmode), [clothesWasherJobMode](#53120-clotheswasherjobmode), [cookerHoodJobMode](#53126-cookerhoodjobmode), [dehumidifierJobMode](#53128-dehumidifierjobmode), [dishWasherJobMode](#53129-dishwasherjobmode), robotCleanerJobMode, steamClosetJobMode |cuJMe |
-|currentJobModeName |[airConJobMode](#5313-airconjobmode), [airPurifierJobMode](#5315-airpurifierjobmode), clothesDryerJobMode, [clothesWasherDryerJobMode](#53121-clotheswasherdryerjobmode), [clothesWasherJobMode](#53120-clotheswasherjobmode), [cookerHoodJobMode](#53126-cookerhoodjobmode), [dehumidifierJobMode](#53128-dehumidifierjobmode), [dishWasherJobMode](#53129-dishwasherjobmode), robotCleanerJobMode, steamClosetJobMode |cJMNe |
-|currentJobState |runState |cuJSe |
-|currentMachineState |runState |cuMSe |
-|currentPlayerMode |playerControl |cuPMe |
-|currentPlayerModeName |playerControl |cPMNe |
-|currentSecurityMode |securityMode |cuSMe |
-|currentTemperature |temperature |curT0 |
+|currentJobMode |[airConJobMode](#5313-airconjobmode), [airPurifierJobMode](#5315-airpurifierjobmode), [clothesDryerJobMode](#53119-clothesdryerjobmode), [clothesWasherDryerJobMode](#53121-clotheswasherdryerjobmode), [clothesWasherJobMode](#53120-clotheswasherjobmode), [cookerHoodJobMode](#53126-cookerhoodjobmode), [dehumidifierJobMode](#53128-dehumidifierjobmode), [dishWasherJobMode](#53129-dishwasherjobmode), [robotCleanerJobMode](#53174-robotcleanerjobmode), [steamClosetJobMode](#53185-steamclosetjobmode) |cuJMe |
+|currentJobModeName |[airConJobMode](#5313-airconjobmode), [airPurifierJobMode](#5315-airpurifierjobmode), [clothesDryerJobMode](#53119-clothesdryerjobmode), [clothesWasherDryerJobMode](#53121-clotheswasherdryerjobmode), [clothesWasherJobMode](#53120-clotheswasherjobmode), [cookerHoodJobMode](#53126-cookerhoodjobmode), [dehumidifierJobMode](#53128-dehumidifierjobmode), [dishWasherJobMode](#53129-dishwasherjobmode), [robotCleanerJobMode](#53174-robotcleanerjobmode), [steamClosetJobMode](#53185-steamclosetjobmode) |cJMNe |
+|currentJobState |[runState](#53175-runstate) |cuJSe |
+|currentMachineState |[runState](#53175-runstate) |cuMSe |
+|currentPlayerMode |[playerControl](#53165-playercontrol) |cuPMe |
+|currentPlayerModeName |[playerControl](#53165-playercontrol) |cPMNe |
+|currentSecurityMode |[securityMode](#53176-securitymode) |cuSMe |
+|currentTemperature |[temperature](#53187-temperature) |curT0 |
 |currentTime |[clock](#53118-clock) |curTe |
 |currentTimeZone |[clock](#53118-clock) |cuTZe |
-|currentValue |smokeSensor |crv |
-|data		 |dmEventLog |data |
-|dataModelType |dmDataModelIO |daMTe |
-|dataSourceID |origin |daSID |
-|dataType |origin |datTe |
-|defaultValue |numberValue, textMessage |defVe |
-|defrost |refrigeration |defrt |
-|description |[faultDetection](#53134-faultdetection), dmDeviceInfo, localization |dc |
-|desiredHumidity |relativeHumidity |desHy |
-|detectedTime |overcurrentSensor, smokeSensor |detTe |
-|diastolicPressure |sphygmomanometer |diaPe |
+|currentValue |[smokeSensor](#53182-smokesensor) |crv |
+|data		 |[dmEventLog](#588-dmeventlog) |data |
+|dataModelType |[dmDataModelIO](#585-dmdatamodelio) |daMTe |
+|dataSourceID |[origin](#5394-origin) |daSID |
+|dataType |[origin](#5394-origin) |datTe |
+|defaultValue |[numberValue](#53155-numbervalue), [textMessage](#53189-textmessage) |defVe |
+|defrost |[refrigeration](#53171-refrigeration) |defrt |
+|description |[faultDetection](#53134-faultdetection), [dmDeviceInfo](#584-dmdeviceinfo), [localization](#5393-localization) |dc |
+|desiredHumidity |[relativeHumidity](#53172-relativehumidity) |desHy |
+|detectedTime |[overcurrentSensor](#53158-overcurrentsensor), [smokeSensor](#53182-smokesensor) |detTe |
+|diastolicPressure |[sphygmomanometer](#53183-sphygmomanometer) |diaPe |
 |discharging |[battery](#53110-battery) |discg |
 |dischargingCapacity |[electricVehicleConnector](#53131-electricvehicleconnector) |disCy |
 |doorState |[doorStatus](#53130-doorstatus) |dooSe |
-|duration |overcurrentSensor, recorder |dur |
+|duration |[overcurrentSensor](#53158-overcurrentsensor), [recorder](#53170-recorder) |dur |
 |electricEnergy |[battery](#53110-battery) |eleEy |
-|enabled |dmEventLog |enabd |
-|energy |pulsemeter |enery |
-|estimatedTimeToEnd |timer |eTTEd |
+|enabled |[dmEventLog](#588-dmeventlog) |enabd |
+|energy |[pulsemeter](#53168-pulsemeter) |enery |
+|estimatedTimeToEnd |[timer](#53190-timer) |eTTEd |
 |extraRinse |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |extRe |
 |fat |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |fat |
 |fatFreeMass |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |faFMs |
 |filterLifetime |[filterInfo](#53135-filterinfo) |filLe |
 |foamingStrength |[foaming](#53136-foaming) |foaSh |
 |frequency |[energyConsumption](#53132-energyconsumption) |freqy |
-|friendlyName |dmDeviceInfo |friNe |
-|friendlyLocation |location, localization |friLn |
-|fwVersion |dmDeviceInfo	 |fweVn |
+|friendlyName |[dmDeviceInfo](#584-dmdeviceinfo) |friNe |
+|friendlyLocation |[location](#5392-location), [localization](#5393-localization) |friLn |
+|fwVersion |[dmDeviceInfo](#584-dmdeviceinfo)	 |fweVn |
 |generationSource |[energyGeneration](#53133-energygeneration) |genSe |
-|geoJSON |location |geoJN |
+|geoJSON |[location](#5392-location) |geoJN |
 |grainsRemaining |[grinder](#53143-grinder) |graRg |
 |green |[colour](#53123-colour) |green |
 |hash |[binaryObject](#53111-binaryobject) |hash |
@@ -6160,14 +6261,14 @@ In protocol bindings resource attributes names for data points of module classes
 |height |[height](#53145-height) |heigt |
 |horizontalAccuracy |[geoLocation](#53141-geolocation) |horAy |
 |horizontalDirection |[airFlow](#5314-airflow) |horDn |
-|hwVersion |dmDeviceInfo	 |hweVn |
+|hwVersion |[dmDeviceInfo](#584-dmdeviceinfo)|hweVn |
 |impactDirectionHorizontal |[impactSensor](#53147-impactsensor) |imDHl |
 |impactDirectionVertical |[impactSensor](#53147-impactsensor) |imDVl |
 |impactLevel |[impactSensor](#53147-impactsensor) |impLl |
 |impactStatus |[impactSensor](#53147-impactsensor) |impSs |
 |impedance |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |impee |
-|jobModes |[airConJobMode](#5313-airconjobmode), [airPurifierJobMode](#5315-airpurifierjobmode), [clothesWasherDryerJobMode](#53121-clotheswasherdryerjobmode), [clothesWasherJobMode](#53120-clotheswasherjobmode), [cookerHoodJobMode](#53126-cookerhoodjobmode), [dehumidifierJobMode](#53128-dehumidifierjobmode), [dishWasherJobMode](#53129-dishwasherjobmode), robotCleanerJobMode steamClosetJobMode,  |jobMs |
-|jobStates |runState |jobSs |
+|jobModes |[airConJobMode](#5313-airconjobmode), [airPurifierJobMode](#5315-airpurifierjobmode), [clothesWasherDryerJobMode](#53121-clotheswasherdryerjobmode), [clothesWasherJobMode](#53120-clotheswasherjobmode), [cookerHoodJobMode](#53126-cookerhoodjobmode), [dehumidifierJobMode](#53128-dehumidifierjobmode), [dishWasherJobMode](#53129-dishwasherjobmode), [robotCleanerJobMode](#53174-robotcleanerjobmode) [steamClosetJobMode](#53185-steamclosetjobmode),  |jobMs |
+|jobStates |[runState](#53175-runstate) |jobSs |
 |kcal |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |kcal |
 |keyNumber |[keypad](#53149-keypad) |keyNr |
 |latitude |[geoLocation](#53141-geolocation) |latie |
@@ -6175,163 +6276,163 @@ In protocol bindings resource attributes names for data points of module classes
 |light |[alarmSpeaker](#5317-alarmspeaker) |light |
 |liquidLevel |[liquidLevel](#53150-liquidlevel) |liqLl |
 |liquidRemaining |[liquidRemaining](#53151-liquidremaining) |liqRg |
-|locale |location |locae |
+|locale |[location](#5392-location) |locae |
 |lock |[lock](#53152-lock) |lock |
 |loginName |[credentials](#53127-credentials) |logNe |
 |longitude |[geoLocation](#53141-geolocation) |longe |
 |loudness |[acousticSensor](#5312-acousticsensor) |louds |
 |lowBattery |[battery](#53110-battery) |lowBy |
-|lqi |signalStrength |lqi |
-|machineStates |runState |macSs |
-|manufacturer |dmDeviceInfo |manur |
-|manufacturerDetailsLink |dmDeviceInfo |maDLk |
-|manufacturingDate |dmDeviceInfo |manDe |
+|lqi |[signalStrength](#53178-signalstrength) |lqi |
+|machineStates |[runState](#53175-runstate) |macSs |
+|manufacturer |[dmDeviceInfo](#584-dmdeviceinfo) |manur |
+|manufacturerDetailsLink |[dmDeviceInfo](#584-dmdeviceinfo) |maDLk |
+|manufacturingDate |[dmDeviceInfo](#584-dmdeviceinfo) |manDe |
 |material |[battery](#53110-battery) |matel |
 |maxHeatingLevel |[heightheatingZone](#53144-heatingzone) |maHLl |
-|maxLength |textMessage |maxLh |
-|maxLevel |openLevel |maxLl |
+|maxLength |[textMessage](#53189-textmessage) |maxLh |
+|maxLevel |[openLevel](#53156-openlevel) |maxLl |
 |maxSpeed |[airFlow](#5314-airflow) |maxSd |
-|maxValue |[audioVolume](#5318-audiovolume), numberValue, ozoneMeter, temperature |maxVe |
-|meanPressure |sphygmomanometer |meaPe |
+|maxValue |[audioVolume](#5318-audiovolume), [numberValue](#53155-numbervalue), [ozoneMeter](#53160-ozonemeter), [temperature](#53187-temperature) |maxVe |
+|meanPressure |[sphygmomanometer](#53183-sphygmomanometer) |meaPe |
 |measuringScope |[energyConsumption](#53132-energyconsumption) |meaSe |
-|mediaID |mediaSelect |medID |
-|mediaName |mediaSelect |medNe |
-|mediaType |mediaSelect |medTe |
+|mediaID |[mediaSelect](#53153-mediaselect) |medID |
+|mediaName |[mediaSelect](#53153-mediaselect) |medNe |
+|mediaType |[mediaSelect](#53153-mediaselect) |medTe |
 |memorySize |[threeDprinter](#5311-threedprinter) |memSe |
-|messageEncoding |textMessage |mesEg |
-|metadata |features |metaa |
-|minLength |textMessage |minLh |
-|minLevel |openLevel |minLl |
+|messageEncoding |[textMessage](#53189-textmessage) |mesEg |
+|metadata |[features](#5391-features) |metaa |
+|minLength |[textMessage](#53189-textmessage) |minLh |
+|minLevel |[openLevel](#53156-openlevel) |minLl |
 |minSpeed |[airFlow](#5314-airflow) |minSd |
-|minValue |numberValue, temperature |minVe |
-|modality |pulsemeter |moday |
-|model |dmDeviceInfo |model |
+|minValue |[numberValue](#53155-numbervalue), [temperature](#53187-temperature) |minVe |
+|modality |[pulsemeter](#53168-pulsemeter) |moday |
+|model |[dmDeviceInfo](#584-dmdeviceinfo) |model |
 |monitoringEnabled |[airQualitySensor](#5316-airqualitysensor) |monEd |
-|multiFirmware |dmFirmware |mulFe |
+|multiFirmware |[dmFirmware](#586-dmfirmware) |mulFe |
 |multiplyingFactors |[energyConsumption](#53132-energyconsumption), [energyGeneration](#53133-energygeneration) |mulFs |
 |muscle |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |musce |
 |muscleMass |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |musMs |
 |muteEnabled |[audioVolume](#5318-audiovolume) |mutEd |
-|name |dmPackage, dmSoftware |name |
+|name |[dmPackage](#589-dmpackage), [dmSoftware](#587-dmsoftware) |name |
 |network |[threeDprinter](#5311-threedprinter) |netwk |
-|numberValue |numberValue |numVe |
+|numberValue |[numberValue](#53155-numbervalue) |numVe |
 |object |[binaryObject](#53111-binaryobject) |objet |
 |objectType |[binaryObject](#53111-binaryobject) |objTe |
 |openAlarm |[doorStatus](#53130-doorstatus) |opeAm |
 |openDuration |[doorStatus](#53130-doorstatus) |opeDn |
-|openLevel |openLevel |opeLl |
-|originID |origin |oriID |
-|osVersion |dmDeviceInfo |oseVn |
-|overcurrentStatus |overcurrentSensor |oveSs |
-|oxygenSaturation |oximeter |oxySn |
-|ozoneStatus |ozoneMeter |ozoSs |
-|ozoneValueMG |ozoneMeter |ozVMG |
-|ozoneValuePPM |ozoneMeter |oVPPM |
+|openLevel |[openLevel](#53156-openlevel) |opeLl |
+|originID |[origin](#5394-origin) |oriID |
+|osVersion |[dmDeviceInfo](#584-dmdeviceinfo) |oseVn |
+|overcurrentStatus |[overcurrentSensor](#53158-overcurrentsensor) |oveSs |
+|oxygenSaturation |[oximeter](#53159-oximeter) |oxySn |
+|ozoneStatus |[ozoneMeter](#53160-ozonemeter) |ozoSs |
+|ozoneValueMG |[ozoneMeter](#53160-ozonemeter) |ozVMG |
+|ozoneValuePPM |[ozoneMeter](#53160-ozonemeter) |oVPPM |
 |password |[credentials](#53127-credentials) |pwd |
-|postalAddress |location |posAs |
+|postalAddress |[location](#5392-location) |posAs |
 |power |[energyConsumption](#53132-energyconsumption) |power |
 |powerGenerationData |[energyGeneration](#53133-energygeneration) |poGDa |
-|powerSaveEnabled |powerSave |poSEd |
+|powerSaveEnabled |[powerSave](#53166-powersave) |poSEd |
 |powerState |[binarySwitch](#53112-binaryswitch) |powSe |
-|powerStatus |dmAgent |powSs |
-|precision |features |precn |
-|presentationURL |dmDeviceInfo |prURL |
-|previousChannel |televisionChannel |preCl |
+|powerStatus |[dmAgent](#583-dmagent) |powSs |
+|precision |[features](#5391-features) |precn |
+|presentationURL |[dmDeviceInfo](#584-dmdeviceinfo) |prURL |
+|previousChannel |[televisionChannel](#53186-televisionchannel) |preCl |
 |preWash |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |preWh |
-|primaryName |dmFirmware |priNe |
-|primaryState |dmFirmware |priSe |
-|primaryUrl |dmFirmware |priUl |
-|primaryVersion |dmFirmware |priVn |
-|printingState |printQueue |priS0 |
+|primaryName |[dmFirmware](#586-dmfirmware) |priNe |
+|primaryState |[dmFirmware](#586-dmfirmware) |priSe |
+|primaryUrl |[dmFirmware](#586-dmfirmware) |priUl |
+|primaryVersion |[dmFirmware](#586-dmfirmware) |priVn |
+|printingState |[printQueue](#53167-printqueue) |priS0 |
 |printSizeX |[threeDprinter](#5311-threedprinter) |priSX |
 |printSizeY |[threeDprinter](#5311-threedprinter) |priSY |
 |printSizeZ |[[5.3.1.1 threeDprinter](#5311-threedprinter)threeDprinter](#5311-threedprinter) |priSZ |
 |printType |[threeDprinter](#5311-threedprinter) |priTe |
-|progressPercentage |runState |proPe |
-|pulseRate |pulsemeter |pulRe |
-|pushed |pushButton |pushd |
-|ramAvailable |dmAgent |ramAe |
-|ramTotal |dmAgent |ramTl |
-|rapidCool |refrigeration |rapCl |
-|rapidFreeze |refrigeration |rapFe |
-|recipientID |phoneCall |recID |
+|progressPercentage |[runState](#53175-runstate) |proPe |
+|pulseRate |[pulsemeter](#53168-pulsemeter) |pulRe |
+|pushed |[pushButton](#53169-pushbutton) |pushd |
+|ramAvailable |[dmAgent](#583-dmagent) |ramAe |
+|ramTotal |[dmAgent](#583-dmagent) |ramTl |
+|rapidCool |[refrigeration](#53171-refrigeration) |rapCl |
+|rapidFreeze |[refrigeration](#53171-refrigeration) |rapFe |
+|recipientID |[phoneCall](#53164-phonecall) |recID |
 |red |[colour](#53123-colour) |red |
-|referenceTimer |timer |refTr |
-|relativeHumidity |relativeHumidity |relHy |
-|reliability |features |reliy |
-|remoteControlEnabled |remoteControlEnable |reCEd |
+|referenceTimer |[timer](#53190-timer) |refTr |
+|relativeHumidity |[relativeHumidity](#53172-relativehumidity) |relHy |
+|reliability |[features](#5391-features) |reliy |
+|remoteControlEnabled |[remoteControlEnable](#53173-remotecontrolenable) |reCEd |
 |resistance |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |resie |
-|room |location |room |
+|room |[location](#5392-location) |room |
 |roundingEnergyConsumption |[energyConsumption](#53132-energyconsumption) |roECn |
 |roundingEnergyGeneration |[energyGeneration](#53133-energygeneration) |roEGn |
-|rr |pulsemeter |r0 |
-|rssi |signalStrength |rssi |
-|runningTime |timer |runTe |
-|sdp |sessionDescription |sdp |
-|secondaryName |dmFirmware |secNe |
-|secondaryState |dmFirmware |secSe |
-|secondaryUrl |dmFirmware |secUl |
-|secondaryVersion |dmFirmware |secVn |
-|securityModes |securityMode |secMs |
-|sensitivity |motionSensor |sensy |
+|rr |[pulsemeter](#53168-pulsemeter) |r0 |
+|rssi |[signalStrength](#53178-signalstrength) |rssi |
+|runningTime |[timer](#53190-timer) |runTe |
+|sdp |[sessionDescription](#53177-sessiondescription) |sdp |
+|secondaryName |[dmFirmware](#586-dmfirmware) |secNe |
+|secondaryState |[dmFirmware](#586-dmfirmware) |secSe |
+|secondaryUrl |[dmFirmware](#586-dmfirmware) |secUl |
+|secondaryVersion |[dmFirmware](#586-dmfirmware) |secVn |
+|securityModes |[securityMode](#53176-securitymode) |secMs |
+|sensitivity |[motionSensor](#53154-motionsensor) |sensy |
 |sensorHumidity |[airQualitySensor](#5316-airqualitysensor) |senHy |
 |sensorOdor |[airQualitySensor](#5316-airqualitysensor) |senOr |
 |sensorPM1 |[airQualitySensor](#5316-airqualitysensor) |sePM1 |
 |sensorPM10 |[airQualitySensor](#5316-airqualitysensor) |sePM0 |
-|serialNumber |dmDeviceInfo |serNr |
+|serialNumber |[dmDeviceInfo](#584-dmdeviceinfo) |serNr |
 |sensorPM2 |[airQualitySensor](#5316-airqualitysensor) |sePM2 |
 |significantDigits |[energyConsumption](#53132-energyconsumption), [energyGeneration](#53133-energygeneration) |sigDs |
-|silentTime |motionSensor |silTe |
-|size |[binaryObject](#53111-binaryobject), features |size |
-|smokeThreshhold |smokeSensor |smoTd |
+|silentTime |[motionSensor](#53154-motionsensor) |silTe |
+|size |[binaryObject](#53111-binaryobject), [features](#5391-features) |size |
+|smokeThreshhold |[smokeSensor](#53182-smokesensor) |smoTd |
 |softLeanMass |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |soLMs |
 |soilLevel |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |soiLl |
 |speed |[airFlow](#5314-airflow) |speed |
-|speedFactor |playerControl |speFr |
+|speedFactor |[playerControl](#53165-playercontrol) |speFr |
 |speedWash |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |speWh |
-|spinLevelStrength |spinLevel |spLSh |
+|spinLevelStrength |[spinLevel](#53184-spinlevel) |spLSh |
 |spinSpeed |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |spiSd |
-|startPause |operationMode |staPe |
-|state |dmAgent, dmPackage, dmSoftware |state |
-|status |[boiler](#53115-boiler), dmEventLog, [electricVehicleConnector](#53131-electricvehicleconnector), [faultDetection](#53134-faultdetection), filterInf, mediaSelect |sus |
+|startPause |[operationMode](#53157-operationmode) |staPe |
+|state |[dmAgent](#583-dmagent), [dmPackage](#589-dmpackage), [dmFirmware](#586-dmfirmware) |state |
+|status |[boiler](#53115-boiler), [dmEventLog](#588-dmeventlog), [electricVehicleConnector](#53131-electricvehicleconnector), [faultDetection](#53134-faultdetection), filterInf, [mediaSelect](#53153-mediaselect) |sus |
 |steamTreat |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |steTt |
-|step |numberValue |step |
-|stepValue |[audioVolume](#5318-audiovolume), openLevel, temperature |steVe |
-|storageAvailable |dmAgent |stoAe |
-|storageTotal |dmAgent |stoTl |
+|step |[numberValue](#53155-numbervalue) |step |
+|stepValue |[audioVolume](#5318-audiovolume), [openLevel](#53156-openlevel), [temperature](#53187-temperature) |steVe |
+|storageAvailable |[dmAgent](#583-dmagent) |stoAe |
+|storageTotal |[dmAgent](#583-dmagent) |stoTl |
 |strength |[brewing](#53116-brewing) |streh |
-|subModel |dmDeviceInfo |subMl |
+|subModel |[dmDeviceInfo](#584-dmdeviceinfo) |subMl |
 |supportedHorizontalDirection |[airFlow](#5314-airflow) |suHDn |
-|supportedMediaSources |mediaSelect |suMSs |
-|supportedMessageValues |textMessage |suMVs |
-|supportedPlayerModes |playerControl |suPMs |
+|supportedMediaSources |[mediaSelect](#53153-mediaselect) |suMSs |
+|supportedMessageValues |[textMessage](#53189-textmessage) |suMVs |
+|supportedPlayerModes |[playerControl](#53165-playercontrol) |suPMs |
 |supportedVerticalDirection |[airFlow](#5314-airflow) |suVDn |
-|supportURL |dmDeviceInfo |suURL |
-|swVersion |dmDeviceInfo |sweVn |
-|systemTime |dmAgent |sysTe |
-|systolicPressure |sphygmomanometer |sysPe |
+|supportURL |[dmDeviceInfo](#584-dmdeviceinfo) |suURL |
+|swVersion |[dmDeviceInfo](#584-dmdeviceinfo) |sweVn |
+|systemTime |[dmAgent](#583-dmagent) |sysTe |
+|systolicPressure |[sphygmomanometer](#53183-sphygmomanometer) |sysPe |
 |targetAltitude |[geoLocation](#53141-geolocation) |tarAe |
-|targetDuration |timer |tarDn |
+|targetDuration |[timer](#53190-timer) |tarDn |
 |targetLatitude |[geoLocation](#53141-geolocation) |tarLe |
 |targetLongitude |[geoLocation](#53141-geolocation) |tarL0 |
-|targetTemperature |temperature |tarTe |
-|targetTimeToStart |timer |tTTSt |
-|targetTimeToStop |timer |tTTSp |
-|temperature |temperatureAlarm |tempe |
-|temperatureThreshhold |temperatureAlarm |temTd |
-|textMessage |textMessage |texMe |
+|targetTemperature |[temperature](#53187-temperature) |tarTe |
+|targetTimeToStart |[timer](#53190-timer) |tTTSt |
+|targetTimeToStop |[timer](#53190-timer) |tTTSp |
+|temperature |[temperatureAlarm](#53188-temperaturealarm) |tempe |
+|temperatureThreshhold |[temperatureAlarm](#53188-temperaturealarm) |temTd |
+|textMessage |[textMessage](#53189-textmessage) |texMe |
 |time |[keepWarm](#53148-keepwarm) |time |
 |token |[credentials](#53127-credentials) |tk |
 |tone |[alarmSpeaker](#5317-alarmspeaker) |tone |
-|turboEnabled |turbo |turEd |
-|type |dmEventLog |type |
-|unit |temperature |unit |
-|uri |printQueue |ur0 |
-|url |sessionDescription, dmPackage, dmSoftware |url |
+|turboEnabled |[turbo](#53191-turbo) |turEd |
+|type |[dmEventLog](#588-dmeventlog) |type |
+|unit |[temperature](#53187-temperature) |unit |
+|uri |[printQueue](#53167-printqueue) |ur0 |
+|url |[sessionDescription](#53177-sessiondescription), [dmPackage](#589-dmpackage), [dmSoftware](#587-dmsoftware) |url |
 |useGrinder |[grinder](#53143-grinder) |useGr |
-|uvStatus |uvSensor |uvtSs |
-|uvValue |uvSensor |uvaVe |
-|version |dmPackage, dmSoftware |versn |
+|uvStatus |[uvSensor](#53192-uvsensor) |uvtSs |
+|uvValue |[uvSensor](#53192-uvsensor) |uvaVe |
+|version |[dmPackage](#589-dmpackage), [dmSoftware](#587-dmsoftware) |versn |
 |verticalAccuracy |[geoLocation](#53141-geolocation) |verAy |
 |verticalDirection |[airFlow](#5314-airflow) |verDn |
 |visceraFat |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |visFt |
@@ -6341,8 +6442,8 @@ In protocol bindings resource attributes names for data points of module classes
 |volumePercentage |[audioVolume](#5318-audiovolume) |volPe |
 |washTemp |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |wasTp |
 |water |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |water |
-|waterFlowStrength |waterFlow |waFSh |
-|weight |weight |weigt |
+|waterFlowStrength |[waterFlow](#53193-waterflow) |waFSh |
+|weight |[weight](#53199-weight) |weigt |
 
 
 
@@ -6353,7 +6454,7 @@ In protocol bindings resource attributes names for properties of sub-devices sha
 
 |		Attribute Name |Occurs in |Short Name |
 |-|-|-|
-|propAreaNwkType |dmAreaNwkInfo |pANTe |
+|propAreaNwkType |[dmAreaNwkInfo](#5810-dmareanwkinfo) |pANTe |
 
 
 
@@ -6361,17 +6462,16 @@ In protocol bindings resource attributes names for properties of sub-devices sha
 ### 6.3.4 Resource attributes for actions arguments
 In protocol bindings resource attributes names for arguments of actions shall be translated into short names of Table 6.3.4-1.
 
-
-**Table 6.3.41: Resource attribute short names (Action arguments)**
+**Table 6.3.4-1: Resource attribute short names (Action arguments)**
 
 |Argument Name |Occurs in |Short Name |
 |-|-|-|
-|address |readIO, writeIO |addrs |
-|name |deployPackage |name |
-|payload |writeIO |payld |
-|rebootType |reboot |rebTe |
-|url |deployPackage, updateFirmware, update |url |
-|version |deployPackage, updateFirmware, update |versn |
+|address |[readIO](#585-dmdatamodelio), [writeIO](#585-dmdatamodelio) |addrs |
+|name |[deployPackage](#583-dmagent) |name |
+|payload |[writeIO](#585-dmdatamodelio) |payld |
+|rebootType |[reboot](#583-dmagent) |rebTe |
+|url |[deployPackage](#583-dmagent), [updateFirmware](#586-dmfirmware), [update](#589-dmpackage) |url |
+|version |[deployPackage](#583-dmagent), [updateFirmware](#586-dmfirmware), [update](#589-dmpackage) |versn |
 
 
 
@@ -6386,22 +6486,20 @@ The full list of domains is:
 "agriculture", "city", "common", "health", "home", "industry", "management", "metadata", "publicsafety", "railway" and "vehicular". 
 
 
-
-
 ### 6.4.2 Device models
 Depending on the domain, the *containerDefinition* attribute of specializations for device models shall have the values that comply with the following rule.  
 
-- Rule: "org.onem2m.[domain].device.[device name]", where [domain] is one of the domain names defined in 6.4.1. The name is chosen according to the domain in which the device is defined.
+- Rule: "org.onem2m.[domain].device.[device name]", where [domain] is one of the domain names defined in [6.4.1](#641-introduction). The name is chosen according to the domain in which the device is defined.
 
-For example, the *containerDefinition* attribute of the specialization for the "deviceAirConditioner" device of the "home" domain shall be "org.onem2m.home.device.deviceAirConditioner".
+For example, the *containerDefinition* attribute of the specialization for the "[deviceAirConditioner](#5541-deviceairconditioner)" device of the "home" domain shall be "org.onem2m.home.device.deviceAirConditioner".
 
 
 ### 6.4.3 ModuleClasses
 Depending on the domain, the *containerDefinition* attribute of specializations for module classes shall have the values that comply with the following rule.  
 
-- Rule: "org.onem2m.[domain].moduleclass.[moduleclass name]", where [domain] is one of the domain names defined in 6.4.1. The name is chosen according to the domain in which the module class is defined.
+- Rule: "org.onem2m.[domain].moduleclass.[moduleclass name]", where [domain] is one of the domain names defined in [6.4.1](#641-introduction). The name is chosen according to the domain in which the module class is defined.
 
-For example, the *containerDefinition* attribute of the specialization for the "[alarmSpeaker](#5317-alarmspeaker)" module class of the "common" domain shall be "org.onem2m.common.moduleclass.alarmSpeaker", the *containerDefinition* attribute of the specialization for the "dmAgent" module class of the "management" domain shall be "org.onem2m.management.moduleclass.dmAgent".
+For example, the *containerDefinition* attribute of the specialization for the "[alarmSpeaker](#5317-alarmspeaker)" module class of the "common" domain shall be "org.onem2m.common.moduleclass.alarmSpeaker", the *containerDefinition* attribute of the specialization for the "[dmAgent](#583-dmagent)" module class of the "management" domain shall be "org.onem2m.management.moduleclass.dmAgent".
 
 
 ### 6.4.4 Actions
@@ -6409,17 +6507,17 @@ Depending on the domain, the *containerDefinition* attribute of specializations
 
 that comply with the following rule.  
 
-Rule: "org.onem2m.[domain].action.[action name]", where [domain] is one of the domain names defined in 6.4.1. The name is chosen according to the domain in which the action is defined.
+Rule: "org.onem2m.[domain].action.[action name]", where [domain] is one of the domain names defined in [6.4.1](#641-introduction). The name is chosen according to the domain in which the action is defined.
 
-For example, the *containerDefinition* attribute of the specialization for "activateClockTimer" action in the "timer" module class of the "common" domain shall be "org.onem2m.common.action.activateClocktimer", the *containerDefinition* attribute of the specialization for the "activate" action of the "dmSoftware" module class of the "management" domain shall be "org.onem2m.management.action.activate".
+For example, the *containerDefinition* attribute of the specialization for "[activateClockTimer](#53190-timer)" action in the "[timer](#53190-timer)" module class of the "common" domain shall be "org.onem2m.common.action.activateClocktimer", the *containerDefinition* attribute of the specialization for the "[activate](#587-dmsoftware)" action of the "[dmSoftware](#587-dmsoftware)" ModuleClass of the "management" domain shall be "org.onem2m.management.action.activate".
 
 
-### 6.4.5 6.4.5 SubDevices
+### 6.4.5 SubDevices
 Depending on the domain, the *containerDefinition* attribute of specializations for sub-devices shall have the values that comply with the following rule.  
 
 -    Rule: "org.onem2m.[domain].subdevice.[subDevice name]", where [domain] is one of the following names: "agriculture", "city", "common", "health", "home", "industry", "railway", "vehicular" and "management". The name is chosen according to the domain in which the sub-device is defined.
 
-For example, the *containerDefinition* attribute of specialization for "subDevicePowerOutlet" of the "common" domain shall be "org.onem2m.common.subdevice.subDevicePowerOutlet", the *containerDefinition* attribute of the specialization forthe "dmAreaNwkInfo" of the "management" domain shall be "org.onem2m. management.subdevice.dmAreaNwkInfo".
+For example, the *containerDefinition* attribute of specialization for "subDevicePowerOutlet" of the "common" domain shall be "org.onem2m.common.subdevice.subDevicePowerOutlet", the *containerDefinition* attribute of the specialization for the "[dmAreaNwkInfo](#5810-dmareanwkinfo)" of the "management" domain shall be "org.onem2m. management.subdevice.dmAreaNwkInfo".
 
 
 
@@ -6459,7 +6557,7 @@ The XSD definitions for Device models are specified upon the following rule.
 
 - Rule: [Domain Prefix]-[device name]-v&lt;TS-version>.xsd where the string '&lt;TS-version>' shall be interpreted as the version of the present document
 
-For example, the XSD definition for deviceAirConditioner specified in TS-0023 v4.3.0 shall be "HOD-deviceAirConditioner-v4_3_0.xsd"
+For example, the XSD definition for "[deviceAirConditioner](#5541-deviceairconditioner)" specified in TS-0023 v4.3.0 shall be "HOD-deviceAirConditioner-v4_3_0.xsd"
 
 
 ### 6.5.3 XSD definitions for ModuleClass
@@ -6467,7 +6565,7 @@ The XSD definitions for ModuleClass are specified upon the following rule.
 
 - Rule: [Domain Prefix]-mod-[ModuleClass name]-v&lt;TS-version>.xsd where the string '&lt;TS-version>' shall be interpreted as the version of the present document 
 
-For example, the XSD definition for ""[alarmSpeaker](#5317-alarmspeaker) specified in TS-0023 v4.3.0 shall be "COD-mod-alarmSpeaker-v4_3_0.xsd"
+For example, the XSD definition for "[alarmSpeaker](#5317-alarmspeaker)" specified in TS-0023 v4.3.0 shall be "COD-mod-alarmSpeaker-v4_3_0.xsd"
 
 
 ### 6.5.4 XSD definitions for Action
@@ -6475,7 +6573,7 @@ The XSD definitions for Actions are specified upon the following rule.
 
 - Rule: [Domain Prefix]-act-[action name]-v&lt;TS-version>.xsd where the string '&lt;TS-version>' shall be interpreted as the version of the present document
 
-For example, the XSD definition for activateClockTimer specified in TS-0023 v4.3.0 shall be "HOD-act- activateClockTimer -v4_3_0.xsd".
+For example, the XSD definition for "[activateClockTimer](#53190-timer)" specified in TS-0023 v4.3.0 shall be "HOD-act- activateClockTimer -v4_3_0.xsd".
 
 
 ### 6.5.5 XSD definitions for SubDevices
@@ -6483,7 +6581,7 @@ The XSD definitions for SubDeices are specified upon the following rule.
 
 - Rule: [Domain Prefix]-[SubDevice name]-v&lt;TS-version>.xsd where the string '&lt;TS-version>' shall be interpreted as the version of the present document.
 
-For example, the XSD definition for subDeviceCuff specified in TS-0023 v4.3.0 shall be "COD-subDeviceCuff-v4_3_0.xsd".
+For example, the XSD definition for "subDeviceCuff" specified in TS-0023 v4.3.0 shall be "COD-subDeviceCuff-v4_3_0.xsd".
 
 
 ### 6.5.6 XSD definitions for Enumerated Types
@@ -6513,9 +6611,9 @@ OMA DWAPI has no concept  that corresponds to ModuleClass in oneM2M. The mapping
 ### 7.1.2 Device Models
 
 #### 7.1.2.1 device3Dprinter
-The device3Dprinter of HAIM shall be mapped to 3D printer of OMA DWAPI-3DP on the basis of the following table.
+The [device3DPrinter](#5511-device3dprinter) of HAIM shall be mapped to 3D printer of OMA DWAPI-3DP on the basis of the following table.
 
-<mark>**Table 7.1.21: Map of device3Dprinter of oneM2M HAIM to OMA DWAPI-3DP**</mark>
+**Table 7.1.2-1: Map of device3Dprinter of oneM2M HAIM to OMA DWAPI-3DP**
 
 |ModuleClass |Data Points of oneM2M HAIM |data objects of OMA DWAPI-3DP | |Description |
 |-|-|-|-|-|
@@ -6527,15 +6625,14 @@ The device3Dprinter of HAIM shall be mapped to 3D printer of OMA DWAPI-3DP on th
 |[threeDprinter](#5311-threedprinter) |printSizeZ |printSizeZ | |See clause [5.3.1.1](#5311-threedprinter). |
 |[threeDprinter](#5311-threedprinter) |network |network | |See clause [5.3.1.1](#5311-threedprinter). |
 |[threeDprinter](#5311-threedprinter) |memorySize |memorySize | |See clause [5.3.1.1](#5311-threedprinter). |
-|runState |currentMachineState |operatingStatus | |See clause 5.3.1.75.<br />This value represents the machineState of the 3D printer itself.  This value SHALL be interpreted by using hd:enumMachineState and generated operatingStatus as a string.<br />See the Table 7.1.22 .  |
-|temperature |currentTemperature |nozzleTemp | |See clause 5.3.1.87.<br />This value represents the temperature of the nozzle. This value SHALL be a float number in a range from 0.0 to 1000.0.<br />The unit is C. |
-|printQueue |uri |uri | |See clause 5.3.1.67. |
-|printQueue |printingState |msg | |See clause 5.3.1.67.<br />This value represents the machineState of the queued printing job. This value shall be interpreted by using hd:enumMachineState and generated msg as a string.<br />See the Table 7.1.23.  |
+|[runState](#53175-runstate) |currentMachineState |operatingStatus | |See clause [5.3.1.75](#53175-runstate).<br />This value represents the machineState of the 3D printer itself.  This value SHALL be interpreted by using hd:enumMachineState and generated operatingStatus as a string.<br />See the Table 7.1.2-2 .  |
+|[temperature](#53187-temperature) |currentTemperature |nozzleTemp | |See clause [5.3.1.87](#53187-temperature).<br />This value represents the temperature of the nozzle. This value SHALL be a float number in a range from 0.0 to 1000.0.<br />The unit is C. |
+|[printQueue](#53167-printqueue) |uri |uri | |See clause [5.3.1.67](#53167-printqueue). |
+|[printQueue](#53167-printqueue) |printingState |msg | |See clause [5.3.1.67](#53167-printqueue).<br />This value represents the machineState of the queued printing job. This value shall be interpreted by using hd:enumMachineState and generated msg as a string.<br />See the Table 7.1.2-3.  |
 
 
 
-
-**Table 7.1.22: Map of hd:enumMachineState of oneM2M HAIM to operatingStatus of OMA DWAPI-3DP**
+**Table 7.1.2-2: Map of hd:enumMachineState of oneM2M HAIM to operatingStatus of OMA DWAPI-3DP**
 
 |Value |Interpretation |operatingStatus of OMA DWAPI-3DP |Note |
 |-|-|-|-|
@@ -6553,8 +6650,7 @@ The device3Dprinter of HAIM shall be mapped to 3D printer of OMA DWAPI-3DP on th
 
 
 
-
-**Table 7.1.23: Map of hd:enumJobState of oneM2M HAIM to msg of OMA DWAPI-3DP**
+**Table 7.1.2-3: Map of hd:enumJobState of oneM2M HAIM to msg of OMA DWAPI-3DP**
 
 |Value |Interpretation |msg of OMA DWAPI-3DP |Note |
 |-|-|-|-|
@@ -6571,25 +6667,23 @@ The device3Dprinter of HAIM shall be mapped to 3D printer of OMA DWAPI-3DP on th
 #### 7.1.2.2 deviceBloodPressureMonitor
 DeviceBloodPressureMonitoer of HAIM shall be mapped to Blood Pressure Monitor of OMA DWAPI-PCH on the basis of the following table. 
 
+**Table 7.1.2-4: Map of deviceBloodPressureMonitor of oneM2M HAIM to OMA DWAPI-PCH**
 
-**Table 7.1.24: Map of deviceBloodPressureMonitor of oneM2M HAIM to OMA DWAPI-PCH**
-
-|ModuleClass |DataPoints of <br />oneM2M HAIM |data objects of <br />OMA DWAPI-PCH |Description |
+|ModuleClass |DataPoints of oneM2M HAIM |data objects of OMA DWAPI-PCH |Description |
 |-|-|-|-|
-|sphygmomanometer |diastolicPressure  |diastolic |See clause 5.3.1.83. |
-|sphygmomanometer |systolicPressure |systolic |See clause 5.3.1.83. |
-|sphygmomanometer |meanPressure |mean |See clause 5.3.1.83. |
-|pulsemeter |pulseRate |pulse |See clause 5.3.1.68 |
-|[battery](#53110-battery) |level |batteryLevel |See clause 5.3.1.10.<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0.0, 1.0] atOMA DWAPI-PCH. |
+|[sphygmomanometer](#53183-sphygmomanometer) |diastolicPressure  |diastolic |See clause [5.3.1.83](#53183-sphygmomanometer). |
+|[sphygmomanometer](#53183-sphygmomanometer) |systolicPressure |systolic |See clause [5.3.1.83](#53183-sphygmomanometer). |
+|[sphygmomanometer](#53183-sphygmomanometer) |meanPressure |mean |See clause [5.3.1.83](#53183-sphygmomanometer). |
+|[pulsemeter](#53168-pulsemeter) |pulseRate |pulse |See clause [5.3.1.68](#53168-pulsemeter). |
+|[battery](#53110-battery) |level |batteryLevel |See clause [5.3.1.10](#53110-battery).<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0.0, 1.0] atOMA DWAPI-PCH. |
 
 
 #### 7.1.2.3 deviceGlucosemeter
 DeviceGlucometer of HAIM shall be mapped to Glucometer of OMA DWAPI-PCH on the basis of the following table. 
 
+**Table 7.1.2-5: Map of deviceGlucometer of oneM2M HAIM to OMA DWAPI-PCH**
 
-**Table 7.1.25: Map of deviceGlucometer of oneM2M HAIM to OMA DWAPI-PCH**
-
-|ModuleClass |DataPoints of <br />oneM2M HAIM |data objects of <br />OMA DWAPI-PCH |Description |
+|ModuleClass |DataPoints of oneM2M HAIM |data objects of OMA DWAPI-PCH |Description |
 |-|-|-|-|
 |[glucometer](#53142-glucometer) |concentration |concentration |See clause [5.3.1.42](#53142-glucometer). |
 |[glucometer](#53142-glucometer) |hba1c |hba1c |See clause [5.3.1.42](#53142-glucometer). |
@@ -6601,7 +6695,7 @@ DeviceGlucometer of HAIM shall be mapped to Glucometer of OMA DWAPI-PCH on the b
 |[glucometer](#53142-glucometer) |contextLocation |contextLocation |See clause [5.3.1.42](#53142-glucometer). |
 |[glucometer](#53142-glucometer) |contextTester |contextTester |See clause [5.3.1.42](#53142-glucometer). |
 |[glucometer](#53142-glucometer) |contextHealth |contextHealth |See clause [5.3.1.42](#53142-glucometer). |
-|[battery](#53110-battery) |level |batteryLevel |See clause 5.3.1.10.<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0.0, 1.0] atOMA DWAPI-PCH. |
+|[battery](#53110-battery) |level |batteryLevel |See clause [5.3.1.10](#53110-battery).<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0.0, 1.0] atOMA DWAPI-PCH. |
 
 
 
@@ -6609,14 +6703,13 @@ DeviceGlucometer of HAIM shall be mapped to Glucometer of OMA DWAPI-PCH on the b
 #### 7.1.2.4 devicePulseOximeter
 DevicePulseOximeter of HAIM shall be mapped to Pulse Oximeter of OMA DWAPI-PCH on the basis of the following table. 
 
+**Table 7.1.2-6: Map of devicePulseOximeter of oneM2M HAIM to OMA DWAPI-PCH**
 
-**Table 7.1.26: Map of devicePulseOximeter of oneM2M HAIM to OMA DWAPI-PCH**
-
-|ModuleClass |DataPoints of <br />oneM2M HAIM |data objects of <br />OMA DWAPI-PCH |Description |
+|ModuleClass |DataPoints of oneM2M HAIM |data objects of OMA DWAPI-PCH |Description |
 |-|-|-|-|
-|pulsemeter |modality |spo2, pulse |See clause 5.3.1.68.<br />When oximeter module doesn't exist, pulsemeter module is mandatory. |
-|oximeter |modality |spo2, pulse |See clause 5.3.1.59.<br />When pulsemeter module doesn't exist, oximeter module is mandatory. |
-|[battery](#53110-battery) |level |batteryLevel |See clause 5.3.1.10.<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0.0, 1.0] atOMA DWAPI-PCH. |
+|[pulsemeter](#53168-pulsemeter) |modality |spo2, pulse |See clause [5.3.1.68](#53168-pulsemeter).<br />When "[oximeter](#53159-oximeter)" module doesn't exist, "[pulsemeter](#53168-pulsemeter)" module is mandatory. |
+|[oximeter](#53159-oximeter) |modality |spo2, pulse |See clause [5.3.1.59](#53159-oximeter).<br />When "[pulsemeter](#53168-pulsemeter)" module doesn't exist, ""[oximeter](#53159-oximeter)" module is mandatory. |
+|[battery](#53110-battery) |level |batteryLevel |See clause [5.3.1.10](#53110-battery).<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0.0, 1.0] atOMA DWAPI-PCH. |
 
 
 
@@ -6624,13 +6717,12 @@ DevicePulseOximeter of HAIM shall be mapped to Pulse Oximeter of OMA DWAPI-PCH o
 #### 7.1.2.5 deviceThermometer
 DeviceTermometer of HAIM shall be mapped to Thermometer of OMA DWAPI-PCH on the basis of the following table. 
 
+**Table 7.1.2-7: Map of deviceThermometer of oneM2M HAIM to OMA DWAPI-PCH**
 
-**Table 7.1.27: Map of deviceThermometer of oneM2M HAIM to OMA DWAPI-PCH**
-
-|ModuleClass |Data Points of <br />oneM2M HAIM |data objects of <br />OMA DWAPI-PCH |Description |
+|ModuleClass |Data Points of oneM2M HAIM |data objects of OMA DWAPI-PCH |Description |
 |-|-|-|-|
-|temperature |unit |temperature |See clause 5.3.1.87. |
-|[battery](#53110-battery) |level |batteryLevel |See clause 5.3.1.10.<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0.0, 1.0] atOMA DWAPI-PCH. |
+|[temperature](#53187-temperature) |unit |temperature |See clause [5.3.1.87](#53187-temperature). |
+|[battery](#53110-battery) |level |batteryLevel |See clause [5.3.1.10](#53110-battery).<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0.0, 1.0] atOMA DWAPI-PCH. |
 
 
 
@@ -6638,10 +6730,9 @@ DeviceTermometer of HAIM shall be mapped to Thermometer of OMA DWAPI-PCH on the
 #### 7.1.2.6 deviceWeightScaleAndBodyCompositionAnalyser
 DeviceWeightScaleAdBodyCompositionAnalyser of HAIM shall be mapped to Weight Scale Body Composition Analyser of OMA DWAPI-PCH on the basis of the following table. 
 
+**Table 7.1.2-8: Map of deviceWeightScaleAdBodyCompositionAnalyser of oneM2M HAIM to OMA DWAPI-PCH**
 
-**Table 7.1.28: Map of deviceWeightScaleAdBodyCompositionAnalyser of oneM2M HAIM to OMA DWAPI-PCH**
-
-|ModuleClass |DataPoints of <br />oneM2M HAIM |data objects of <br />OMA DWAPI-PCH |Description |
+|ModuleClass |DataPoints of oneM2M HAIM |data objects of OMA DWAPI-PCH |Description |
 |-|-|-|-|
 |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |bodyLength |bodyLength |See clause [5.3.1.14](#53114-bodycompositionanalyser). |
 |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |Bmi |bmi |See clause [5.3.1.14](#53114-bodycompositionanalyser). |
@@ -6650,11 +6741,11 @@ DeviceWeightScaleAdBodyCompositionAnalyser of HAIM shall be mapped to Weight Sca
 |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |muscleMass |muscleMass |See clause [5.3.1.14](#53114-bodycompositionanalyser). |
 |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |basalMetabolism |basalMetabolism |See clause [5.3.1.14](#53114-bodycompositionanalyser). |
 |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |impedance |impedance |See clause [5.3.1.14](#53114-bodycompositionanalyser). |
-|weight |weight |bodyMass |See clause 5.3.1.99. |
+|[weight](#53199-weight) |weight |bodyMass |See clause [5.3.1.99](#53199-weight). |
 |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |water |bodyWater |See clause [5.3.1.13](#53113-bioelectricalimpedanceanalysis). |
 |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |fat |bodyFat |See clause [5.3.1.13](#53113-bioelectricalimpedanceanalysis). |
 |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |muscle |musclePercentage |See clause [5.3.1.13](#53113-bioelectricalimpedanceanalysis). |
-|[battery](#53110-battery) |level |batteryLevel |See clause 5.3.1.10.<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0.0, 1.0] atOMA DWAPI-PCH. |
+|[battery](#53110-battery) |level |batteryLevel |See clause [5.3.1.10](#53110-battery).<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0.0, 1.0] atOMA DWAPI-PCH. |
 
 
 
@@ -6662,15 +6753,14 @@ DeviceWeightScaleAdBodyCompositionAnalyser of HAIM shall be mapped to Weight Sca
 #### 7.1.2.7 deviceHeartRateMonitor
 DeviceHeartRateMonitor of HAIM shall be mapped to Heart Rate Monitor of OMA DWAPI-PCH on the basis of the following table. 
 
+**Table 7.1.2-9: Map of deviceHeartRateMonitor of oneM2M HAIM to OMA DWAPI-PCH**
 
-**Table 7.1.29: Map of deviceHeartRateMonitor of oneM2M HAIM to OMA DWAPI-PCH**
-
-|ModuleClass |DataPoints of <br />oneM2M HAIM |data objects of <br />OMA DWAPI-PCH |Description |
+|ModuleClass |DataPoints of oneM2M HAIM |data objects of OMA DWAPI-PCH |Description |
 |-|-|-|-|
-|pulsemeter |pulseRate |rate |See clause 5.3.1.68. |
-|pulsemeter |rr |rr |See clause 5.3.1.68. |
-|pulsemeter |energy |energy |See clause 5.3.1.68. |
-|[battery](#53110-battery) |level |batteryLevel |See clause 5.3.1.10.<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0.0, 1.0] atOMA DWAPI-PCH. |
+|[pulsemeter](#53168-pulsemeter) |pulseRate |rate |See clause [5.3.1.68](#53168-pulsemeter). |
+|[pulsemeter](#53168-pulsemeter) |rr |rr |See clause [5.3.1.68](#53168-pulsemeter). |
+|[pulsemeter](#53168-pulsemeter) |energy |energy |See clause [5.3.1.68](#53168-pulsemeter). |
+|[battery](#53110-battery) |level |batteryLevel |See clause [5.3.1.10](#53110-battery).<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0.0, 1.0] atOMA DWAPI-PCH. |
 
 
 
@@ -6678,12 +6768,11 @@ DeviceHeartRateMonitor of HAIM shall be mapped to Heart Rate Monitor of OMA DWAP
 ### 7.1.3 Data Types
 Data types of oneM2M HAIM and OMA DWAPI-PCH shall be mapped each other on the basis of the following table.
 
-
-**Table 7.1.31: Map of data types between oneM2M and OMA DWAPI-PCH**
+**Table 7.1.3-1: Map of data types between oneM2M and OMA DWAPI-PCH**
 
 |oneM2M data type |Mapping to data type in OMA DWAPI |Description |
 |-|-|-|
-|xs:integer |int, number, string |Data type for 32-bit signed integer.<br /><br />For indicating 3D printerState, the integer value should be interpeted into string by referring the tables in clause 7.1.2.1 .  |
+|xs:integer |int, number, string |Data type for 32-bit signed integer.<br /><br />For indicating 3D printerState, the integer value should be interpeted into string by referring the tables in clause [7.1.2.1](#7121-device3dprinter) .  |
 |xs:string |string, array |Data type for text. The length limitation should be considered for the mapping. |
 |xs:float |float |Data type for a single precision 32-bit floating point type as defined in XML Schema 1.0 <a href="#_ref_14">[14]</a> as the float primitive type. |
 |xs:boolean |boolean |Data type for Boolean. |
@@ -6696,8 +6785,7 @@ The following table shows a mapping of  the Home Appliance Information Model to
 
 The table only shows mapping of  SDT concepts that are used to classify all concepts in the Home Appliance Information Model. Therefore, since any concept in the Home Appliance Information Model can be classified according to a specific SDT concept it also (transitively) maps to the related class of the oneM2M Base Ontology.
 
-
-**Table 7.1.31: Mapping between SDT concepts in the Home Appliance Information Model <br />and the oneM2M Base Ontology**
+**Table 7.1.3-1: Mapping between SDT concepts in the Home Appliance Information Model <br />and the oneM2M Base Ontology**
 
 |SDT Concept in the Home Appliance Information Model |Mapping relationship | Class in Base Ontology |Property in Base Ontology |Comment |
 |-|-|-|-|-|
@@ -6717,7 +6805,10 @@ The table only shows mapping of  SDT concepts that are used to classify all conc
 |SDT: Property (of a ModuleClass) |sub-class of |Aspect  | |Aspect  (of the Functionality) |
 |SDT: SimpleType |sub-property of | |hasDataType |The base ontology's SimpleTypeVariable class has data properties: <br />hasDataType<br />hasDataRestriction |
 |SDT: Constraint |sub-property of | |hasDataRestriction | |
-|NOTE:	In RESTful technologies the Service (i.e. the electronic representation of a Functionality in a network) is implicitly bound to its Functionality by the naming of the used resources (e.g. the Functionality of ModuleClass "[audioVolume](#5318-audiovolume)" is implemented as a Service through CRUD operations on a [audioVolume] &lt;flexContainer> specialization).  |NOTE:	In RESTful technologies the Service (i.e. the electronic representation of a Functionality in a network) is implicitly bound to its Functionality by the naming of the used resources (e.g. the Functionality of ModuleClass "[audioVolume](#5318-audiovolume)" is implemented as a Service through CRUD operations on a [audioVolume] &lt;flexContainer> specialization).  |NOTE:	In RESTful technologies the Service (i.e. the electronic representation of a Functionality in a network) is implicitly bound to its Functionality by the naming of the used resources (e.g. the Functionality of ModuleClass "[audioVolume](#5318-audiovolume)" is implemented as a Service through CRUD operations on a [audioVolume] &lt;flexContainer> specialization).  |NOTE:	In RESTful technologies the Service (i.e. the electronic representation of a Functionality in a network) is implicitly bound to its Functionality by the naming of the used resources (e.g. the Functionality of ModuleClass "[audioVolume](#5318-audiovolume)" is implemented as a Service through CRUD operations on a [audioVolume] &lt;flexContainer> specialization).  |NOTE:	In RESTful technologies the Service (i.e. the electronic representation of a Functionality in a network) is implicitly bound to its Functionality by the naming of the used resources (e.g. the Functionality of ModuleClass "[audioVolume](#5318-audiovolume)" is implemented as a Service through CRUD operations on a [audioVolume] &lt;flexContainer> specialization).  |
+
+
+
+NOTE: In RESTful technologies the Service (i.e. the electronic representation of a Functionality in a network) is implicitly bound to its Functionality by the naming of the used resources (e.g. the Functionality of ModuleClass "[audioVolume](#5318-audiovolume)" is implemented as a Service through CRUD operations on a [audioVolume] &lt;flexContainer> specialization).
 
 
 
@@ -6725,15 +6816,15 @@ The table only shows mapping of  SDT concepts that are used to classify all conc
 # Annex A (informative):  Resource Mapping Examples
 
 ## Annex A.1 Introduction
-The AE may construct oneM2M resource tree on hosting CSE as the mapping of associated device, and each XSD definition for the device information models is generated following 'Resource Mapping Rule' in clause 6.2.
+The AE may construct oneM2M resource tree on hosting CSE as the mapping of associated device, and each XSD definition for the device information models is generated following 'Resource Mapping Rule' in clause [6.2](#62-the-resource-mapping-rules).
 
-The present clause explains how to use the oneM2M resource tree to map Device model for each device (see clause 5.5).
+The present clause explains how to use the oneM2M resource tree to map Device model for each device (see clause [5.5](#55-device-models)).
 
 
 ## Annex A.2 Example for Device model 'deviceAirConditioner'
-The present clause explains the creation process for the device typed 'deviceAirConditioner' (see clause 5.5.1.1 for device model definition of 'deviceAirConditioner').
+The present clause explains the creation process for the device typed '[deviceAirConditioner](#5541-deviceairconditioner)' (see clause [5.5.4.1](#5541-deviceairconditioner) for device model definition of 'deviceAirConditioner').
 
-Using the definition, 'deviceAirConditioner' model is mapped to [deviceAirConditioner] resource which is a specialization of &lt;flexContainer> resource (See Figure A.2-1).
+Using the definition, '[deviceAirConditioner](#5541-deviceairconditioner)' model is mapped to [deviceAirConditioner] resource which is a specialization of &lt;flexContainer> resource (See Figure A.2-1).
 
 
 
@@ -6742,9 +6833,9 @@ Using the definition, 'deviceAirConditioner' model is mapped to [deviceAirCondit
 **Figure A.2-1: Structure of [deviceAirConditioner] resource**
 
 
-The AE creates the [deviceAirConditioner] specialization of &lt;flexContainer> resource for the Device model [deviceAirConditioner] resource.
+The AE creates the [[deviceAirConditioner](#5541-deviceairconditioner)] specialization of &lt;flexContainer> resource for the Device model [[deviceAirConditioner](#5541-deviceairconditioner)] resource.
 
-The [deviceAirConditioner] resource contains the child resource specified in Table A.2-2.
+The [[deviceAirConditioner](#5541-deviceairconditioner)] resource contains the child resource specified in Table A.2-2.
 
 
 **Table A.2-2: Child resources of [deviceAirConditioner] resource**
@@ -6752,32 +6843,32 @@ The [deviceAirConditioner] resource contains the child resource specified in Tab
 |Child Resources of [deviceAirConditioner] |Child Resource Type |Multiplicity |Description |
 |-|-|-|-|
 |[variable] |&lt;flexContainer> as defined in the specialization [[binarySwitch](#53112-binaryswitch)] |0..1 |This resource is used to map 'binarySwith' ModuleClass defined in clause [5.3.1.12](#53112-binaryswitch). |
-|[variable] |&lt;flexContainer> as defined in the specialization [runState] |0..1 |This resource is used to map 'runState' ModuleClass defined in clause 5.3.1.75. |
-|[variable] |&lt;flexContainer> as defined in the specialization [[airConJobMode](#5313-airconjobmode)] |0..1 |This resource is used to map '[airConJobMode](#5313-airconjobmode)' ModuleClass defined in clause.<br />==Editor's Note: [airConJobMode](#5313-airconjobmode) is not a moduleclass. It is an instance of that. It is needed to fix.== |
-|[variable] |&lt;flexContainer> as defined in the specialization [airConOperationMode] |0..1 |This resource is used to map 'airConOperationMode' ModuleClass defined in clause 5.3.1.57. |
-|[variable] |&lt;flexContainer> as defined in the specialization [airCleanOperationMode] |0..1 |This resource is used to map 'airCleanOperationMode' ModuleClass defined in clause 5.3.1.57. |
-|[variable] |&lt;flexContainer> as defined in the specialization [temperature] |0..1 |This resource is used to map 'temperature' ModuleClass defined in clause 5.3.1.87. |
-|[variable] |&lt;flexContainer> as defined in the specialization [timer] |0..1 |This resource is used to map 'timer' ModuleClass defined in clause 5.3.1.90. |
-|[variable] |&lt;flexContainer> as defined in the specialization [sleepTimer] |0..1 |This resource is used to map 'sleepTimer' ModuleClass defined in clause 5.3.1.90. |
-|[variable] |&lt;flexContainer> as defined in the specialization [turbo] |0..1 |This resource is used to map 'turbo' ModuleClass defined in clause 5.3.1.91. |
+|[variable] |&lt;flexContainer> as defined in the specialization [[runState](#53175-runstate)] |0..1 |This resource is used to map 'runState' ModuleClass defined in clause [5.3.1.75](#53175-runstate). |
+|[variable] |&lt;flexContainer> as defined in the specialization [[airConJobMode](#5313-airconjobmode)] |0..1 |This resource is used to map '[airConJobMode](#5313-airconjobmode)' ModuleClass defined in clause [5.3.1.3](#5313-airconjobmode). |
+|[variable] |&lt;flexContainer> as defined in the specialization [[airConOperationMode](#53157-operationmode)] |0..1 |This resource is used to map '[airConOperationMode](#53157-operationmode)' ModuleClass defined in clause [5.3.1.57](#53157-operationmode). |
+|[variable] |&lt;flexContainer> as defined in the specialization [[airCleanOperationMode](#53157-operationmode)] |0..1 |This resource is used to map '[airCleanOperationMode](#53157-operationmode)' ModuleClass defined in clause [5.3.1.57](#53157-operationmode). |
+|[variable] |&lt;flexContainer> as defined in the specialization [[temperature](#53187-temperature)] |0..1 |This resource is used to map 'temperature' ModuleClass defined in clause [5.3.1.87](#53187-temperature). |
+|[variable] |&lt;flexContainer> as defined in the specialization [[timer](#53190-timer)] |0..1 |This resource is used to map '[timer](#53190-timer)' ModuleClass defined in clause [5.3.1.90](#53190-timer). |
+|[variable] |&lt;flexContainer> as defined in the specialization [[sleepTimer](#53190-timer)] |0..1 |This resource is used to map '[sleepTimer](#53190-timer)' ModuleClass defined in clause [5.3.1.90](#53190-timer). |
+|[variable] |&lt;flexContainer> as defined in the specialization [[turbo](#53191-turbo)] |0..1 |This resource is used to map 'turbo' ModuleClass defined in clause [5.3.1.91](#53191-turbo). |
 |[variable] |&lt;flexContainer> as defined in the specialization [[airFlow](#5314-airflow)] |0..1 |This resource is used to map 'airFlow' ModuleClass defined in clause [5.3.1.4](#5314-airflow). |
-|[variable] |&lt;flexContainer> as defined in the specialization [powerSave] |0..1 |This resource is used to map 'powerSave' ModuleClass defined in clause 5.3.1.66. |
+|[variable] |&lt;flexContainer> as defined in the specialization [[powerSave](#53166-powersave)] |0..1 |This resource is used to map 'powerSave' ModuleClass defined in clause [5.3.1.66](#53166-powersave). |
 |[variable] |&lt;flexContainer> as defined in the specialization [[airQualitySensor](#5316-airqualitysensor)] |0..1 |This resource is used to map 'airQualitySensor' ModuleClass defined in clause [5.3.1.6](#5316-airqualitysensor). |
 |[variable] |&lt;flexContainer> as defined in the specialization [[filterInfo](#53135-filterinfo)] |0..1 |This resource is used to map 'filterInfo' ModuleClass defined in clause [5.3.1.35](#53135-filterinfo). |
 |[variable] |&lt;subscription> |0..n |See clause 9.6.8 in oneM2M TS-0001 <a href="#_ref_i.3">[i.3]</a> |
 
 
 
-<mark>Editor's Note: Above table should be updated compliant to present structure of deviceAirConditioner.</mark>
+<mark>Editor's Note: Above table should be updated compliant to present structure of [deviceAirConditioner](#5541-deviceairconditioner).</mark>
 
 
 
-The [deviceAirConditioner] resource contains the attributes specified in Table A.2-3.
+The [[deviceAirConditioner](#5541-deviceairconditioner)] resource contains the attributes specified in Table A.2-3.
 
 
 **Table A.2-3: Attributes of [deviceAirConditioner] resource**
 
-|Attributes of <br />[deviceAirConditioner] |Multiplicity |RW/<br />RO/<br />WO |Description |
+|Attributes of [deviceAirConditioner] |Multiplicity |RW/RO/WO |Description |
 |-|-|-|-|
 |resourceType |1 |RO |See clause 9.6.1.3 in oneM2M TS-0001 <a href="#_ref_i.3">[i.3]</a>.  |
 |resourceID |1 |RO |See clause 9.6.1.3 in oneM2M TS-0001 <a href="#_ref_i.3">[i.3]</a>.  |
@@ -6815,7 +6906,7 @@ The [[binarySwitch](#53112-binaryswitch)] resource contains the child resource s
 
 |Child Resources of [binarySwitch] |Child Resource Type |Multiplicity |Description |
 |-|-|-|-|
-|[variable] |&lt;flexContainer> as defined in the specialization [toggle] |0..1 |This resource is used to map 'toggle' Action defined in Clause [5.3.1.12](#53112-binaryswitch). |
+|[variable] |&lt;flexContainer> as defined in the specialization [[toggle](#53112-binaryswitch)] |0..1 |This resource is used to map 'toggle' Action defined in Clause [5.3.1.12](#53112-binaryswitch). |
 |[variable] |&lt;subscription> |0..n |See clause 9.6.8 in oneM2M TS-0001 <a href="#_ref_i.3">[i.3]</a> |
 
 
@@ -6825,7 +6916,7 @@ The [[binarySwitch](#53112-binaryswitch)] resource contains the attributes speci
 
 **Table A.3-3: Attributes of [binarySwitch] resource**
 
-|Attributes of <br />[binarySwitch] |Multiplicity |RW/<br />RO/<br />WO |Description |
+|Attributes of [binarySwitch] |Multiplicity |RW/RO/WO |Description |
 |-|-|-|-|
 |resourceType |1 |RO |See clause 9.6.1.3 in oneM2M TS-0001 <a href="#_ref_i.3">[i.3]</a>  |
 |resourceID |1 |RO |See clause 9.6.1.3 in oneM2M TS-0001 <a href="#_ref_i.3">[i.3]</a>  |
@@ -6843,14 +6934,14 @@ The [[binarySwitch](#53112-binaryswitch)] resource contains the attributes speci
 |ontologyRef |0..1 |RW |See clause 9.6.35 in oneM2M TS-0001 <a href="#_ref_i.3">[i.3]</a> |
 |contentSize |1 |RO |See clause 9.6.35 in oneM2M TS-0001 <a href="#_ref_i.3">[i.3]</a>. |
 |nodeLink |0..1 |RW |Not applicable to a ModuleClass specialization. This attribute is not present in an instantiation of this resource. |
-|dataGenerationTime |0..1 |RO |See clause 6.2.3 |
-|powerState |1 |RW |See clause 5.3.1.12 |
+|dataGenerationTime |0..1 |RO |See clause [6.2.3](#623-resource-mapping-for-moduleclass). |
+|powerState |1 |RW |See clause [5.3.1.12](#53112-binaryswitch). |
 
 
 
 
 ## Annex A.4 Example of Action 'toggle'
-The [toggle] resource is used to share information regarding the modeled toggle as an Action. The [toggle] resource is a specialization of the &lt;flexContainer> resource.
+The [[toggle](#53112-binaryswitch)] resource is used to share information regarding the modeled toggle as an Action. The [[toggle](#53112-binaryswitch)] resource is a specialization of the &lt;flexContainer> resource.
 
 
 
@@ -6859,7 +6950,7 @@ The [toggle] resource is used to share information regarding the modeled toggle
 **Figure A.4-1: Structure of [toggle] resource**
 
 
-The [toggle] resource contains the child resource specified in Table A.4-2.
+The [[toggle](#53112-binaryswitch)] resource contains the child resource specified in Table A.4-2.
 
 
 **Table A.4-2: Child resources of [toggle] resource**
@@ -6870,12 +6961,12 @@ The [toggle] resource contains the child resource specified in Table A.4-2.
 
 
 
-The [toggle] resource contains the attributes specified in Table A.4-3.
+The [[toggle](#53112-binaryswitch)] resource contains the attributes specified in Table A.4-3.
 
 
 **Table A.4-3: Attributes of [toggle] resource**
 
-|Attributes of <br />[toggle] |Multiplicity |RW/<br />RO/<br />WO |Description |
+|Attributes of [toggle] |Multiplicity |RW/RO/WO |Description |
 |-|-|-|-|
 |resourceType |1 |RO |See clause 9.6.1.3 in oneM2M TS-0001 <a href="#_ref_i.3">[i.3]</a>  |
 |resourceID |1 |RO |See clause 9.6.1.3 in oneM2M TS-0001 <a href="#_ref_i.3">[i.3]</a>  |
@@ -6918,54 +7009,56 @@ This clause specifies the mapping relationship between oneM2M and OCF Devices.
 ### Annex B.2.2 Device Type Mapping
 The following table captures the equivalency mapping between OCF defined Device Types and oneM2M defined Devices. The minimum module sets for each oneM2M device is provided in this specification. The minimum resource sets for each OCF Device is provided in the OCF Device Specification <a href="#_ref_i.8">[i.8]</a>. 
 
+<mark>Editor's note: Numbering of table is wrong</mark>
+
 Table 7.1.38: OCF to oneM2M Device Type Mapping 
 
 
 |OCF Device Name |OCF Device Type |oneM2M Device |
 |-|-|-|
 |Active Speaker |oic.d.speaker |N/A |
-|Air Conditioner |oic.d.airconditioner |deviceAirConditioner |
-|Air Purifier |oic.d.airpurifier |deviceAirPurifier |
-|Air Quality Monitor |oic.d.airqualitymonitor |deviceAirQualityMonitor |
-|Battery |oic.d.battery |deviceStorageBattery |
-|Blind |oic.d.blind |deviceWindowShade |
-|Camera |oic.d.camera |deviceCamera |
-|Clothes Washer Dryer |oic.d.washerdryer |deviceClothesWasherDryer |
-|Coffee Machine |oic.d.coffeemachine |deviceCoffeeMachine |
-|Cooker Hood |oic.d.cookerhood |deviceCookerHood |
-|Cooktop |oic.d.cooktop |deviceCooktop |
-|Dehumidifier |oic.d.dehumidifier |deviceDehumidifier |
-|Dishwasher |oic.d.dishwasher |deviceDishWasher |
-|Door |oic.d.door |deviceDoor |
-|Dryer (Laundry) |oic.d.dryer |deviceClothesDryer |
-|Electric Vehicle Charger |oic.d.electricvehiclecharger |deviceElectricVehicleCharger |
-|Electric Meter |oic.d.electricmeter |deviceSmartElectricMeter |
-|Energy Generator |oic.d.energygenerator |deviceMicrogeneration |
-|Fan |oic.d.fan |deviceFan |
-|Food Probe |oic.d.foodprobe |deviceFoodProbe |
-|Freezer |oic.d.freezer |deviceFreezer |
-|Garage Door |oic.d.garagedoor |deviceDoor |
+|Air Conditioner |oic.d.airconditioner |[deviceAirConditioner](#5541-deviceairconditioner) |
+|Air Purifier |oic.d.airpurifier |[deviceAirPurifier](#5542-deviceairpurifier) |
+|Air Quality Monitor |oic.d.airqualitymonitor |[deviceAirQualityMonitor](#5512-deviceairqualitymonitor) |
+|Battery |oic.d.battery |[deviceStorageBattery](#55426-devicestoragebattery) |
+|Blind |oic.d.blind |[deviceWindowShade](#55429-devicewindowshade) |
+|Camera |oic.d.camera |[deviceCamera](#5514-devicecamera) |
+|Clothes Washer Dryer |oic.d.washerdryer |[deviceClothesWasherDryer](#5545-deviceclotheswasherdryer) |
+|Coffee Machine |oic.d.coffeemachine |[deviceCoffeeMachine](#5546-devicecoffeemachine) |
+|Cooker Hood |oic.d.cookerhood |[deviceCookerHood](#5547-devicecookerhood) |
+|Cooktop |oic.d.cooktop |[deviceCooktop](#5548-devicecooktop) |
+|Dehumidifier |oic.d.dehumidifier |[deviceDehumidifier](#5549-devicedehumidifier) |
+|Dishwasher |oic.d.dishwasher |[deviceDishWasher](#55411-devicedishwasher) |
+|Door |oic.d.door |[deviceDoor](#5515-devicedoor) |
+|Dryer (Laundry) |oic.d.dryer |[deviceClothesDryer](#5543-deviceclothesdryer) |
+|Electric Vehicle Charger |oic.d.electricvehiclecharger |[deviceElectricVehicleCharger](#5561-deviceelectricvehiclecharger) |
+|Electric Meter |oic.d.electricmeter |[deviceSmartElectricMeter](#5523-devicesmartelectricmeter) |
+|Energy Generator |oic.d.energygenerator |[deviceMicrogeneration](#55418-devicemicrogeneration) |
+|Fan |oic.d.fan |[deviceFan](#55412-devicefan) |
+|Food Probe |oic.d.foodprobe |[deviceFoodProbe](#55413-devicefoodprobe) |
+|Freezer |oic.d.freezer |[deviceFreezer](#55414-devicefreezer) |
+|Garage Door |oic.d.garagedoor |[deviceDoor](#5515-devicedoor) |
 |Generic Sensor |oic.d.sensor |N/A |
 |Grinder |oic.d.grinder |N/A |
-|Humidifier |oic.d.humidifier |deviceHumidifier |
-|Light |oic.d.light |deviceLight |
-|Oven |oic.d.oven |deviceOven |
-|Printer |oic.d.printer |devicePrinter |
-|Printer Multi-Function |oic.d.multifunctionprinter |deviceMultiFunctionPrinter |
-|Receiver |oic.d.receiver |deviceAudioReceiver |
-|Refrigerator |oic.d.refrigerator |deviceRefrigerator |
-|Robot Cleaner |oic.d.robotcleaner |deviceRobotCleaner |
-|Scanner |oic.d.scanner |deviceScanner |
-|Security Panel |oic.d.securitypanel |deviceSecurityPanel |
-|Set Top Box |oic.d.stb |deviceSetTopBox |
-|Smart Lock |oic.d.smartlock |deviceDoorLock |
-|Smart Plug |oic.d.smartplug |deviceSmartPlug |
-|Switch |oic.d.switch |deviceSwitch |
-|Television |oic.d.tv |deviceTelevision |
-|Thermostat |oic.d.thermostat |deviceThermostat |
-|Washer (Laundry) |oic.d.washer |deviceClothesWasher |
-|Water Heater |oic.d.waterheater |deviceWaterHeater |
-|Water Valve |oic.d.watervalve |deviceWaterValve |
+|Humidifier |oic.d.humidifier |[deviceHumidifier](#55416-devicehumidifier) |
+|Light |oic.d.light |[deviceLight](#5517-devicelight) |
+|Oven |oic.d.oven |[deviceOven](#55419-deviceoven) |
+|Printer |oic.d.printer |[devicePrinter](#5519-deviceprinter) |
+|Printer Multi-Function |oic.d.multifunctionprinter |[deviceMultiFunctionPrinter](#5518-devicemultifunctionprinter) |
+|Receiver |oic.d.receiver |[deviceAudioReceiver](#5513-deviceaudioreceiver) |
+|Refrigerator |oic.d.refrigerator |[deviceRefrigerator](#55420-devicerefrigerator) |
+|Robot Cleaner |oic.d.robotcleaner |[deviceRobotCleaner](#55422-devicerobotcleaner) |
+|Scanner |oic.d.scanner |[deviceScanner](#55110-devicescanner) |
+|Security Panel |oic.d.securitypanel |[deviceSecurityPanel](#55423-devicesecuritypanel) |
+|Set Top Box |oic.d.stb |[deviceSetTopBox](#55424-devicesettopbox) |
+|Smart Lock |oic.d.smartlock |[deviceDoorLock](#5516-devicedoorlock) |
+|Smart Plug |oic.d.smartplug |[deviceSmartPlug](#55111-devicesmartplug) |
+|Switch |oic.d.switch |[deviceSwitch](#55112-deviceswitch) |
+|Television |oic.d.tv |[deviceTelevision](#55427-devicetelevision) |
+|Thermostat |oic.d.thermostat |[deviceThermostat](#55114-devicethermostat) |
+|Washer (Laundry) |oic.d.washer |[deviceClothesWasher](#5544-deviceclotheswasher) |
+|Water Heater |oic.d.waterheater |[deviceWaterHeater](#55428-devicewaterheater) |
+|Water Valve |oic.d.watervalve |[deviceWaterValve](#55115-devicewatervalve) |
 |Window |oic.d.window |N/A |
 
 
@@ -6980,7 +7073,7 @@ The present clause explains how to use SDT as one of the rules for design of con
 
 There are several benefits of using SDT in content attribute.
 
-First, the resource architecture can be more simple than the one using &lt;flexContainer>s. When using &lt;flexContainer>s, universal attributes are mapped either into attributes of [deviceInfo] under a &lt;node> besides &lt;flexContainer>s, or into custom attributes of [dmDeviceInfo] under a [flexNode] (See Rule 1-8 in clause 6.2.2). Moreover, Action Class and DataPoint Class are the same layer in SDT, but Action Class is mapped to &lt;flexContainer> itself and DataPoint Class is mapped to attributes of &lt;flexContainer> expressing Module class. On the other hand, Using SDT in content attribute means using only one &lt;contentInstance> or &lt;timeSeriesInstance> so the resource architecture is simple.
+First, the resource architecture can be more simple than the one using &lt;flexContainer>s. When using &lt;flexContainer>s, universal attributes are mapped either into attributes of [deviceInfo] under a &lt;node> besides &lt;flexContainer>s, or into custom attributes of [[dmDeviceInfo]](#584-dmdeviceinfo) under a [[flexNode](#582-flexnode)] (see Rule 1-8 in clause [6.2.2](#622-resource-mapping-for-device-model)). Moreover, Action Class and DataPoint Class are the same layer in SDT, but Action Class is mapped to &lt;flexContainer> itself and DataPoint Class is mapped to attributes of &lt;flexContainer> expressing Module class. On the other hand, Using SDT in content attribute means using only one &lt;contentInstance> or &lt;timeSeriesInstance> so the resource architecture is simple.
 
 Relating this benefit, it becomes easy to understand where to write information.
 
@@ -7137,7 +7230,7 @@ Any size of the SDT class cluster may be mapped to content attribute. For exampl
 
 ![Mapping SDT to content attribute](media/Mapping_SDT_to_content_attribute.png)
 
-**Figure C4: Image of Mapping SDT to content attribute**
+**Figure C.4-1: Image of Mapping SDT to content attribute**
 An example that expresses a CREATE request for &lt;contentInstance> serialized into an XML document is shown below. This example is for the Module class and DataPoint class mapping and only content attribute and contentInfo attribute are shown as content parameter (pc).
 
 ```XML
@@ -7192,17 +7285,18 @@ In this case, contentInfo attribute can NOT be omitted because we cannot underst
 If a contentInfo attribute is not used, content attribute may change as follows:
 
 ```XML
-
-            <con>
-                <curT0>5</curT0>
-            </con>
+<con>
+    <curT0>5</curT0>
+</con>
 ```
 
 
 
 # Annex D History
 
-|Publication history |Publication history |Publication history |
+**Publication history**
+
+| Version | Date       | Description             |
 |-|-|-|
 |V2.0.0 |2016-08-30 |Release 2 - Publication |
 | | | |
@@ -7212,22 +7306,14 @@ If a contentInfo attribute is not used, content attribute may change as follows:
 
 
 
+**Draft history (to be removed on publication)**
 
 
-
-
-
-|Draft history (to be removed on publication) |Draft history (to be removed on publication) |Draft history (to be removed on publication) |
-|-|-|-|
-|V 5.0.0 |2021-04-06 |TS-0023 adaptation to Release 5 (v4.8.0  v5.0.0) |
-|V5.1.0 |2021-12-02 |RDM-2021-0067-TS-0023_Metadata<br />RDM-2021-0093-SDT-issues-identified_in_TDE_R5 |
-|V5.2.0 |2022-07-15 |Reflecting comments from issues tracker. see link https://git.onem2m.org/issues/issues/-/issues?scope=all&utf8=%E2%9C%93&state=opened&search=rdm |
-|V5.3.0 |2022-09-28 |RDM-2022-0017R03-Proposed_changes_to_TS-0023_for_WI_0109<br />RDM-2022-0031R01-Adding_a_heater_device_to_TS-0023<br />RDM-2022-0045R01-TS-0023_PropertyNames_rel-5<br />RDM-2022-0051-Adding_the_remoteControlEnable_Module_to_the_deviceRobotCleaner_Device<br />RDM-2022-0052R01-Adding_a_new_Device_model_deviceJuicer_to_TS-0023<br />RDM-2022-0053R01-Adding_a_new_Device_model_deviceShoesWasher_to_TS-0023<br />RDM-2022-0055-Adding_an_electric motorcycle_device_to_TS-0023 |
-|V5.4.0 |2022-11-28 |RDM-2022-0062-TS-0023_v5_1_0_add_Public_Safety_Domain_clause<br />RDM-2022-0070R01-Updating_an_elelctric_motorcycle_device_information_model<br />RDM-2022-0075-TS-0023_v5_2_0_add_SDT_defitions_for_Public_Safety_Domain |
-|V5.5.0 |2023-04-20 |RDM-2023-0020-TS-0023_Moving_SubDeviceCuff_to_health_domain_(R5)<br />RDM-2023-0021-Adding_rule_for_FlexContainerInstance_specialization_naming_(R5)<br />RDM-2023-0022-TS-0023_Clarification_for_naming_elements_(R5)<br />RDM-2023-0023-TS-0023_Correcting_units_of_measure_(R5) |
-
-
-
-TODO akr:
-
-- Link chapters
+| Version | Date       | Description                                                  |
+| ------- | ---------- | ------------------------------------------------------------ |
+| V 5.0.0 | 2021-04-06 | TS-0023 adaptation to Release 5 (v4.8.0  v5.0.0)             |
+| V5.1.0  | 2021-12-02 | RDM-2021-0067-TS-0023_Metadata<br />RDM-2021-0093-SDT-issues-identified_in_TDE_R5 |
+| V5.2.0  | 2022-07-15 | Reflecting comments from issues tracker. see link https://git.onem2m.org/issues/issues/-/issues?scope=all&utf8=%E2%9C%93&state=opened&search=rdm |
+| V5.3.0  | 2022-09-28 | RDM-2022-0017R03-Proposed_changes_to_TS-0023_for_WI_0109<br />RDM-2022-0031R01-Adding_a_heater_device_to_TS-0023<br />RDM-2022-0045R01-TS-0023_PropertyNames_rel-5<br />RDM-2022-0051-Adding_the_remoteControlEnable_Module_to_the_deviceRobotCleaner_Device<br />RDM-2022-0052R01-Adding_a_new_Device_model_deviceJuicer_to_TS-0023<br />RDM-2022-0053R01-Adding_a_new_Device_model_deviceShoesWasher_to_TS-0023<br />RDM-2022-0055-Adding_an_electric motorcycle_device_to_TS-0023 |
+| V5.4.0  | 2022-11-28 | RDM-2022-0062-TS-0023_v5_1_0_add_Public_Safety_Domain_clause<br />RDM-2022-0070R01-Updating_an_elelctric_motorcycle_device_information_model<br />RDM-2022-0075-TS-0023_v5_2_0_add_SDT_defitions_for_Public_Safety_Domain |
+| V5.5.0  | 2023-04-20 | RDM-2023-0020-TS-0023_Moving_SubDeviceCuff_to_health_domain_(R5)<br />RDM-2023-0021-Adding_rule_for_FlexContainerInstance_specialization_naming_(R5)<br />RDM-2023-0022-TS-0023_Clarification_for_naming_elements_(R5)<br />RDM-2023-0023-TS-0023_Correcting_units_of_measure_(R5) |