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 ec79a9f06038bd6707e46bdce8d160bef113e67b..387d779d129db94d0ce71142e4ff73d1bc98c86b 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
@@ -179,7 +179,7 @@ Figure 5.2.1-1 depicts the basic structure of SDT 4.0. Further details about SDT
 
 Specifications of new DeviceClass models and ModuleClasses are encouraged to re-use the definitions specified in the present document as much as possible. If re-use is not possible and new DeviceClass and/or ModuleClasses definitions are necessary, it is strongly advised to closely follow the guidelines and definition style from the present document.
 
-![Figure 5.2.1-1: Design Structure of the Harmonized Information Model using SDT 4.0](media/SDT_4_0_basic_elements.png)
+![Figure 5.2.1-1: Design Structure of the Harmonized Information Model using SDT 4.0](media/5.2.1-1.png)
 
 **Figure 5.2.1-1: Design Structure of the Harmonized Information Model using SDT 4.0**-
 
@@ -5204,7 +5204,7 @@ Using an abstraction model based on two firmware images it is possible to effect
 
 >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.5-1 or the one shown in Figure 5.8.5-2 should be used.
 
-![Figure 5.8.5-1: Lifecycle of a dmFirmware for devices that support toggling between pre-installed firmware images](media/lifecycle_of_a_dmfirmware_1.svg)
+![Figure 5.8.5-1: Lifecycle of a dmFirmware for devices that support toggling between pre-installed firmware images](media/5.8.5-1.png)
 
 **Figure 5.8.5-1: Lifecycle of a dmFirmware for devices that support toggling between pre-installed firmware images**
 
@@ -5216,7 +5216,7 @@ For devices that support toggling between multiple pre-installed firmware images
 
 >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).
 
-![Figure 5.8.5-2: Lifecycle of a dmFirmware for devices that can have only one firmware version installed](media/lifecycle_of_a_dmfirmware_2.svg)
+![Figure 5.8.5-2: Lifecycle of a dmFirmware for devices that can have only one firmware version installed](media/5.8.5-2.png)
 
 **Figure 5.8.5-2: Lifecycle of a dmFirmware for devices that can have only one firmware version installed**
 
@@ -6753,7 +6753,7 @@ The present clause explains the creation process for the device typed '[deviceAi
 
 Using the definition, '[deviceAirConditioner](#5541-deviceairconditioner)' model is mapped to [deviceAirConditioner] resource which is a specialization of <flexContainer> resource (see Figure A.2-1).
 
-![Figure A.2-1: Structure of [deviceAirConditioner] resource](media/deviceAirConditioner.svg)
+![Figure A.2-1: Structure of [deviceAirConditioner] resource](media/A.2-1.png)
 
 **Figure A.2-1: Structure of [deviceAirConditioner] resource**
 
@@ -6808,7 +6808,7 @@ The [\[deviceAirConditioner\]](#5541-deviceairconditioner) resource contains the
 
 The [[binarySwitch](#53112-binaryswitch)] resource is used to share information regarding the modelled binary switch module as a ModuleClass. The [binarySwitch] resource is a specialization of the <flexContainer> resource.
 
-![Figure A.3-1: Structure of [binarySwitch] resource](media/binarySwitch.svg)
+![Figure A.3-1: Structure of [binarySwitch] resource](media/A.3-1.png)
 
 **Figure A.3-1: Structure of [binarySwitch] resource**
 
@@ -6852,7 +6852,7 @@ The [[binarySwitch](#53112-binaryswitch)] resource contains the attributes speci
 
 The [[toggle](#53112-binaryswitch)] resource is used to share information regarding the modelled toggle as an Action. The [[toggle](#53112-binaryswitch)] resource is a specialization of the <flexContainer> resource.
 
-![Figure A.4-1: Structure of [toggle] resource](media/toggle.svg)
+![Figure A.4-1: Structure of [toggle] resource](media/A.4-1.png)
 
 **Figure A.4-1: Structure of [toggle] resource**
 
@@ -7131,7 +7131,7 @@ Below is the example for deviceThreeDPrinter:
 
 Any size of the SDT class cluster may be mapped to content attribute. For example, from only the DataPoint class to DataPoint, Action, Module, SubDevice and Device classes may be mapped to one content attribute at once.
 
-![Figure C.4-1: Image of Mapping SDT to content attribute](media/Mapping_SDT_to_content_attribute.png)
+![Figure C.4-1: Image of Mapping SDT to content attribute](media/C.4-1.png)
 
 **Figure C.4-1: Image of Mapping SDT to content attribute**
 
@@ -7229,7 +7229,6 @@ If a contentInfo attribute is not used, content attribute may change as follows:
 +---------+--------------+-------------------------------------------------------------------------------------------------------+
 
 
-
 +---------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | Draft history (to be removed on publication)                                                                                                                                          |
 +---------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
diff --git a/media/SDT_4_0_basic_elements.png b/media/5.2.1-1.png
similarity index 100%
rename from media/SDT_4_0_basic_elements.png
rename to media/5.2.1-1.png
diff --git a/media/5.8.5-1.png b/media/5.8.5-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d925efa558b379ccecb35573758730e8dc71090
Binary files /dev/null and b/media/5.8.5-1.png differ
diff --git a/media/lifecycle_of_a_dmfirmware_1.svg b/media/5.8.5-1.svg
similarity index 100%
rename from media/lifecycle_of_a_dmfirmware_1.svg
rename to media/5.8.5-1.svg
diff --git a/media/5.8.5-2.png b/media/5.8.5-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b5d5ab68ceecdcc81bca8bf10db4df58f9e8b77
Binary files /dev/null and b/media/5.8.5-2.png differ
diff --git a/media/lifecycle_of_a_dmfirmware_2.svg b/media/5.8.5-2.svg
similarity index 100%
rename from media/lifecycle_of_a_dmfirmware_2.svg
rename to media/5.8.5-2.svg
diff --git a/media/A.2-1.png b/media/A.2-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..96fb2f8db4b055cd802927521be8feb7eefa0438
Binary files /dev/null and b/media/A.2-1.png differ
diff --git a/media/deviceAirConditioner.svg b/media/A.2-1.svg
similarity index 100%
rename from media/deviceAirConditioner.svg
rename to media/A.2-1.svg
diff --git a/media/A.3-1.png b/media/A.3-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..31e190ac6767f1a039b99c2a9060d3467606dfa9
Binary files /dev/null and b/media/A.3-1.png differ
diff --git a/media/binarySwitch.svg b/media/A.3-1.svg
similarity index 100%
rename from media/binarySwitch.svg
rename to media/A.3-1.svg
diff --git a/media/A.4-1.png b/media/A.4-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecc256376fd0e039a9f014b50673a079ec43acd1
Binary files /dev/null and b/media/A.4-1.png differ
diff --git a/media/toggle.svg b/media/A.4-1.svg
similarity index 100%
rename from media/toggle.svg
rename to media/A.4-1.svg
diff --git a/media/Mapping_SDT_to_content_attribute.png b/media/C.4-1.png
similarity index 100%
rename from media/Mapping_SDT_to_content_attribute.png
rename to media/C.4-1.png