diff --git a/3.7.0/SDT-TS0023-Devices.xml b/3.7.0/SDT-TS0023-Devices.xml
index 19ad30941c1420c2e128c9c8ac7348c9b7dec76e..4e0d767f642ef9d4954c2cf39c91fd40d7920704 100644
--- a/3.7.0/SDT-TS0023-Devices.xml
+++ b/3.7.0/SDT-TS0023-Devices.xml
@@ -49,7 +49,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				</Module>
 				<Module name="temperature" optional="false">
 					<extends domain="org.onem2m.home.moduleclass" class="temperature"/>
-					<Doc>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.</Doc>
+					<Doc>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 1 000,0.</Doc>
 				</Module>
 				<Module name="printQueue" optional="false">
 					<extends domain="org.onem2m.home.moduleclass" class="printQueue"/>
@@ -86,7 +86,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				</Module>
 				<Module name="sleepTimer" optional="true">
 					<extends domain="org.onem2m.home.moduleclass" class="timer"/>
-					<Doc>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.</Doc>
+					<Doc>The sleep function, which is vendor-specific algorithm (for example increasing the temperature 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.</Doc>
 				</Module>
 				<Module name="turbo" optional="true">
 					<extends domain="org.onem2m.home.moduleclass" class="turbo"/>
@@ -501,7 +501,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 
 		<Device id="deviceDoor">
-			<Doc>A door is a device that is used to open and close a door.</Doc>
+			<Doc>A deviceDoor is a device that is used to open and close a door.</Doc>
 			<Modules>
 				<Module name="openLevel" optional="true">
 					<extends domain="org.onem2m.home.moduleclass" class="openLevel"/>
@@ -611,7 +611,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 
 		<Device id="deviceHomeCCTV">
-			<Doc>A home CCTV is a smart home appliance to provide monitoring capabilities when people stay way from their home or a room, or to monitor the environmental status of their home or room.</Doc>
+			<Doc>A home CCTV is a smart home appliance to provide monitoring capabilities when people stay away from their home or a room, or to monitor the environmental status of their home or room.</Doc>
 			<Modules>
 				<Module name="binarySwitch" optional="false">
 					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
@@ -824,11 +824,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<Modules>
 				<Module name="pulsemeter" optional="true">
 					<extends domain="org.onem2m.home.moduleclass" class="pulsemeter"/>
-					<Doc>When the "oximeter" module doesn’t exist, then the "pulsemeter" module is mandatory.</Doc>
+					<Doc>When the "oximeter" module does not exist, then the "pulsemeter" module is mandatory.</Doc>
 				</Module>
 				<Module name="oximeter" optional="true">
 					<extends domain="org.onem2m.home.moduleclass" class="oximeter"/>
-					<Doc>When the "pulsemeter" module doesn’t exist, then the "oximeter" module is mandatory.</Doc>
+					<Doc>When the "pulsemeter" module does not exist, then the "oximeter" module is mandatory.</Doc>
 				</Module>
 				<Module name="battery" optional="false">
 					<extends domain="org.onem2m.home.moduleclass" class="battery"/>
@@ -857,7 +857,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				</Module>
 				<Module name="customTemperature" optional="true">
 					<extends domain="org.onem2m.home.moduleclass" class="temperature"/>
-					<Doc>This module can be configured to fridge temperature or frozen temperature based on its usage by manufacturer</Doc>
+					<Doc>This module can be configured to fridge temperature or frozen temperature based on its usage by manufacturer.</Doc>
 				</Module>
 				<Module name="refrigeration" optional="true">
 					<extends domain="org.onem2m.home.moduleclass" class="refrigeration"/>
@@ -914,7 +914,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 
 		<Device id="deviceSecurityPanel">
-			<Doc>A security pannel is a device that can change the security mode of, for example, an alarm system.</Doc>
+			<Doc>A security panel is a device that can change the security mode of, for example, an alarm system.</Doc>
 			<Modules>
 				<Module name="securityMode" optional="false">
 					<extends domain="org.onem2m.home.moduleclass" class="securityMode"/>
@@ -946,7 +946,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 
 		<Device id="deviceSmartElectricMeter">
-			<Doc>A smart electric meter is a metering device that is used to measure consumption data for electrictricity.</Doc>
+			<Doc>A smart electric meter is a metering device that is used to measure consumption data for electricity.</Doc>
 			<Modules>
 				<Module name="faultDetection" optional="true">
 					<extends domain="org.onem2m.home.moduleclass" class="faultDetection"/>
diff --git a/3.7.0/SDT-TS0023-ModuleClasses.xml b/3.7.0/SDT-TS0023-ModuleClasses.xml
index 203d5d9d1119b06790f6236a25b5757cb34816d6..a70ff3aa5f686753c3e1b4c370e5d62b49201976 100644
--- a/3.7.0/SDT-TS0023-ModuleClasses.xml
+++ b/3.7.0/SDT-TS0023-ModuleClasses.xml
@@ -44,13 +44,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>
 				<DataPoint name="printSizeX" readable="true" writable="false" eventable="true" optional="false" >
-					<Doc>This data pointrepresents the maximum size of a printing object in the direction of X-axis. The unit of measure is "mm". (1/10cm).</Doc>
+					<Doc>This data point represents the maximum size of a printing object in the direction of X-axis. The unit of measure is "mm". (1/10cm).</Doc>
 					<DataType>
 						<SimpleType type="float" />
 					</DataType>
 				</DataPoint>
 				<DataPoint name="printSizeY" readable="true" writable="false" eventable="true" optional="false" >
-					<Doc>This data poin represents the maximum size of printing object in the direction of Y-axis. The unit of measure is "mm". (1/10cm).</Doc>
+					<Doc>This data point represents the maximum size of printing object in the direction of Y-axis. The unit of measure is "mm". (1/10cm).</Doc>
 					<DataType>
 						<SimpleType type="float" />
 					</DataType>
@@ -129,7 +129,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<Doc>This ModuleClass provides capabilities for controlling the air flow of a device.</Doc>
 			<Data>
 				<DataPoint name="speed" readable="true" writable="false" eventable="true" optional="false" >
-					<Doc>The current speed level in the range of the [minSpeed, maxSpeed] data poins.</Doc>
+					<Doc>The current speed level in the range of the [minSpeed, maxSpeed] data points.</Doc>
 					<DataType>
 						<SimpleType type="integer" />
 					</DataType>
@@ -227,7 +227,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>
 				<DataPoint name="sensorPM2" readable="true" writable="false" eventable="true" optional="true" >
-					<Doc>The concentration of particle matter under 2.5um. The minimum value is 0, and the maximum value is 1000.</Doc>
+					<Doc>The concentration of particle matter under 2,5um. The minimum value is 0, and the maximum value is 1000.</Doc>
 					<DataType>
 						<SimpleType type="integer" />
 					</DataType>
@@ -239,7 +239,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>
 				<DataPoint name="sensorOdor" readable="true" writable="false" eventable="true" optional="true" >
-					<Doc>The concentration of odor that reflects air pollution. The minimum value is 0, and the maximum value is 1000.</Doc>
+					<Doc>The concentration of odor that reflects air pollution. The minimum value is 0, and the maximum value is 1 000.</Doc>
 					<DataType>
 						<SimpleType type="integer" />
 					</DataType>
@@ -251,7 +251,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>
 				<DataPoint name="monitoringEnabled" readable="true" writable="true" eventable="true" optional="true" >
-					<Doc>The current status of monitoring. "True" indicates enabled, and "False" indicates not enabled..</Doc>
+					<Doc>The current status of monitoring. "True" indicates enabled, and "False" indicates not enabled.</Doc>
 					<DataType>
 						<SimpleType type="boolean" />
 					</DataType>
@@ -535,7 +535,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<Doc>This ModuleClass provides the capability to report the measurement of a body composition analyser.</Doc>
 			<Data>
 				<DataPoint name="bodyLength" readable="true" writable="false" eventable="true" optional="true" >
-					<Doc>The measurement of body length by Weight scale and Body composition analyser. The unit of measure is centimeter(cm)..</Doc>
+					<Doc>The measurement of body length by Weight scale and Body composition analyser. The unit of measure is centimetre(cm)..</Doc>
 					<DataType>
 						<SimpleType type="float" />
 					</DataType>
@@ -613,7 +613,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
    
 		<ModuleClass name="brightness">
-			<Doc>This ModuleClass provides capabilities to control and monitor the brightness of a light for example from a lamp. Brightness is scaled as a percentage. A lamp or a monitor can be adjusted to a level of light between very dim (0% is the minimum brightness) and very bright (100% is the maximum brightness).</Doc>
+			<Doc>This ModuleClass provides capabilities to control and monitor the brightness of a light for example from a lamp. Brightness is scaled as a percentage. A lamp or a monitor can be adjusted to a level of light between very dim (0 % is the minimum brightness) and very bright (100 % is the maximum brightness).</Doc>
 			<Data>
 				<DataPoint name="brightness" readable="true" writable="true" eventable="true" optional="false">
 					<Doc>The status of brightness level in percentage.</Doc>
@@ -808,10 +808,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 
 		<ModuleClass name="colourSaturation">
-			<Doc>This ModuleClass provides cababilities to control and monitor a colour saturation value.</Doc>
+			<Doc>This ModuleClass provides capabilities to control and monitor a colour saturation value.</Doc>
 			<Data>
 				<DataPoint name="colourSaturation" readable="true" writable="true" eventable="true" optional="false">
-					<Doc>The status of colour saturation level. "colourSaturation" has a range of [0,100]. A "colourSaturation" value of 0 means that a device displays or produces black and white images. A "colourSaturation" value of 50 means that a  device displays or produces normal colour images. A "colourSaturation" value of 100 means that a device displays or produces very colourfull images.</Doc>
+					<Doc>The status of colour saturation level. "colourSaturation" has a range of [0,100]. A "colourSaturation" value of 0 means that a device displays or produces black and white images. A "colourSaturation" value of 50 means that a  device displays or produces normal colour images. A "colourSaturation" value of 100 means that a device displays or produces very colourful images.</Doc>
 					<DataType>
 						<SimpleType type="integer" />
 					</DataType>
@@ -1012,7 +1012,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>
 				<DataPoint name="multiplyingFactors" readable="true" writable="false" eventable="true" optional="true">
-					<Doc>The unit for data multiplying factors, for example 1 kWh, 0,1 kWh, 0,01 kWh etc.</Doc>
+					<Doc>The unit for data multiplying factors, for example 1 kWh, 0,1 kWh, 0,01 kWh, etc.</Doc>
 					<DataType>
 						<SimpleType type="integer" />
 					</DataType>
@@ -1049,7 +1049,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<Doc>This ModuleClass provides information about generation data on electric generator devices such as a photo voltaic power system, fuel cells, or microgeneration</Doc>
 			<Data>
 				<DataPoint name="powerGenerationData" readable="true" writable="false" eventable="true" optional="true">
-					<Doc>Amount of instaneous generation data.  The unit of measure is Watt (W).</Doc>
+					<Doc>Amount of instantaneous generation data. The unit of measure is Watt (W).</Doc>
 					<DataType>
 						<SimpleType type="float" />
 					</DataType>
@@ -1067,7 +1067,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>
 				<DataPoint name="multiplyingFactors" readable="true" writable="false" eventable="true" optional="true">
-					<Doc>The unit for data multiplying factors, for example. 1 kWh, 0,1 kWh, 0,01 kWh etc.</Doc>
+					<Doc>The unit for data multiplying factors, for example. 1 kWh, 0,1 kWh, 0,01 kWh, etc.</Doc>
 					<DataType>
 						<SimpleType type="integer" />
 					</DataType>
@@ -1167,7 +1167,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>
 				<DataPoint name="heading" readable="true" writable="true" eventable="true" optional="true" >
-					<Doc>The azimuth of a device measured in degrees to true north. North is 0.0 degrees, east is 90.0 degrees, south is 180.0 degrees, west is 270.0 degrees. A negative value indicates an unknown heading.</Doc>
+					<Doc>The azimuth of a device measured in degrees to true north. North is 0,0°, east is 90,0°, south is 180,0°, west is 270,0°. A negative value indicates an unknown heading.</Doc>
 					<DataType>
 						<SimpleType type="float" />
 					</DataType>
@@ -1252,7 +1252,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>
 				<DataPoint name="contextMeal" readable="true" writable="false" eventable="true" optional="true" >
-					<Doc>The style of meals (for examople "casual").</Doc>
+					<Doc>The style of meals (for example "casual").</Doc>
 					<DataType>
 						<SimpleType type="string" />
 					</DataType>
@@ -1354,7 +1354,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<Doc>This ModuleClass describes the capabilities on an impact sensor. The impact is a high force or shock over a short time period and the impactSensor detects this.</Doc>
 			<Data>
 				<DataPoint name="impactStatus" readable="true" writable="false" eventable="true" optional="false" >
-					<Doc>The "impactStatus" indicates as follows: "True"  means that a physical impact is detected, "False" means indicates a normal status (no impact detected).</Doc>
+					<Doc>The "impactStatus" indicates as follows: "True" means that a physical impact is detected, "False" means indicates a normal status (no impact detected).</Doc>
 					<DataType>
 						<SimpleType type="boolean" />
 					</DataType>
@@ -1366,7 +1366,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>
 				<DataPoint name="impactDirectionHorizontal" readable="true" writable="false" eventable="true" optional="true" >
-					<Doc>The "impactDirection" indicates the horizontal direction where the impact comes from. The value is 0° to 360°. 0 is the front of the sensor and with clockwise increment. </Doc>
+					<Doc>The "impactDirection" indicates the horizontal direction where the impact comes from. The value is 0° to 360°. 0 is the front of the sensor and with clockwise increment.</Doc>
 					<DataType>
 						<SimpleType type="float" />
 					</DataType>
@@ -1382,7 +1382,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 
 		<ModuleClass name="keepWarm">
-			<Doc>This module allows to control the ‘keep warm’ feature in devices like coffe machines, kettles etc. It allows to keep water warm for a desired time. This ModuleClass inherits from binarySwitch (see clause 5.3.12) 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).</Doc>
+			<Doc>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 (see clause 5.3.12) 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).</Doc>
 			<Data>
 				<DataPoint name="time" readable="true" writable="true" eventable="true" optional="true" >
 					<Doc>The desired duration of ‘keep water warm’ function. It indicates how long water shall be kept warm, for example after the boiling in a kettle. The value indicates a time expressed in minutes.</Doc>
