diff --git a/cmake/cpack/CMakeCPackOptions.cmake b/cmake/cpack/CMakeCPackOptions.cmake
index d9750055..248795de 100644
--- a/cmake/cpack/CMakeCPackOptions.cmake
+++ b/cmake/cpack/CMakeCPackOptions.cmake
@@ -4,7 +4,7 @@ if(CPACK_GENERATOR MATCHES "DEB" OR CPACK_GENERATOR MATCHES "RPM")
 	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-kmod.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
 	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-kmod-inject.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
 	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-bpf.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
-	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-modern_bpf.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
+	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-modern-bpf.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
 	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-plugin.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
 endif()
 
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 91236e14..82959fac 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -24,7 +24,7 @@ file(COPY "${PROJECT_SOURCE_DIR}/scripts/systemd/falco-kmod.service"
 		DESTINATION "${PROJECT_BINARY_DIR}/scripts/systemd")
 file(COPY "${PROJECT_SOURCE_DIR}/scripts/systemd/falco-bpf.service"
 		DESTINATION "${PROJECT_BINARY_DIR}/scripts/systemd")
-file(COPY "${PROJECT_SOURCE_DIR}/scripts/systemd/falco-modern_bpf.service"
+file(COPY "${PROJECT_SOURCE_DIR}/scripts/systemd/falco-modern-bpf.service"
 		DESTINATION "${PROJECT_BINARY_DIR}/scripts/systemd")
 file(COPY "${PROJECT_SOURCE_DIR}/scripts/systemd/falco-plugin.service"
 		DESTINATION "${PROJECT_BINARY_DIR}/scripts/systemd")
diff --git a/scripts/debian/postinst.in b/scripts/debian/postinst.in
index 397fa04a..36340cbc 100755
--- a/scripts/debian/postinst.in
+++ b/scripts/debian/postinst.in
@@ -39,7 +39,7 @@ case "$1" in
                     chosen_driver="bpf"
                     ;;
                 4)
-                    chosen_driver="modern_bpf"
+                    chosen_driver="modern-bpf"
                     ;;
                 5)
                     chosen_driver="plugin"
@@ -67,7 +67,7 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-decon
         systemctl --system unmask "falco@.target" >/dev/null || true
         systemctl --system unmask "falco-kmod.service" >/dev/null || true
         systemctl --system unmask "falco-bpf.service" >/dev/null || true
-        systemctl --system unmask "falco-modern_bpf.service" >/dev/null || true
+        systemctl --system unmask "falco-modern-bpf.service" >/dev/null || true
         systemctl --system unmask "falco-plugin.service" >/dev/null || true
 
         # was-enabled defaults to true, so new installations run enable.
diff --git a/scripts/debian/postrm.in b/scripts/debian/postrm.in
index f064f7d8..1cc00ad5 100755
--- a/scripts/debian/postrm.in
+++ b/scripts/debian/postrm.in
@@ -30,7 +30,7 @@ if [ "$1" = "remove" ]; then
                 systemctl --system mask 'falco@.target' >/dev/null || true
                 systemctl --system mask 'falco-kmod.service' >/dev/null || true
                 systemctl --system mask 'falco-bpf.service' >/dev/null || true
-                systemctl --system mask 'falco-modern_bpf.service' >/dev/null || true
+                systemctl --system mask 'falco-modern-bpf.service' >/dev/null || true
                 systemctl --system mask "falco-plugin.service" >/dev/null || true
         fi
 fi
\ No newline at end of file
diff --git a/scripts/debian/prerm.in b/scripts/debian/prerm.in
index 41bf3f52..2ca0b533 100755
--- a/scripts/debian/prerm.in
+++ b/scripts/debian/prerm.in
@@ -24,7 +24,7 @@ set -e
 if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
         systemctl --system stop 'falco@kmod.target' >/dev/null || true
         systemctl --system stop 'falco@bpf.target' >/dev/null || true
-        systemctl --system stop 'falco@modern_bpf.target' >/dev/null || true
+        systemctl --system stop 'falco@modern-bpf.target' >/dev/null || true
         systemctl --system stop 'falco@plugin.target' >/dev/null || true
 fi
 
diff --git a/scripts/rpm/postinstall.in b/scripts/rpm/postinstall.in
index 7320fa7a..2b3d1c93 100755
--- a/scripts/rpm/postinstall.in
+++ b/scripts/rpm/postinstall.in
@@ -38,7 +38,7 @@ case "$1" in
                         chosen_driver="bpf"
                         ;;
                     4)
-                        chosen_driver="modern_bpf"
+                        chosen_driver="modern-bpf"
                         ;;
                     5)
                         chosen_driver="plugin"
@@ -73,7 +73,7 @@ if [ $1 -eq 1 ]; then
         /usr/bin/systemctl --system unmask "falco@.target" >/dev/null || true
         /usr/bin/systemctl --system unmask "falco-kmod.service" >/dev/null || true
         /usr/bin/systemctl --system unmask "falco-bpf.service" >/dev/null || true
