diff --git a/.github/workflows/build_osi_field_checker.yml b/.github/workflows/build_osi_field_checker.yml
index 4fa1d48..9aff895 100644
--- a/.github/workflows/build_osi_field_checker.yml
+++ b/.github/workflows/build_osi_field_checker.yml
@@ -36,40 +36,40 @@ jobs:
           path: /tmp/osi-field-checker
           key: ${{ runner.os }}-osi-field-checker
 
-      - name: Clone OpenMSL Sensor Model Testing
+      - name: Clone OpenMSL OSI Field Checker
         if: steps.cache-osi-field-checker.outputs.cache-hit != 'true'
-        run: git clone https://github.com/openMSL/sl-1-5-sensor-model-testing.git
+        run: git clone https://github.com/openMSL/sl-5-2-osi-field-checker.git
 
       - name: Prepare C++ Build
         if: steps.cache-osi-field-checker.outputs.cache-hit != 'true'
-        working-directory: sl-1-5-sensor-model-testing
+        working-directory: sl-5-2-osi-field-checker
         run: git submodule update --init && mkdir build
 
       - name: Configure CMake
         if: steps.cache-osi-field-checker.outputs.cache-hit != 'true'
-        working-directory: sl-1-5-sensor-model-testing/build
+        working-directory: sl-5-2-osi-field-checker/build
         run: cmake -DCMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install ..
 
       - name: Build C++
         if: steps.cache-osi-field-checker.outputs.cache-hit != 'true'
-        working-directory: sl-1-5-sensor-model-testing/build
+        working-directory: sl-5-2-osi-field-checker/build
         run: cmake --build . -j4
 
       - name: Create FMU Directory
         if: steps.cache-osi-field-checker.outputs.cache-hit != 'true'
-        working-directory: sl-1-5-sensor-model-testing/build
+        working-directory: sl-5-2-osi-field-checker/build
         run: mkdir /tmp/osi-field-checker
 
       - name: Copy Commit ID to Cache
         if: steps.cache-osi-field-checker.outputs.cache-hit != 'true'
-        working-directory: sl-1-5-sensor-model-testing
+        working-directory: sl-5-2-osi-field-checker
         run: |
           git rev-parse --short HEAD > commit-id.txt
           cp commit-id.txt /tmp/osi-field-checker/commit-id.txt
 
       - name: Copy OSI Field Checker FMU
         if: steps.cache-osi-field-checker.outputs.cache-hit != 'true'
-        working-directory: sl-1-5-sensor-model-testing/build
+        working-directory: sl-5-2-osi-field-checker/build
         run: cp OSIFieldChecker.fmu /tmp/osi-field-checker/OSIFieldChecker.fmu
 
       - name: Commit ID
diff --git a/.github/workflows/build_tracefile_player.yml b/.github/workflows/build_tracefile_player.yml
index 93109b6..d35d3db 100644
--- a/.github/workflows/build_tracefile_player.yml
+++ b/.github/workflows/build_tracefile_player.yml
@@ -38,38 +38,38 @@ jobs:
 
       - name: Get Tracefile Player
         if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
-        run: git clone https://gitlab.com/persival-open-source/open-simulation-interface/osi-trace-file-player.git
+        run: git clone https://github.com/openMSL/sl-5-5-osi-trace-file-player.git
 
       - name: Prepare C++ Build
         if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
-        working-directory: osi-trace-file-player
+        working-directory: sl-5-5-osi-trace-file-player
         run: git submodule update --init && mkdir build
 
       - name: Configure CMake
         if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
-        working-directory: osi-trace-file-player/build
+        working-directory: sl-5-5-osi-trace-file-player/build
         run: cmake -DCMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install ..
 
       - name: Build C++
         if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
-        working-directory: osi-trace-file-player/build
+        working-directory: sl-5-5-osi-trace-file-player/build
         run: cmake --build .
 
       - name: Create FMU Directory
         if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
-        working-directory: osi-trace-file-player/build
+        working-directory: sl-5-5-osi-trace-file-player/build
         run: mkdir /tmp/tracefile_player_fmu
 
       - name: Copy Commit ID to Cache
         if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
-        working-directory: osi-trace-file-player
+        working-directory: sl-5-5-osi-trace-file-player
         run: |
           git rev-parse --short HEAD > commit-id.txt
           cp commit-id.txt /tmp/tracefile_player_fmu/commit-id.txt
 
       - name: Copy Tracefile FMU
         if: steps.cache-tracefile-player-fmu.outputs.cache-hit != 'true'
