diff --git a/conf/systemd-scrutiny-collector.service b/conf/systemd-scrutiny-collector.service
index ce00675..9aae90b 100644
--- a/conf/systemd-scrutiny-collector.service
+++ b/conf/systemd-scrutiny-collector.service
@@ -10,7 +10,7 @@ Group=root
 WorkingDirectory=__INSTALL_DIR__
 LogsDirectory=__APP__
 StateDirectory=__APP__
-ExecStart=__INSTALL_DIR__/bin/scrutiny-collector-metrics-linux-__YNH_ARCH__ run --config __INSTALL_DIR__/config/collector.yaml
+ExecStart=__INSTALL_DIR__/bin/scrutiny-collector-metrics-linux run --config __INSTALL_DIR__/config/collector.yaml
 Restart=no
 StandardOutput=append:/var/log/__APP__/collector.log
 StandardError=inherit
diff --git a/conf/systemd-scrutiny-web-server.service b/conf/systemd-scrutiny-web-server.service
index b55ac88..c014d29 100644
--- a/conf/systemd-scrutiny-web-server.service
+++ b/conf/systemd-scrutiny-web-server.service
@@ -9,7 +9,7 @@ Group=__APP__
 WorkingDirectory=__INSTALL_DIR__
 LogsDirectory=__APP__
 StateDirectory=__APP__
-ExecStart=__INSTALL_DIR__/bin/scrutiny-web-linux-__YNH_ARCH__ start --config __INSTALL_DIR__/config/scrutiny.yaml
+ExecStart=__INSTALL_DIR__/bin/scrutiny-web-linux start --config __INSTALL_DIR__/config/scrutiny.yaml
 Restart=always
 RestartSec=10s
 StandardOutput=append:/var/log/__APP__/web-server.log
diff --git a/manifest.toml b/manifest.toml
index 6547afb..cd23205 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -41,7 +41,7 @@ ram.runtime = "50M"
 [resources]
     [resources.sources]
 
-        [resources.sources.web-linux]
+        [resources.sources.scrutiny-web-linux]
         in_subdir = false
         amd64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.7.3/scrutiny-web-linux-amd64"
         amd64.sha256 = "42071cb77bd04a608d35e5a6ecd712bd2f3496d6a7e46374171a8fa8bfa255d4"
@@ -52,7 +52,7 @@ ram.runtime = "50M"
         autoupdate.asset.amd64 = "^scrutiny-web-linux-amd64$"
         autoupdate.asset.arm64 = "^scrutiny-web-linux-arm64$"
 
-        [resources.sources.collector-metrics]
+        [resources.sources.scrutiny-collector-metrics]
         in_subdir = false
         amd64.url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.7.3/scrutiny-collector-metrics-linux-amd64"
         amd64.sha256 = "5dff7bc924a4003ae4e9d7c38832d87a931df74aec80b29dba929c18f2643f1b"
@@ -63,7 +63,7 @@ ram.runtime = "50M"
         autoupdate.asset.amd64 = "^scrutiny-collector-metrics-linux-amd64$"
         autoupdate.asset.arm64 = "^scrutiny-collector-metrics-linux-arm64$"
 
-        [resources.sources.web-frontend]
+        [resources.sources.scrutiny-web-frontend]
         in_subdir = true
         url = "https://github.com/AnalogJ/scrutiny/releases/download/v0.7.3/scrutiny-web-frontend.tar.gz"
         sha256 = "4dc50dde48494a45c88ac4c8b37fe89038b3b64d7eb51636778e4194b32e328d"
diff --git a/scripts/install b/scripts/install
index e47c5c4..04a43e9 100755
--- a/scripts/install
+++ b/scripts/install
@@ -17,11 +17,11 @@ source /usr/share/yunohost/helpers
 ynh_script_progression --message="Setting up source files..." --weight=1
 
 mkdir -p "$install_dir/bin"
-ynh_setup_source --source_id="web-linux" --dest_dir="$install_dir/bin"
-ynh_setup_source --source_id="collector-metrics" --dest_dir="$install_dir/bin"
+ynh_setup_source --source_id="scrutiny-web-linux" --dest_dir="$install_dir/bin"
+ynh_setup_source --source_id="scrutiny-collector-metrics" --dest_dir="$install_dir/bin"
 
 mkdir -p "$install_dir/web"
-ynh_setup_source --source_id="web-frontend" --dest_dir="$install_dir/web"
+ynh_setup_source --source_id="scrutiny-web-frontend" --dest_dir="$install_dir/web"
 
 #=================================================
 # SYSTEM CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index f5fd328..75ef24d 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -42,9 +42,9 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --source_id="web-linux" --dest_dir="$install_dir/bin"
-	ynh_setup_source --source_id="collector-metrics" --dest_dir="$install_dir/bin"
-	ynh_setup_source --source_id="web-frontend" --dest_dir="$install_dir/web"
+	ynh_setup_source --source_id="scrutiny-web-linux" --dest_dir="$install_dir/bin"
+	ynh_setup_source --source_id="scrutiny-collector-metrics" --dest_dir="$install_dir/bin"
+	ynh_setup_source --source_id="scrutiny-web-frontend" --dest_dir="$install_dir/web"
 fi
 
 #=================================================