-        /usr/bin/systemctl --system unmask "falco-modern_bpf.service" >/dev/null || true
+        /usr/bin/systemctl --system unmask "falco-modern-bpf.service" >/dev/null || true
         /usr/bin/systemctl --system unmask "falco-plugin.service" >/dev/null || true
 
         if [ -n "$chosen_driver" ]; then
diff --git a/scripts/rpm/postuninstall.in b/scripts/rpm/postuninstall.in
index d2b0d9b5..a1489f43 100755
--- a/scripts/rpm/postuninstall.in
+++ b/scripts/rpm/postuninstall.in
@@ -23,7 +23,7 @@ if [ -d /run/systemd/system ] && [ "$1" = 0 ]; then
         /usr/bin/systemctl --system mask 'falco@.target' >/dev/null || true
         /usr/bin/systemctl --system mask 'falco-kmod.service' >/dev/null || true
         /usr/bin/systemctl --system mask 'falco-bpf.service' >/dev/null || true
-        /usr/bin/systemctl --system mask 'falco-modern_bpf.service' >/dev/null || true
+        /usr/bin/systemctl --system mask 'falco-modern-bpf.service' >/dev/null || true
         /usr/bin/systemctl --system mask 'falco-plugin.service' >/dev/null || true
 fi
 
@@ -36,5 +36,5 @@ fi
 #   `systemd-update-helper mark-restart-system-units <service>`
 %systemd_postun_with_restart 'falco@kmod.target'
 %systemd_postun_with_restart 'falco@bpf.target'
-%systemd_postun_with_restart 'falco@modern_bpf.target'
+%systemd_postun_with_restart 'falco@modern-bpf.target'
 %systemd_postun_with_restart 'falco@plugin.target'
diff --git a/scripts/rpm/preuninstall.in b/scripts/rpm/preuninstall.in
index 0ee76e89..e2e703ea 100755
--- a/scripts/rpm/preuninstall.in
+++ b/scripts/rpm/preuninstall.in
@@ -22,7 +22,7 @@ if [ -d /run/systemd/system ] && [ $1 -eq 0 ]; then
         # stop falco service before uninstall
         /usr/bin/systemctl --system stop 'falco@kmod.target' >/dev/null || true
         /usr/bin/systemctl --system stop 'falco@bpf.target' >/dev/null || true
-        /usr/bin/systemctl --system stop 'falco@modern_bpf.target' >/dev/null || true
+        /usr/bin/systemctl --system stop 'falco@modern-bpf.target' >/dev/null || true
         /usr/bin/systemctl --system stop 'falco@plugin.target' >/dev/null || true
 fi
 
@@ -37,5 +37,5 @@ fi
 #  `systemd-update-helper remove-system-units <service>`
 %systemd_preun 'falco@kmod.target'
 %systemd_preun 'falco@bpf.target'
-%systemd_preun 'falco@modern_bpf.target'
+%systemd_preun 'falco@modern-bpf.target'
 %systemd_preun 'falco@plugin.target'
diff --git a/scripts/systemd/falco-bpf.service b/scripts/systemd/falco-bpf.service
index 9cf2f461..5d90e7de 100644
--- a/scripts/systemd/falco-bpf.service
+++ b/scripts/systemd/falco-bpf.service
@@ -3,7 +3,7 @@ Description=Falco: Container Native Runtime Security with ebpf
 Documentation=https://falco.org/docs/
 PartOf=falco@ebpf.target
 Conflicts=falco-kmod.service
-Conflicts=falco-modern_bpf.service
+Conflicts=falco-modern-bpf.service
 Conflicts=falco-plugin.service
 
 [Service]
diff --git a/scripts/systemd/falco-kmod.service b/scripts/systemd/falco-kmod.service
index 6f7f623b..33cf9786 100644
--- a/scripts/systemd/falco-kmod.service
+++ b/scripts/systemd/falco-kmod.service
@@ -5,7 +5,7 @@ After=falco-kmod-inject.service
 Requires=falco-kmod-inject.service
 PartOf=falco@kmod.target
 Conflicts=falco-bpf.service
-Conflicts=falco-modern_bpf.service
+Conflicts=falco-modern-bpf.service
 Conflicts=falco-plugin.service
 
 [Service]
diff --git a/scripts/systemd/falco-modern_bpf.service b/scripts/systemd/falco-modern-bpf.service
similarity index 100%
rename from scripts/systemd/falco-modern_bpf.service
rename to scripts/systemd/falco-modern-bpf.service
diff --git a/scripts/systemd/falco-plugin.service b/scripts/systemd/falco-plugin.service
index e82ecc3e..be6925e3 100644
--- a/scripts/systemd/falco-plugin.service
+++ b/scripts/systemd/falco-plugin.service
@@ -3,8 +3,8 @@ Description=Falco: Container Native Runtime Security with plugin
 Documentation=https://falco.org/docs/
 PartOf=falco@plugin.target
 Conflicts=falco-kmod.service
-Conflicts=falco-ebpf.service
-Conflicts=falco-modern_bpf.service
+Conflicts=falco-bpf.service
+Conflicts=falco-modern-bpf.service
 
 [Service]
 Type=simple