@@ -1408,7 +1408,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 
 		<ModuleClass name="liquidLevel">
-			<Doc>This ModuleClass provides the desired level of water (or other liquid)  for an appliance, for example the desired level of milk for a cup of coffee from a coffee machine.</Doc>
+			<Doc>This ModuleClass provides the desired level of water (or other liquid) for an appliance, for example the desired level of milk for a cup of coffee from a coffee machine.</Doc>
 			<Data>
 				<DataPoint name="liquidLevel" readable="true" writable="true" eventable="true" optional="false" >
 					<Doc>The desired level of water or other liquid, for example the desired level of milk in a cup of coffee (see clause 5.6.19).</Doc>
@@ -1497,7 +1497,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>
 				<DataPoint name="silentTime" readable="true" writable="true" eventable="true" optional="true">
-					<Doc>The time that a motionSensor restrains from sending an alarm in case continous motions are detected after one alarm is produced. This data point can be used to avoid repeated alarm reports. The unit of measure is seconds.</Doc>
+					<Doc>The time that a motionSensor restrains from sending an alarm in case continuous motions are detected after one alarm is produced. This data point can be used to avoid repeated alarm reports. The unit of measure is seconds.</Doc>
 					<DataType>
 						<SimpleType type="integer" />
 					</DataType>
