diff --git a/.github/workflows/build_tracefile_player.yml b/.github/workflows/build_tracefile_player.yml
index ad34aac..80fcbf4 100644
--- a/.github/workflows/build_tracefile_player.yml
+++ b/.github/workflows/build_tracefile_player.yml
@@ -70,7 +70,7 @@ jobs:
       - name: Copy Tracefile FMU
         if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
         working-directory: sl-5-5-osi-trace-file-player/build
-        run: cp OSMPTraceFilePlayer.fmu /tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu
+        run: cp sl-5-5-osi-trace-file-player.fmu /tmp/tracefile_player_fmu/sl-5-5-osi-trace-file-player.fmu
 
       - name: Commit ID
         working-directory: /tmp/tracefile_player_fmu
diff --git a/.github/workflows/build_tracefile_writer.yml b/.github/workflows/build_tracefile_writer.yml
index 4709029..55b49f7 100644
--- a/.github/workflows/build_tracefile_writer.yml
+++ b/.github/workflows/build_tracefile_writer.yml
@@ -69,7 +69,7 @@ jobs:
       - name: Copy Tracefile Writer FMU
         if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
         working-directory: sl-5-6-osi-trace-file-writer/build
-        run: cp osi-trace-file-writer.fmu /tmp/tracefile_writer_fmu/osi-trace-file-writer.fmu
+        run: cp sl-5-6-osi-trace-file-writer.fmu /tmp/tracefile_writer_fmu/sl-5-6-osi-trace-file-writer.fmu
 
       - name: Commit ID
         working-directory: /tmp/tracefile_writer_fmu
