diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index cdeccbb76..c257f569b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -50,10 +50,6 @@ jobs:
             -DCMAKE_PREFIX_PATH=${{ github.workspace }}/deps/srcs/bde-tools/BdeBuildSystem \
             -DCMAKE_INSTALL_LIBDIR=lib64
           cmake --build cmake.bld/Linux --parallel 8 --target all all.t
-      - name: Run Unit Tests
-        run: |
-          cd cmake.bld/Linux
-          ctest -E mwcsys_executil.t --output-on-failure
       - uses: actions/cache@v3
         with:
           path: |
@@ -62,8 +58,8 @@ jobs:
             /opt/bb/include
           key: cache-${{ github.sha }}
 
-  build_and_test_prometheus_plugin:
-    name: "Check if Prometheus plugin can build and pass tests"
+  build_and_test_bmqprometheus_plugin:
+    name: "Check if BMQPrometheus plugin can build and pass tests"
     runs-on: ubuntu-latest
     needs: build_and_test
     steps:
@@ -95,7 +91,7 @@ jobs:
         run: mkdir -p deps
       - name: Fetch & Build non packaged plugins dependencies
         working-directory: deps
-        run:  ${{ github.workspace }}/src/plugins/prometheus/build_prometheus_deps.sh
+        run:  ${{ github.workspace }}/src/plugins/bmqprometheus/build_prometheus_deps.sh
       - name: Build plugins
         env:
           PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig:/opt/bb/lib64/pkgconfig
@@ -115,20 +111,20 @@ jobs:
       - name: Download Prometheus
         run:  curl -SL "https://github.com/prometheus/prometheus/releases/download/v2.45.1/prometheus-2.45.1.linux-amd64.tar.gz" | tar -xzC prometheus_dir/
       - name: Run Prometheus
-        run:  ./prometheus_dir/prometheus-2.45.1.linux-amd64/prometheus --config.file=${{ github.workspace }}/src/plugins/prometheus/tests/prometheus_localhost.yaml --web.enable-lifecycle --storage.tsdb.path=${{ github.workspace }}/prometheus_dir/data &
+        run:  ./prometheus_dir/prometheus-2.45.1.linux-amd64/prometheus --config.file=${{ github.workspace }}/src/plugins/bmqprometheus/tests/prometheus_localhost.yaml --web.enable-lifecycle --storage.tsdb.path=${{ github.workspace }}/prometheus_dir/data &
       - name: Run Pushgateway
         run: |
           docker pull prom/pushgateway
           docker run -d -p 9091:9091 prom/pushgateway
-      - name: Run Prometheus plugin integration test in "pull" mode
+      - name: Run BMQPrometheus plugin integration test in "pull" mode
         run: ${{ github.workspace }}/src/plugins/prometheus/tests/prometheus_prometheusstatconsumer_test.py -p ${{ github.workspace }}/cmake.bld/Linux -m pull --no-docker
       - name: Clear Prometheus database and restart
         run: |
           curl -X POST "http://localhost:9090/-/quit"
           rm -rf prometheus_dir/data
-          ./prometheus_dir/prometheus-2.45.1.linux-amd64/prometheus --config.file=${{ github.workspace }}/src/plugins/prometheus/tests/prometheus_localhost.yaml --web.enable-lifecycle --storage.tsdb.path=${{ github.workspace }}/prometheus_dir/data &
+          ./prometheus_dir/prometheus-2.45.1.linux-amd64/prometheus --config.file=${{ github.workspace }}/src/plugins/bmqprometheus/tests/prometheus_localhost.yaml --web.enable-lifecycle --storage.tsdb.path=${{ github.workspace }}/prometheus_dir/data &
       - name: Run Prometheus plugin integration test in "push" mode
-        run: ${{ github.workspace }}/src/plugins/prometheus/tests/prometheus_prometheusstatconsumer_test.py -p ${{ github.workspace }}/cmake.bld/Linux -m push --no-docker
+        run: ${{ github.workspace }}/src/plugins/bmqprometheus/tests/prometheus_prometheusstatconsumer_test.py -p ${{ github.workspace }}/cmake.bld/Linux -m push --no-docker
 
   Documentation:
     name: "Documentation"