@@ -1545,13 +1545,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>
 				<DataPoint name="defaultValue" readable="true" writable="true" eventable="true" optional="true" >
-					<Doc>The optional default value for the number. The default is 0.0 .</Doc>
+					<Doc>The optional default value for the number. The default is 0,0.</Doc>
 					<DataType>
 						<SimpleType type="float" />
 					</DataType>
 				</DataPoint>
 				<DataPoint name="step" readable="true" writable="true" eventable="true" optional="true" >
-					<Doc>The optional step size for controlled increment and decrement. The default is 1.0, even when this data point is not implemeneted.</Doc>
+					<Doc>The optional step size for controlled increment and decrement. The default is 1,0, even when this data point is not implemented.</Doc>
 					<DataType>
 						<SimpleType type="float" />
 					</DataType>
@@ -1667,7 +1667,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>
 				<DataPoint name="ozoneStatus" readable="true" writable="false" eventable="true" optional="true" >
-					<Doc>The ozoneStatus indicates the level of ozone status. (see clause 5.6.21).</Doc>
+					<Doc>The ozoneStatus indicates the level of ozone status. (See clause 5.6.21).</Doc>
 					<DataType>
 						<SimpleType type="hd:enumOzoneStatus" />
 					</DataType>
@@ -1683,7 +1683,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 
 		<ModuleClass name="phoneCall">
