diff --git a/tools/helpers2.1/convert_to_helpers_2.1.py b/tools/helpers2.1/convert_to_helpers_2.1.py
index b3387fc7..150a91a6 100644
--- a/tools/helpers2.1/convert_to_helpers_2.1.py
+++ b/tools/helpers2.1/convert_to_helpers_2.1.py
@@ -132,20 +132,20 @@ def cleanup():
         (r'sql_db_shell "?\$db_name"?', "sql_db_shell "),
         (r'--database="?\$db_name"?', ""),
         (r'--database="?\$app"?', ""),
-        (r"ynh_mysql_setup_db", "# FIXME ynh_mysql_create_db"),
-        (r"ynh_mysql_remove_db", "# FIXME ynh_mysql_drop_db && ynh_mysql_drop_user"),
-        (r"ynh_psql_setup_db", "# FIXME ynh_psql_create_db"),
-        (r"ynh_psql_remove_db", "# FIXME ynh_psql_drop_db && ynh_psql_drop_user"),
+        (r"ynh_mysql_setup_db", "# FIXMEhelpers2.1 ynh_mysql_create_db"),
+        (r"ynh_mysql_remove_db", "# FIXMEhelpers2.1 ynh_mysql_drop_db && ynh_mysql_drop_user"),
+        (r"ynh_psql_setup_db", "# FIXMEhelpers2.1 ynh_psql_create_db"),
+        (r"ynh_psql_remove_db", "# FIXMEhelpers2.1 ynh_psql_drop_db && ynh_psql_drop_user"),
         # PHP / composer
         (r" ?--phpversion=\S*", ""),
         (r" ?--composerversion=\S*", ""),
         (r" ?--usage=\S*", ""),
         (r" ?--footprint=\S*", ""),
-        (r"--group=www-data", "# FIXME : --group=www-data to be replaced with php_group=www-data to be added in _common.sh"),
+        (r"--group=www-data", "# FIXMEhelpers2.1 : --group=www-data to be replaced with php_group=www-data to be added in _common.sh"),
         (r"YNH_COMPOSER_VERSION=", "composer_version="),
         (r' --workdir="\$install_dir"', ""),
         (r'--workdir=\$install_dir ', ""),
-        (r'--workdir', "# FIXME (replace with composer_workdir=... prior to calling this helper, default is $intall_dir) --workdir"),
+        (r'--workdir', "# FIXMEhelpers2.1 (replace with composer_workdir=... prior to calling this helper, default is $intall_dir) --workdir"),
         (r'phpversion', "php_version"),
         (r'PHPVERSION', "PHP_VERSION"),
         (r"ynh_add_fpm_config", "ynh_config_add_phpfpm"),
@@ -153,14 +153,14 @@ def cleanup():
         (r"ynh_install_composer", "ynh_composer_install\nynh_composer_exec install --no-dev "),
         (r'--install_args="?([^"]+)"?(\s|$)', "\\1\\2"),
         (r'--commands="([^"]+)"(\s|$)', "\\1\\2"),
-        (r"(^fpm_usage=)", "# REMOVEME ? Everything about fpm_usage is removed in helpers2.1... | \\1"),
-        (r"(^.*\$fpm_usage)", "# REMOVEME ? Everything about fpm_usage is removed in helpers2.1... | \\1"),
-        (r"(^fpm_footprint=)", "# REMOVEME ? Everything about fpm_footprint is removed in helpers2.1... | \\1"),
-        (r"(^.*\$fpm_footprint)", "# REMOVEME ? Everything about fpm_footprint is removed in helpers2.1... | \\1"),
-        (r"(^set__fpm_footprint)", "# REMOVEME ? Everything about fpm_footprint is removed in helpers2.1... | \\1"),
-        (r"(^fpm_free_footprint=)", "# REMOVEME ? Everything about fpm_free_footprint is removed in helpers2.1... | \\1"),
-        (r"(^.*\$fpm_free_footprint)", "# REMOVEME ? Everything about fpm_free_footprint is removed in helpers2.1... | \\1"),
-        (r"(^set__fpm_free_footprint)", "# REMOVEME ? Everything about fpm_free_footprint is removed in helpers2.1... | \\1"),
+        (r"(^fpm_usage=)", "#REMOVEME? Everything about fpm_usage is removed in helpers2.1... | \\1"),
+        (r"(^.*\$fpm_usage)", "#REMOVEME? Everything about fpm_usage is removed in helpers2.1... | \\1"),
+        (r"(^fpm_footprint=)", "#REMOVEME? Everything about fpm_footprint is removed in helpers2.1... | \\1"),
+        (r"(^.*\$fpm_footprint)", "#REMOVEME? Everything about fpm_footprint is removed in helpers2.1... | \\1"),
+        (r"(^set__fpm_footprint)", "#REMOVEME? Everything about fpm_footprint is removed in helpers2.1... | \\1"),
+        (r"(^fpm_free_footprint=)", "#REMOVEME? Everything about fpm_free_footprint is removed in helpers2.1... | \\1"),
+        (r"(^.*\$fpm_free_footprint)", "#REMOVEME? Everything about fpm_free_footprint is removed in helpers2.1... | \\1"),
+        (r"(^set__fpm_free_footprint)", "#REMOVEME? Everything about fpm_free_footprint is removed in helpers2.1... | \\1"),
         # Nodejs
         (r'"?\$?ynh_node"?', "node"),
         (r"NODEJS_VERSION=", "nodejs_version="),
@@ -202,7 +202,7 @@ def cleanup():
         (r"--match_string", "--match"),
         (r"--replace_string", "--replace"),
         (r"--target_file", "--file"),
-        (r"(ynh_replace ('|\"))", "# FIXME: ynh_replace used with positional args. Please add the keywords: --match=, --replace=, --file=\n\\1"),
+        (r"(ynh_replace ('|\"))", "# FIXMEhelpers2.1: ynh_replace used with positional args. Please add the keywords: --match=, --replace=, --file=\n\\1"),
         # Nginx
         (r"ynh_add_nginx_config", "ynh_config_add_nginx"),
         (r"ynh_remove_nginx_config", "ynh_config_remove_nginx"),
@@ -243,7 +243,7 @@ def cleanup():
         ("Stopping a systemd service...", "Stopping $app's systemd service..."),
         ("Starting a systemd service...", "Starting $app's systemd service..."),
         # Recommend ynh_app_setting_set_default
-        (r"( *if \[.*-z.*:-}.*\].*\n?.*then\n\s+(\S+)=(.+)\n\s+ynh_app_setting_set.*\n\s*fi\n)", "# FIXME: maybe replace with: ynh_app_setting_set_default --key=\\2 --value=\\3\n\\1"),
+        (r"( *if \[.*-z.*:-}.*\].*\n?.*then\n\s+(\S+)=(.+)\n\s+ynh_app_setting_set.*\n\s*fi\n)", "# FIXMEhelpers2.1: maybe replace with: ynh_app_setting_set_default --key=\\2 --value=\\3\n\\1"),
         # Trailing spaces
         (r"\s+$", "\n"),
     ]