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 947c29e8e668a9eb3cce3f30def16e75aea87a1a..2f608962e8e3de2e0615c39a265eb87df79ad65e 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
@@ -494,8 +494,6 @@ This ModuleClasses provides capabilities to control and monitor the job modes of
 #### 5.3.1.6 airQualitySensor
 This ModuleClass provides capabilities for a monitoring sensor that measures the air quality.
 
-<mark>Editor's note: Check the short names for this module class. They are not aligned</mark>
-
 
 **Table 5.3.1.6-1: DataPoints of airQualitySense ModuleClass**
 
@@ -523,7 +521,6 @@ This ModuleClass provides capabilities for a monitoring sensor that measures the
 
 
 
-
 #### 5.3.1.7 alarmSpeaker
 This ModuleClass provides the capabilities to initiate and monitor an alarm.
 
@@ -6175,6 +6172,7 @@ In protocol bindings resource attributes names for data points of module classes
 |absoluteStopTime |[timer](#53190-timer) |abST0 |
 |acousticStatus |[acousticSensor](#5312-acousticsensor) |acoSs |
 |adfStates |[autoDocumentFeeder](#5319-autodocumentfeeder) |adfSs |
+|airPressure |[airQualitySensor](#5316-airqualitysensor) |airPe |
 |alarm |[motionSensor](#53154-motionsensor), [smokeSensor](#53182-smokesensor), [temperatureAlarm](#53188-temperaturealarm), [waterSensor](#53197-watersensor) |alarm |
 |alarmStatus |[alarmSpeaker](#5317-alarmspeaker) |alaSs |
 |altitude |[geoLocation](#53141-geolocation) |altie |
@@ -6268,6 +6266,7 @@ 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 |
+|humidity |[airQualitySensor](#5316-airqualitysensor) |humiy |
 |hwVersion |[dmDeviceInfo](#583-dmdeviceinfo)|hweVn |
 |impactDirectionHorizontal |[impactSensor](#53147-impactsensor) |imDHl |
 |impactDirectionVertical |[impactSensor](#53147-impactsensor) |imDVl |
@@ -6322,9 +6321,13 @@ In protocol bindings resource attributes names for data points of module classes
 |muteEnabled |[audioVolume](#5318-audiovolume) |mutEd |
 |name |[dmPackage](#588-dmpackage), [dmSoftware](#586-dmsoftware) |name |
 |network |[threeDprinter](#5311-threedprinter) |netwk |
+|no2 |[airQualitySensor](#5316-airqualitysensor) |no2 |
+|noise |[airQualitySensor](#5316-airqualitysensor) |noise |
 |numberValue |[numberValue](#53155-numbervalue) |numVe |
+|o3 |[airQualitySensor](#5316-airqualitysensor) |o3 |
 |object |[binaryObject](#53111-binaryobject) |objet |
 |objectType |[binaryObject](#53111-binaryobject) |objTe |
+|odor |[airQualitySensor](#5316-airqualitysensor) |odor |
 |openAlarm |[doorStatus](#53130-doorstatus) |opeAm |
 |openDuration |[doorStatus](#53130-doorstatus) |opeDn |
 |openLevel |[openLevel](#53156-openlevel) |opeLl |
@@ -6336,6 +6339,9 @@ In protocol bindings resource attributes names for data points of module classes
 |ozoneValueMG |[ozoneMeter](#53160-ozonemeter) |ozVMG |
 |ozoneValuePPM |[ozoneMeter](#53160-ozonemeter) |oVPPM |
 |password |[credentials](#53127-credentials) |pwd |
+|pm1 |[airQualitySensor](#5316-airqualitysensor) | pm1 |
+|pm10 |[airQualitySensor](#5316-airqualitysensor) |pm10 |
+|pm25 |[airQualitySensor](#5316-airqualitysensor) | pm25 |
 |postalAddress |[location](#5392-location) |posAs |
 |power |[energyConsumption](#53132-energyconsumption) |power |
 |powerGenerationData |[energyGeneration](#53133-energygeneration) |poGDa |
@@ -6381,16 +6387,12 @@ In protocol bindings resource attributes names for data points of module classes
 |secondaryVersion |[dmFirmware](#585-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](#583-dmdeviceinfo) |serNr |
-|sensorPM2 |[airQualitySensor](#5316-airqualitysensor) |sePM2 |
 |significantDigits |[energyConsumption](#53132-energyconsumption), [energyGeneration](#53133-energygeneration) |sigDs |
 |silentTime |[motionSensor](#53154-motionsensor) |silTe |
 |size |[binaryObject](#53111-binaryobject), [features](#5391-features) |size |
 |smokeThreshold |[smokeSensor](#53182-smokesensor) |smoTd |
+|so2 |[airQualitySensor](#5316-airqualitysensor) |so2 |
 |softLeanMass |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |soLMs |
 |soilLevel |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |soiLl |
 |speed |[airFlow](#5314-airflow) |speed |
@@ -6424,12 +6426,13 @@ In protocol bindings resource attributes names for data points of module classes
 |targetTemperature |[temperature](#53187-temperature) |tarTe |
 |targetTimeToStart |[timer](#53190-timer) |tTTSt |
 |targetTimeToStop |[timer](#53190-timer) |tTTSp |
-|temperature |[temperatureAlarm](#53188-temperaturealarm) |tempe |
+|temperature |[airQualitySensor](#5316-airqualitysensor), [temperatureAlarm](#53188-temperaturealarm) |tempe |
 |temperatureThreshold <mark>This data point has been changed to two different data points</mark> |[temperatureAlarm](#53188-temperaturealarm) |temTd |
 |textMessage |[textMessage](#53189-textmessage) |texMe |
 |time |[keepWarm](#53148-keepwarm) |time |
 |token |[credentials](#53127-credentials) |tk |
 |tone |[alarmSpeaker](#5317-alarmspeaker) |tone |
+|tsp |[airQualitySensor](#5316-airqualitysensor) |tsp |
 |turboEnabled |[turbo](#53191-turbo) |turEd |
 |type |[dmEventLog](#587-dmeventlog) |type |
 |unit |[temperature](#53187-temperature) |unit |
@@ -6450,6 +6453,8 @@ In protocol bindings resource attributes names for data points of module classes
 |water |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |water |
 |waterFlowStrength |[waterFlow](#53193-waterflow) |waFSh |
 |weight |[weight](#53199-weight) |weigt |
+|windDirection |[airQualitySensor](#5316-airqualitysensor) |winDn |
+|windSpeed |[airQualitySensor](#5316-airqualitysensor) |winSd |