diff --git a/README.md b/README.md
index f4ba70f..e4990ca 100644
--- a/README.md
+++ b/README.md
@@ -338,6 +338,7 @@ If you find our work useful in your research, please consider citing:
 This work received funding from the research project
 "[SET Level](https://setlevel.de/)" of the [PEGASUS](https://pegasus-family.de) project family, promoted by the
 German Federal Ministry for Economic Affairs and Energy based on a decision of the German Bundestag.
+
 | SET Level                                                                                                | PEGASUS Family                                                                                                       | BMWi                                                                                                                                                                                 |
 |----------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | <a href="https://setlevel.de"><img src="https://setlevel.de/assets/logo-setlevel.svg" alt="SETLevel" width="100" /></a> | <a href="https://pegasus-family.de"><img src="https://setlevel.de/assets/logo-pegasus-family.svg" alt="Pegasus" width="100" /></a> | <a href="https://www.bmwi.de/Redaktion/DE/Textsammlungen/Technologie/fahrzeug-und-systemtechnologien.html"><img src="https://setlevel.de/assets/logo-bmwi-en.svg" alt="BMWi" width="100" /></a> |
diff --git a/test/behavior/001_regression_test_7/SystemStructure.ssd b/test/behavior/001_regression_test_7/SystemStructure.ssd
index dc5bd6d..55bae19 100644
--- a/test/behavior/001_regression_test_7/SystemStructure.ssd
+++ b/test/behavior/001_regression_test_7/SystemStructure.ssd
@@ -11,7 +11,7 @@
             </ssd:ParameterBinding>
         </ssd:ParameterBindings>
         <ssd:Elements>
-            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu" implementation="CoSimulation" name="OSMPTraceFilePlayer" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
+            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/sl-5-5-osi-trace-file-player.fmu" implementation="CoSimulation" name="sl-5-5-osi-trace-file-player" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
                 <ssd:Connectors>
                     <ssd:Connector name="OSMPSensorViewOut.base.hi" kind="output">
                         <ssc:Integer/>
@@ -79,7 +79,7 @@
                     </ssd:ParameterBinding>
                 </ssd:ParameterBindings>
             </ssd:Component>
-            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/osi-trace-file-writer.fmu" implementation="CoSimulation" name="osi-trace-file-writer" description="Write binary OSI SensorData trace files">
+            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/sl-5-6-osi-trace-file-writer.fmu" implementation="CoSimulation" name="sl-5-6-osi-trace-file-writer" description="Write binary OSI SensorData trace files">
                             <ssd:Connectors>
                                 <ssd:Connector name="OSIIn.size" kind="input">
                                     <ssc:Integer/>
@@ -120,12 +120,12 @@
                         </ssd:Component>
         </ssd:Elements>
         <ssd:Connections>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
-                        <ssd:Connection startElement="osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
-                        <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
+                        <ssd:Connection startElement="sl-5-6-osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
+                        <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
         </ssd:Connections>
         <ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
     </ssd:System>
diff --git a/test/behavior/002_object_in_fov/SystemStructure.ssd b/test/behavior/002_object_in_fov/SystemStructure.ssd
index 1635c85..68e8acc 100644
--- a/test/behavior/002_object_in_fov/SystemStructure.ssd
+++ b/test/behavior/002_object_in_fov/SystemStructure.ssd
@@ -11,7 +11,7 @@
             </ssd:ParameterBinding>
         </ssd:ParameterBindings>
         <ssd:Elements>
-            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu" implementation="CoSimulation" name="OSMPTraceFilePlayer" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
+            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/sl-5-5-osi-trace-file-player.fmu" implementation="CoSimulation" name="sl-5-5-osi-trace-file-player" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
                 <ssd:Connectors>
                     <ssd:Connector name="OSMPSensorViewOut.base.hi" kind="output">
                         <ssc:Integer/>
@@ -83,7 +83,7 @@
                     </ssd:ParameterBinding>
                 </ssd:ParameterBindings>
             </ssd:Component>
-            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/osi-trace-file-writer.fmu" implementation="CoSimulation" name="osi-trace-file-writer" description="Write binary OSI SensorData trace files">
+            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/sl-5-6-osi-trace-file-writer.fmu" implementation="CoSimulation" name="sl-5-6-osi-trace-file-writer" description="Write binary OSI SensorData trace files">
                 <ssd:Connectors>
                     <ssd:Connector name="OSIIn.size" kind="input">
                         <ssc:Integer/>
@@ -124,12 +124,12 @@
             </ssd:Component>
         </ssd:Elements>
         <ssd:Connections>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-6-osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
         </ssd:Connections>
         <ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
     </ssd:System>
diff --git a/test/behavior/003_object_outside_fov/SystemStructure.ssd b/test/behavior/003_object_outside_fov/SystemStructure.ssd
index ffce1dd..b4e581e 100644
--- a/test/behavior/003_object_outside_fov/SystemStructure.ssd
+++ b/test/behavior/003_object_outside_fov/SystemStructure.ssd
@@ -11,7 +11,7 @@
             </ssd:ParameterBinding>
         </ssd:ParameterBindings>
         <ssd:Elements>
-            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu" implementation="CoSimulation" name="OSMPTraceFilePlayer" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
+            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/sl-5-5-osi-trace-file-player.fmu" implementation="CoSimulation" name="sl-5-5-osi-trace-file-player" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
                 <ssd:Connectors>
                     <ssd:Connector name="OSMPSensorViewOut.base.hi" kind="output">
                         <ssc:Integer/>
@@ -83,7 +83,7 @@
                     </ssd:ParameterBinding>
                 </ssd:ParameterBindings>
             </ssd:Component>
-            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/osi-trace-file-writer.fmu" implementation="CoSimulation" name="osi-trace-file-writer" description="Write binary OSI SensorData trace files">
+            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/sl-5-6-osi-trace-file-writer.fmu" implementation="CoSimulation" name="sl-5-6-osi-trace-file-writer" description="Write binary OSI SensorData trace files">
                 <ssd:Connectors>
                     <ssd:Connector name="OSIIn.size" kind="input">
                         <ssc:Integer/>
@@ -124,12 +124,12 @@
             </ssd:Component>
         </ssd:Elements>
         <ssd:Connections>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-6-osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
         </ssd:Connections>
         <ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
     </ssd:System>
diff --git a/test/behavior/004_occlusion_lidar/SystemStructure.ssd b/test/behavior/004_occlusion_lidar/SystemStructure.ssd
index 90eb50d..0b8f1c9 100644
--- a/test/behavior/004_occlusion_lidar/SystemStructure.ssd
+++ b/test/behavior/004_occlusion_lidar/SystemStructure.ssd
@@ -11,7 +11,7 @@
             </ssd:ParameterBinding>
         </ssd:ParameterBindings>
         <ssd:Elements>
-            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu" implementation="CoSimulation" name="OSMPTraceFilePlayer" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
+            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/sl-5-5-osi-trace-file-player.fmu" implementation="CoSimulation" name="sl-5-5-osi-trace-file-player" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
                 <ssd:Connectors>
                     <ssd:Connector name="OSMPSensorViewOut.base.hi" kind="output">
                         <ssc:Integer/>
@@ -83,7 +83,7 @@
                     </ssd:ParameterBinding>
                 </ssd:ParameterBindings>
             </ssd:Component>
-            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/osi-trace-file-writer.fmu" implementation="CoSimulation" name="osi-trace-file-writer" description="Write binary OSI SensorData trace files">
+            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/sl-5-6-osi-trace-file-writer.fmu" implementation="CoSimulation" name="sl-5-6-osi-trace-file-writer" description="Write binary OSI SensorData trace files">
                 <ssd:Connectors>
                     <ssd:Connector name="OSIIn.size" kind="input">
                         <ssc:Integer/>
@@ -124,12 +124,12 @@
             </ssd:Component>
         </ssd:Elements>
         <ssd:Connections>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-6-osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
         </ssd:Connections>
         <ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
     </ssd:System>
diff --git a/test/behavior/005_occlusion_radar/SystemStructure.ssd b/test/behavior/005_occlusion_radar/SystemStructure.ssd
index 6edef1d..ff7b98f 100644
--- a/test/behavior/005_occlusion_radar/SystemStructure.ssd
+++ b/test/behavior/005_occlusion_radar/SystemStructure.ssd
@@ -11,7 +11,7 @@
             </ssd:ParameterBinding>
         </ssd:ParameterBindings>
         <ssd:Elements>
-            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu" implementation="CoSimulation" name="OSMPTraceFilePlayer" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
+            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/sl-5-5-osi-trace-file-player.fmu" implementation="CoSimulation" name="sl-5-5-osi-trace-file-player" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
                 <ssd:Connectors>
                     <ssd:Connector name="OSMPSensorViewOut.base.hi" kind="output">
                         <ssc:Integer/>
@@ -83,7 +83,7 @@
                     </ssd:ParameterBinding>
                 </ssd:ParameterBindings>
             </ssd:Component>
-            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/osi-trace-file-writer.fmu" implementation="CoSimulation" name="osi-trace-file-writer" description="Write binary OSI SensorData trace files">
+            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_writer_fmu/sl-5-6-osi-trace-file-writer.fmu" implementation="CoSimulation" name="sl-5-6-osi-trace-file-writer" description="Write binary OSI SensorData trace files">
                 <ssd:Connectors>
                     <ssd:Connector name="OSIIn.size" kind="input">
                         <ssc:Integer/>
@@ -124,12 +124,12 @@
             </ssd:Component>
         </ssd:Elements>
         <ssd:Connections>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.base.hi" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-6-osi-trace-file-writer" startConnector="OSIIn.base.lo" endElement="SensorModel" endConnector="OSMPSensorDataOut.base.lo" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="sl-5-6-osi-trace-file-writer" endConnector="OSIIn.size" suppressUnitConversion="false"/>
         </ssd:Connections>
         <ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
     </ssd:System>
diff --git a/test/integration/001_smoke_test/SystemStructure.ssd b/test/integration/001_smoke_test/SystemStructure.ssd
index 8aa132f..767c368 100644
--- a/test/integration/001_smoke_test/SystemStructure.ssd
+++ b/test/integration/001_smoke_test/SystemStructure.ssd
@@ -11,7 +11,7 @@
             </ssd:ParameterBinding>
         </ssd:ParameterBindings>
         <ssd:Elements>
-            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu" implementation="CoSimulation" name="OSMPTraceFilePlayer" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
+            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/sl-5-5-osi-trace-file-player.fmu" implementation="CoSimulation" name="sl-5-5-osi-trace-file-player" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
                 <ssd:Connectors>
                     <ssd:Connector name="OSMPSensorViewOut.base.hi" kind="output">
                         <ssc:Integer/>
@@ -81,9 +81,9 @@
             </ssd:Component>
         </ssd:Elements>
         <ssd:Connections>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
         </ssd:Connections>
         <ssd:SystemGeometry x1="-619.0" y1="-666.5" x2="1849.5" y2="126.5"/>
     </ssd:System>
diff --git a/test/integration/002_output_osi_fields/SystemStructure.ssd b/test/integration/002_output_osi_fields/SystemStructure.ssd
index bc46208..16206f8 100644
--- a/test/integration/002_output_osi_fields/SystemStructure.ssd
+++ b/test/integration/002_output_osi_fields/SystemStructure.ssd
@@ -11,7 +11,7 @@
             </ssd:ParameterBinding>
         </ssd:ParameterBindings>
         <ssd:Elements>
-            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu" implementation="CoSimulation" name="OSMPTraceFilePlayer" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
+            <ssd:Component type="application/x-fmu-sharedlibrary" source="/tmp/tracefile_player_fmu/sl-5-5-osi-trace-file-player.fmu" implementation="CoSimulation" name="sl-5-5-osi-trace-file-player" description="Demonstration C++ SensorView Source FMU for OSI Sensor Model Packaging">
                 <ssd:Connectors>
                     <ssd:Connector name="OSMPSensorViewOut.base.hi" kind="output">
                         <ssc:Integer/>
@@ -123,9 +123,9 @@
             </ssd:Component>
         </ssd:Elements>
         <ssd:Connections>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
-            <ssd:Connection startElement="OSMPTraceFilePlayer" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.hi" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.hi" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.size" endElement="SensorModel" endConnector="OSMPSensorViewIn.size" suppressUnitConversion="false"/>
+            <ssd:Connection startElement="sl-5-5-osi-trace-file-player" startConnector="OSMPSensorViewOut.base.lo" endElement="SensorModel" endConnector="OSMPSensorViewIn.base.lo" suppressUnitConversion="false"/>
             <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.hi" endElement="OSIFieldChecker" endConnector="OSMPSensorDataIn.base.hi" suppressUnitConversion="false"/>
             <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.size" endElement="OSIFieldChecker" endConnector="OSMPSensorDataIn.size" suppressUnitConversion="false"/>
             <ssd:Connection startElement="SensorModel" startConnector="OSMPSensorDataOut.base.lo" endElement="OSIFieldChecker" endConnector="OSMPSensorDataIn.base.lo" suppressUnitConversion="false"/>