diff --git a/.github/workflows/build_tracefile_player.yml b/.github/workflows/build_tracefile_player.yml
index b07a6c7..cadc737 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 ea64ddd..63c3417 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/test/integration/001_smoke_test/SystemStructure.ssd b/test/integration/001_smoke_test/SystemStructure.ssd
index 020ccb5..9344c65 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 73c0213..19422a3 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"/>