-			<Doc>This ModuleClass provides the capability get or set the caller and receipient IDs as well as to initate and terminate a call.</Doc>
+			<Doc>This ModuleClass provides the capability get or set the caller and recipient IDs as well as to initiate and terminate a call.</Doc>
 			<Actions>
 				<Action name="call" optional="true">
 					<Doc>Initiate an outgoing call.</Doc>
@@ -1697,7 +1697,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			</Actions>
 			<Data>
 				<DataPoint name="callerID" readable="true" writable="true" eventable="true" optional="false" >
-					<Doc>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.</Doc>
+					<Doc>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 incoming call, then the caller ID is unknown. When it is empty for an outgoing call, then it is expected that it is set by the PBX or the operator. The format of caller ID is not specified here.</Doc>
 					<DataType>
 						<SimpleType type="string" />
 					</DataType>
@@ -1778,7 +1778,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<Doc>This ModuleClass provides the capabilities for monitoring printing list information.</Doc>
 			<Data>
 				<DataPoint name="uri" readable="true" writable="false" eventable="true" optional="false" >
-					<Doc>The URI of the printing file. The URI could be "file://www.example.com/file.extension"</Doc>
+					<Doc>The URI of the printing file. The URI could be "file://www.example.com/file.extension".</Doc>
 					<DataType>
 						<Array>
 							<DataType>
