diff --git a/conf/app.src b/conf/app.src
index 8da0a3b..9447497 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://framagit.org/framasoft/framaforms/-/archive/1.0.3/framaforms-1.0.3.tar.gz
-SOURCE_SUM=a7b004dac19d761212d49a0e407f5d31c97e49ccefca6443067a9d5da68bf64d
+SOURCE_URL=https://framagit.org/yakforms/yakforms/-/archive/1.0.3/yakforms-1.0.3.tar.gz
+SOURCE_SUM=f8a8ac8789c36f07f2d1a03d13f9f6d947e499967b79ea626f7f87271a357703
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/scripts/remove b/scripts/remove
index 1b12a17..8ff3cd4 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -20,6 +20,7 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # STANDARD REMOVE
@@ -71,7 +72,7 @@ ynh_remove_fpm_config
 ynh_script_progression --message="Removing app data directory..." --weight=1
 
 # Remove the app directory securely
-ynh_secure_remove --file="/home/yunohost.app/$app"
+ynh_secure_remove --file="$datadir"
 
 #=================================================
 # REMOVE THE CRON FILE