diff --git a/scripts/_common.sh b/scripts/_common.sh
index 793d2a8..b94dffb 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -121,7 +121,9 @@ function vpnclient_deploy_files_and_services()
 {
   local domain=$1
   local app=$2
+  local service_name=$3
   local sysuser="${app}"
+  local service_checker_name="$service_name-checker"
 
   # Ensure vpnclient_ynh has its own system user
   if ! ynh_system_user_exists ${sysuser}
@@ -138,7 +140,7 @@ function vpnclient_deploy_files_and_services()
   install -o root -g root -m 0755 ../conf/ipv6_compressed /usr/local/bin/
 
   # Install command-line cube file loader
-  install -o root -g root -m 0755 ../conf/$service_checker-loadcubefile.sh /usr/local/bin/
+  install -o root -g root -m 0755 ../conf/$service_name-loadcubefile.sh /usr/local/bin/
 
   # Copy confs
   mkdir -pm 0755 /var/log/nginx/
diff --git a/scripts/install b/scripts/install
index 5a2cc55..9409b99 100644
--- a/scripts/install
+++ b/scripts/install
@@ -80,7 +80,7 @@ ynh_install_app_dependencies "$pkg_dependencies"
 #=================================================
 ynh_print_info "Deploy files from package..."
 
-vpnclient_deploy_files_and_services "${domain}" "${app}"
+vpnclient_deploy_files_and_services "${domain}" "${app}" "${service_name}"
 
 #=================================================
 # RELOAD SERVICES
diff --git a/scripts/upgrade b/scripts/upgrade
index 3f17461..af6891b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -84,7 +84,7 @@ tmpdir=$(mktemp -d /tmp/vpnclient-upgrade-XXX)
 cp -r /etc/openvpn/client* ${tmpdir}
 
 # Deploy files from package
-vpnclient_deploy_files_and_services "${domain}" "${app}"
+vpnclient_deploy_files_and_services "${domain}" "${app}" "${service_name}"
 
 # Restore previously existing config files
 cp -r ${tmpdir}/client* /etc/openvpn/