@@ -1817,7 +1817,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>
 				<DataPoint name="energy" readable="true" writable="false" eventable="true" optional="true" >
-					<Doc>The measurement of energy by pulsemeter. The unit of mease is kilocalorie per hour.</Doc>
+					<Doc>The measurement of energy by pulsemeter. The unit of measure is kilocalorie per hour.</Doc>
 					<DataType>
 						<SimpleType type="float" />
 					</DataType>
@@ -2013,7 +2013,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 
 		<ModuleClass name="sessionDescription">
-			<Doc>This ModuleClass provides the capabilities for a sessionDescription containing a URL at twhich the specified media can be accessed and the definition of media using SDP.</Doc>
+			<Doc>This ModuleClass provides the capabilities for a sessionDescription containing a URL at which the specified media can be accessed and the definition of media using SDP.</Doc>
 			<Data>
 				<DataPoint name="url" readable="true" writable="false" eventable="true" optional="true" >
 					<Doc>A URL at which the specified media can be accessed.</Doc>
@@ -2022,7 +2022,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>
 				<DataPoint name="sdp" readable="true" writable="false" eventable="true" optional="true" >
-					<Doc>Media description using SDP. One or more comma separated multiple SDP lines (SDP media or attribute line) can be included using SDP description syntax as defined in the SDP specification in RFC4566.</Doc>
+					<Doc>Media description using SDP. One or more comma separated multiple SDP lines (SDP media or attribute line) can be included using SDP description syntax as defined in the SDP specification in IETF RFC4566.</Doc>
 					<DataType>
 						<SimpleType type="string" />
 					</DataType>
@@ -2065,8 +2065,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<SimpleType type="datetime" />
 					</DataType>
 				</DataPoint>
-				<DataPoint name="smokeThreshhold" readable="true" writable="true" eventable="true" optional="true" >
-					<Doc>The threshhold to trigger the alarm. The unit of measure is ppm.</Doc>
+				<DataPoint name="smokeThreshold" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The threshold to trigger the alarm. The unit of measure is ppm.</Doc>
 					<DataType>
 						<SimpleType type="integer" />
 					</DataType>
@@ -2120,7 +2120,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 
 		<ModuleClass name="steamClosetJobMode">
-			<Doc>This ModuleClasses provides capabilities to control and monitor the job modes of steamCloset.</Doc>
+			<Doc>This ModuleClass provides capabilities to control and monitor the job modes of steamCloset.</Doc>
 			<Data>
 				<DataPoint name="currentJobMode" readable="true" writable="true" eventable="true" optional="false" >
 					<Doc>Currently active job mode (see clause 5.6.26).</Doc>
@@ -2166,7 +2166,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>				
 				<DataPoint name="availableChannels" readable="true" writable="false" eventable="true" optional="true">
