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 74b12f9bb47898bb7fb5230f61c8ac991d31dda9..3d7573db05a7406753073c33e6b1ab02e2d97bb4 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
@@ -238,7 +238,7 @@ When the Harmonized Information Model is described based on SDT, the following r
- 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).
+ - DataPoint shall be used to represent stateless operations. (e.g. *state* of [binarySwitch](#53112-binaryswitch) for on/off operations).
- 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:
@@ -1217,7 +1217,7 @@ This ModuleClass describes the capabilities on an impact sensor. The impact is a
#### 5.3.1.48 keepWarm
-This module allows to control the 'keep warm' feature in devices like coffee machines, kettles etc. It allows to keep water warm for a desired time. This ModuleClass inherits from [binarySwitch](#53112-binaryswitch) (see clause [5.3.1.12](#53112-binaryswitch)) to store setting for the 'keep warm' feature. If the "powerState" data point in a keepWarmSwitch is "True" then the 'keep warm' function will be performed just after boiling (or heating) process is finished (otherwise this function will not be applied).
+This module allows to control the 'keep warm' feature in devices like coffee machines, kettles etc. It allows to keep water warm for a desired time. This ModuleClass inherits from [binarySwitch](#53112-binaryswitch) (see clause [5.3.1.12](#53112-binaryswitch)) to store setting for the 'keep warm' feature. If the "state" data point in a keepWarmSwitch is "True" then the 'keep warm' function will be performed just after boiling (or heating) process is finished (otherwise this function will not be applied).
**Table 5.3.1.48-1: DataPoints of keepWarm ModuleClass**
@@ -6340,7 +6340,6 @@ In protocol bindings resource attributes names for data points of module classes
|power |[energyConsumption](#53132-energyconsumption) |power |
|powerGenerationData |[energyGeneration](#53133-energygeneration) |poGDa |
|powerSaveEnabled |[powerSave](#53166-powersave) |poSEd |
-|powerState |[binarySwitch](#53112-binaryswitch) |powSe |
|powerStatus |[dmAgent](#582-dmagent) |powSs |
|precision |[features](#5391-features) |precn |
|presentationURL |[dmDeviceInfo](#583-dmdeviceinfo) |prURL |
@@ -6400,7 +6399,7 @@ In protocol bindings resource attributes names for data points of module classes
|spinLevelStrength |[spinLevel](#53184-spinlevel) |spLSh |
|spinSpeed |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |spiSd |
|startPause |[operationMode](#53157-operationmode) |staPe |
-|state |[dmAgent](#582-dmagent), [dmPackage](#588-dmpackage), [dmFirmware](#585-dmfirmware) |state |
+|state |[dmAgent](#582-dmagent), [dmPackage](#588-dmpackage), [dmFirmware](#585-dmfirmware), [binarySwitch](#53112-binaryswitch) |state |
|status |[boiler](#53115-boiler), [dmEventLog](#587-dmeventlog), [electricVehicleConnector](#53131-electricvehicleconnector), [faultDetection](#53134-faultdetection), filterInf, [mediaSelect](#53153-mediaselect) |sus |
|steamTreat |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |steTt |
|step |[numberValue](#53155-numbervalue) |step |
@@ -6626,7 +6625,7 @@ The [device3DPrinter](#5511-device3dprinter) of HAIM shall be mapped to 3D print
|ModuleClass |Data Points of oneM2M HAIM |data objects of OMA DWAPI-3DP |Description |
|-|-|-|-|
-|[binarySwitch](#53112-binaryswitch) |powerState |- |See clause [5.3.1.12](#53112-binaryswitch).<br />The powerState is not supported in OMA DWAPI-3DP data object. The power state is assumed power-on in OMA DWAPI-3DP. |
+|[binarySwitch](#53112-binaryswitch) |state |- |See clause [5.3.1.12](#53112-binaryswitch).<br />The "state" is not supported in OMA DWAPI-3DP data object. The power state is assumed power-on in OMA DWAPI-3DP. |
|[faultDetection](#53134-faultdetection) |code |operatingStatus |See clause [5.3.1.34](#53134-faultdetection).<br />It shall be the integer type at HAIM, but shall be the string type at OMA DWAPI-3DP. See the Table 7.1.2-2 . |
|[threeDprinter](#5311-threedprinter) |printType |printType |See clause [5.3.1.1](#5311-threedprinter). |
|[threeDprinter](#5311-threedprinter) |printSizeX |printSizeX |See clause [5.3.1.1](#5311-threedprinter). |
@@ -6936,7 +6935,7 @@ The [[binarySwitch](#53112-binaryswitch)] resource contains the attributes speci
|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](#623-resource-mapping-for-moduleclass). |
-|powerState |1 |RW |See clause [5.3.1.12](#53112-binaryswitch). |
+|state |1 |RW |See clause [5.3.1.12](#53112-binaryswitch). |
@@ -7112,7 +7111,7 @@ Below is the example for deviceThreeDPrinter:
```XML
<deviceThreeDPrinter>
<binarySwitch>
- <powerState>True</powerState>
+ <state>True</state>
<toggle></toggle>
</binarySwitch>
<faultDetection>
@@ -7181,7 +7180,7 @@ Below is the example for deviceThreeDPrinter:
{
"deviceThreeDPrinter": {
"binarySwitch": {
- "powerState": true
+ "state": true
},
"faultDetection": {
"status": false,