-        working-directory: osi-trace-file-player/build
+        working-directory: sl-5-5-osi-trace-file-player/build
         run: cp src/OSMPTraceFilePlayer.fmu /tmp/tracefile_player_fmu/OSMPTraceFilePlayer.fmu
 
       - name: Commit ID
diff --git a/.github/workflows/build_tracefile_writer.yml b/.github/workflows/build_tracefile_writer.yml
index c85d81d..ea64ddd 100644
--- a/.github/workflows/build_tracefile_writer.yml
+++ b/.github/workflows/build_tracefile_writer.yml
@@ -38,21 +38,21 @@ jobs:
 
       - name: Get Tracefile Player
         if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
-        run: git clone https://github.com/Persival-GmbH/osi-sensordata-trace-file-writer.git
+        run: git clone https://github.com/openMSL/sl-5-6-osi-trace-file-writer.git
 
       - name: Prepare C++ Build
         if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
-        working-directory: osi-sensordata-trace-file-writer
+        working-directory: sl-5-6-osi-trace-file-writer
         run: git submodule update --init && mkdir build
 
       - name: Configure CMake
         if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
-        working-directory: osi-sensordata-trace-file-writer/build
+        working-directory: sl-5-6-osi-trace-file-writer/build
         run: cmake -DCMAKE_PREFIX_PATH:PATH=${DEPS_DIR}/protobuf/install ..
 
       - name: Build C++
         if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
-        working-directory: osi-sensordata-trace-file-writer/build
+        working-directory: sl-5-6-osi-trace-file-writer/build
         run: cmake --build .
 
       - name: Create FMU Directory
@@ -61,15 +61,15 @@ jobs:
 
       - name: Copy Commit ID to Cache
         if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
-        working-directory: osi-sensordata-trace-file-writer
+        working-directory: sl-5-6-osi-trace-file-writer
         run: |
           git rev-parse --short HEAD > commit-id.txt
           cp commit-id.txt /tmp/tracefile_writer_fmu/commit-id.txt
 
       - name: Copy Tracefile Writer FMU
         if: steps.cache-tracefile-writer-fmu.outputs.cache-hit != 'true'
-        working-directory: osi-sensordata-trace-file-writer/build
-        run: cp osi-sensordata-trace-file-writer.fmu /tmp/tracefile_writer_fmu/osi-sensordata-trace-file-writer.fmu
+        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
 
       - name: Commit ID
         working-directory: /tmp/tracefile_writer_fmu
diff --git a/.github/workflows/cl0.yml b/.github/workflows/cl0.yml
index c60851b..2a62985 100644
--- a/.github/workflows/cl0.yml
+++ b/.github/workflows/cl0.yml
@@ -12,4 +12,4 @@ jobs:
       uses: actions/checkout@v3
     - uses: enarx/spdx@master
       with:
-        licenses: Apache-2.0 BSD-3-Clause BSD-2-Clause BSL-1.0 GPL-2.0 GPL-3.0 LGPL-2.0 LGPL-2.1 LGPL-3.0 MIT MPL-2.0 CDDL-1.0 EPL-2.0
+        licenses: Apache-2.0 BSD-3-Clause BSD-2-Clause MIT MPL-2.0
diff --git a/.github/workflows/srmd-validator.yml b/.github/workflows/srmd-validator.yml
index 86d86fe..1f2025f 100644
--- a/.github/workflows/srmd-validator.yml
+++ b/.github/workflows/srmd-validator.yml
@@ -11,22 +11,22 @@ jobs:
     - name: Checkout
       uses: actions/checkout@master
 
-    - name: Get Sensor Model Testing
-      run: git clone https://github.com/openMSL/sl-1-5-sensor-model-testing.git
+    - name: Get SRMD Validator
+      run: git clone https://github.com/openMSL/sl-5-1-srmd-validator.git
 
     - name: Init Submodules
-      working-directory: sl-1-5-sensor-model-testing
+      working-directory: sl-5-1-srmd-validator
       run: git submodule update --init --recursive
 
     - name: Install Dependencies
       run: pip3 install xmlschema
 
     - name: Validate SRMD
-      working-directory: sl-1-5-sensor-model-testing/src/srmd-validator
+      working-directory: sl-5-1-srmd-validator
       run: python3 srmd-validator.py
 
     - name: Commit ID
-      working-directory: sl-1-5-sensor-model-testing
+      working-directory: sl-5-1-srmd-validator
       run: |
         echo "Commit ID: "
         echo $(git rev-parse --short HEAD)