-					<Doc>The list of available channel numbers which may be build by automatic scan and/or manual selction.</Doc>
+					<Doc>The list of available channel numbers which may be built by automatic scan and/or manual selection.</Doc>
 					<DataType>
 						<Array>
 							<DataType>
@@ -2192,7 +2192,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 
 		<ModuleClass name="temperature">
-			<Doc>This ModuleClass provides capabilities to represent the current temperature and target temperature of devices such as an air conditioner, refrigerator, oven and etc.</Doc>
+			<Doc>This ModuleClass provides capabilities to represent the current temperature and target temperature of devices such as an air conditioner, refrigerator, oven, etc.</Doc>
 			<Data>
 				<DataPoint name="currentTemperature" readable="true" writable="false" eventable="true" optional="false">
 					<Doc>The current temperature.</Doc>
@@ -2207,7 +2207,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>				
 				<DataPoint name="unit" readable="true" writable="false" eventable="true" optional="true">
-					<Doc>The unit of measure for the temperature values. The default is celsius (C).</Doc>
+					<Doc>The unit of measure for the temperature values. The default is Celsius (C).</Doc>
 					<DataType>
 						<SimpleType type="string" />
 					</DataType>
@@ -2244,13 +2244,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>				
 				<DataPoint name="temperature" readable="true" writable="false" eventable="true" optional="true">
-					<Doc>To report the value of the temperature. The unit of measure is celsius (C).</Doc>
+					<Doc>To report the value of the temperature. The unit of measure is Celsius (C).</Doc>
 					<DataType>
 						<SimpleType type="float" />
 					</DataType>
 				</DataPoint>				
-				<DataPoint name="temperatureThreshhold" readable="true" writable="true" eventable="true" optional="true">
-					<Doc>The threshhold to trigger the alarm.</Doc>
+				<DataPoint name="temperatureThreshold" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>The threshold to trigger the alarm.</Doc>
 					<DataType>
 						<SimpleType type="integer" />
 					</DataType>
@@ -2274,7 +2274,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					</DataType>
 				</DataPoint>
 				<DataPoint name="supportedMessageValues" readable="true" writable="false" eventable="true" optional="true" >
-					<Doc>List of supported values for the message. Each of the values in this list must be URL-encoded. An encoded value must not contain white spaces.</Doc>
+					<Doc>List of supported values for the message. Each of the values in this list shall be URL-encoded. An encoded value shall not contain white spaces.</Doc>
 					<DataType>
 						<Array>
 							<DataType>
@@ -2312,7 +2312,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 
 		<ModuleClass name="timer">
-			<Doc>This ModuleClass provides capabilities to monitor and control the times when the appliance executes its operations, that means when it starts, when it ends etc.</Doc>
+			<Doc>This ModuleClass provides capabilities to monitor and control the times when the appliance executes its operations, that means when it starts, when it ends, etc.</Doc>
 			<Actions>
 				<Action name="activateClockTimer" optional="true">
 					<Doc>Activate current clock timer.</Doc>
@@ -2375,10 +2375,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 
 		<ModuleClass name="turbo">
-			<Doc>This ModuleClass provides capabilities to enable turbo mode and monitor the current status of the turbo function. It is intended to be part of devices which use turbo function such as an air conditioner, a washing machine etc.</Doc>
+			<Doc>This ModuleClass provides capabilities to enable turbo mode and monitor the current status of the turbo function. It is intended to be part of devices which use turbo function such as an air conditioner, a washing machine, etc.</Doc>
 			<Data>
 				<DataPoint name="turboEnabled" readable="true" writable="true" eventable="true" optional="false">
-					<Doc>The current status of the turbo mode. "True" indicates enabaled, and "False" indicates not enabled.</Doc>
+					<Doc>The current status of the turbo mode. "True" indicates enbaled, and "False" indicates not enabled.</Doc>
 					<DataType>
 						<SimpleType type="boolean" />
 					</DataType>
diff --git a/3.7.0/shortnames.csv b/3.7.0/shortnames.csv
index f4fc190076ec459e6796052a9e7a77c3fcda749b..77ab3822db6528f5197706539b919d7982c5216d 100644
--- a/3.7.0/shortnames.csv
+++ b/3.7.0/shortnames.csv
@@ -258,7 +258,7 @@ signalStrength,sigSh
 lqi,lqi
 rssi,rssi
 smokeSensor,smoSr
