diff --git a/manifest.toml b/manifest.toml
index e68f479..3b261f7 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -38,7 +38,7 @@ ram.runtime = "100M"
     type = "path"
     default = "/digiscreen"
 
-    [install.pixabay]
+    [install.apikey_pixabay]
     ask.en = "Your Pixabay API key"
     ask.fr = "Votre clé d’API Pixabay"
     help.en = "Optional: a Pixabay API key will let you chose a background by entering keywords."
@@ -47,7 +47,7 @@ ram.runtime = "100M"
     example = "123456abc"
     optional = true
 
-    [install.googleYoutube]
+    [install.apikey_google_youtube]
     ask.en = "Your Google API key"
     ask.fr = "Votre clé d’API Google"
     help.en = "Optional: a Google API key will let you insert videos from Youtube on your Digiscreen"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 200b4ff..54cc852 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -12,8 +12,8 @@ nodejs_version="14"
 
 _digiscreen_build() {
     pushd "$install_dir/sources"
-        echo "VUE_APP_PIXABAY_API_KEY=$pixabay" >> .env
-        echo "VUE_APP_GOOGLE_API_KEY=$googleYoutube" >> .env
+        echo "VUE_APP_PIXABAY_API_KEY=$apikey_pixabay" >> .env
+        echo "VUE_APP_GOOGLE_API_KEY=$apikey_google_youtube" >> .env
 
         ynh_use_nodejs
         "$ynh_npm" install
diff --git a/scripts/upgrade b/scripts/upgrade
index 42b524a..fec401b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -22,6 +22,20 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
+if [[ -n "${googleYoutube:-}" ]]; then
+	# migrate camelCase to snake_case
+	apikey_google_youtube="$googleYoutube"
+	ynh_app_setting_set --app="$app" --key="apikey_google_youtube" --value="$apikey_google_youtube"
+	ynh_app_setting_delete --app="$app" --key="googleYoutube"
+fi
+
+if [[ -n "${pixabay:-}" ]]; then
+	# migrate camelCase to snake_case
+	apikey_pixabay="$pixabay"
+	ynh_app_setting_set --app="$app" --key="apikey_pixabay" --value="$apikey_pixabay"
+	ynh_app_setting_delete --app="$app" --key="pixabay"
+fi
+
 #=================================================
 # INSTALL NODEJS
 #=================================================
diff --git a/tests.toml b/tests.toml
index 2c1f45a..fb55e66 100644
--- a/tests.toml
+++ b/tests.toml
@@ -5,6 +5,6 @@ test_format = 1.0
 [default]
 
     args.pixabay = "cafe1007"
-    args.googleYoutube = "1337c0c4"
+    args.google_youtube = "1337c0c4"
 
     test_upgrade_from.3bb42cd71bcca77b7f642859bf5048317586a500.name = "First release"