-smokeThreshhold,smoTd
+smokeThreshold,smoTd
 currentValue,crv
 sphygmomanometer,sphyr
 diastolicPressure,diaPe
@@ -277,7 +277,7 @@ currentTemperature,curT0
 targetTemperature,tarTe
 unit,unit
 temperatureAlarm,temAm
-temperatureThreshhold,temTd
+temperatureThreshold,temTd
 textMessage,texMe
 supportedMessageValues,suMVs
 minLength,minLh
@@ -301,13 +301,10 @@ waterFlow,watFw
 waterFlowStrength,waFSh
 waterSensor,watSr
 weight,weigt
-upChannel,uphCl
-nextTrack,nexTk
-resetNumberValue,reNVe
 answer,answr
+downChannel,dowCl
 start3Dprint,staDt
 previousTrack,preTk
-downChannel,dowCl
 close,close
 upVolume,upoVe
 decrementNumberValue,deNVe
@@ -319,8 +316,11 @@ call,call
 downVolume,dowVe
 incrementNumberValue,inNVe
 toggle,togge
+upChannel,uphCl
 deactivateClockTimer,deCTr
 open,open
+nextTrack,nexTk
+resetNumberValue,reNVe
 commonTypes,comTs
 deviceThreeDPrinter,dTDPr
 binarySwitchAnnc,binShAnnc
diff --git a/3.7.0/xsd/HD-mod-smokeSensor-v3_7_0.xsd b/3.7.0/xsd/HD-mod-smokeSensor-v3_7_0.xsd
index 63d3dd426bb532b9226b16ad994c50198b9d3064..182bbf0b72471345b7b8846b3aa8fdff6df5cabd 100644
--- a/3.7.0/xsd/HD-mod-smokeSensor-v3_7_0.xsd
+++ b/3.7.0/xsd/HD-mod-smokeSensor-v3_7_0.xsd
@@ -48,7 +48,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
                         <xs:element name="alarm" type="xs:boolean" />
                         <xs:element name="detectedTime" minOccurs="0" type="m2m:timestamp" />
-                        <xs:element name="smokeThreshhold" minOccurs="0" type="xs:integer" />
+                        <xs:element name="smokeThreshold" minOccurs="0" type="xs:integer" />
                         <xs:element name="currentValue" minOccurs="0" type="xs:integer" />
 
 
@@ -78,7 +78,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
                         <xs:element name="alarm" minOccurs="0" type="xs:boolean" />
                         <xs:element name="detectedTime" minOccurs="0" type="m2m:timestamp" />
-                        <xs:element name="smokeThreshhold" minOccurs="0" type="xs:integer" />
+                        <xs:element name="smokeThreshold" minOccurs="0" type="xs:integer" />
                         <xs:element name="currentValue" minOccurs="0" type="xs:integer" />
 
 
diff --git a/3.7.0/xsd/HD-mod-temperatureAlarm-v3_7_0.xsd b/3.7.0/xsd/HD-mod-temperatureAlarm-v3_7_0.xsd
index 098e92cacc3f54f259b84d220d56613a777a5474..acc738af2ae36f94d6fcfd8169d1b5d735f4053b 100644
--- a/3.7.0/xsd/HD-mod-temperatureAlarm-v3_7_0.xsd
+++ b/3.7.0/xsd/HD-mod-temperatureAlarm-v3_7_0.xsd
@@ -48,7 +48,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
                         <xs:element name="alarm" type="xs:boolean" />
                         <xs:element name="temperature" minOccurs="0" type="xs:float" />
-                        <xs:element name="temperatureThreshhold" minOccurs="0" type="xs:integer" />
+                        <xs:element name="temperatureThreshold" minOccurs="0" type="xs:integer" />
 
 
                     <!-- Child Resources -->
@@ -77,7 +77,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
                         <xs:element name="alarm" minOccurs="0" type="xs:boolean" />
                         <xs:element name="temperature" minOccurs="0" type="xs:float" />
-                        <xs:element name="temperatureThreshhold" minOccurs="0" type="xs:integer" />
+                        <xs:element name="temperatureThreshold" minOccurs="0" type="xs:integer" />
 
 
                     <!-- Child Resources -->