diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd8e9127dd..9878cfdb4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -395,7 +395,7 @@ deps-flatpak-x64:
     #paths:
       #- .flatpak-builder/
   script:
-    - sh build/linux/flatpak/1_build-deps-flatpak.sh
+    - sh build/linux/flatpak/1_build-deps-flatpakbuilder.sh
   artifacts:
     paths:
       - .flatpak-builder.tar
@@ -411,7 +411,7 @@ gimp-flatpak-x64:
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
   script:
-    - sh build/linux/flatpak/2_build-gimp-flatpak.sh
+    - sh build/linux/flatpak/2_build-gimp-flatpakbuilder.sh
   artifacts:
     paths:
       - repo.tar
@@ -751,7 +751,7 @@ dist-flatpak-weekly:
   needs: ["gimp-flatpak-x64"]
   stage: distribution
   script:
-    - sh build/linux/flatpak/3_dist-gimp-flatpak.sh
+    - sh build/linux/flatpak/3_dist-gimp-flatpakbuilder.sh
   artifacts:
     expose_as: 'Linux flatpak'
     paths:
diff --git a/build/linux/flatpak/1_build-deps-flatpak.sh b/build/linux/flatpak/1_build-deps-flatpakbuilder.sh
similarity index 97%
rename from build/linux/flatpak/1_build-deps-flatpak.sh
rename to build/linux/flatpak/1_build-deps-flatpakbuilder.sh
index fd576f97a3..282188b3f6 100644
--- a/build/linux/flatpak/1_build-deps-flatpak.sh
+++ b/build/linux/flatpak/1_build-deps-flatpakbuilder.sh
@@ -9,7 +9,7 @@ set -e
 
 if [ -z "$GITLAB_CI" ]; then
   # Make the script work locally
-  if [ "$0" != 'build/linux/flatpak/1_build-deps-flatpak.sh' ] && [ $(basename "$PWD") != 'flatpak' ]; then
+  if [ "$0" != 'build/linux/flatpak/1_build-deps-flatpakbuilder.sh' ] && [ $(basename "$PWD") != 'flatpak' ]; then
     printf '\033[31m(ERROR)\033[0m: Script called from wrong dir. Please, read: https://developer.gimp.org/core/setup/build/linux/\n'
     exit 1
   elif [ $(basename "$PWD") = 'flatpak' ]; then
diff --git a/build/linux/flatpak/2_build-gimp-flatpak.sh b/build/linux/flatpak/2_build-gimp-flatpakbuilder.sh
similarity index 92%
rename from build/linux/flatpak/2_build-gimp-flatpak.sh
rename to build/linux/flatpak/2_build-gimp-flatpakbuilder.sh
index df75cbe63f..18dddcdcb7 100644
--- a/build/linux/flatpak/2_build-gimp-flatpak.sh
+++ b/build/linux/flatpak/2_build-gimp-flatpakbuilder.sh
@@ -9,7 +9,7 @@ set -e
 
 if [ -z "$GITLAB_CI" ]; then
   # Make the script work locally
-  if [ "$0" != 'build/linux/flatpak/2_build-gimp-flatpak.sh' ] && [ $(basename "$PWD") != 'flatpak' ]; then
+  if [ "$0" != 'build/linux/flatpak/2_build-gimp-flatpakbuilder.sh' ] && [ $(basename "$PWD") != 'flatpak' ]; then
     printf '\033[31m(ERROR)\033[0m: Script called from wrong dir. Please, read: https://developer.gimp.org/core/setup/build/linux/\n'
     exit 1
   elif [ $(basename "$PWD") = 'flatpak' ]; then
@@ -21,7 +21,7 @@ fi
 
 
 # Install part of the deps
-eval "$(sed -n '/Install part/,/End of check/p' build/linux/flatpak/1_build-deps-flatpak.sh)"
+eval "$(sed -n '/Install part/,/End of check/p' build/linux/flatpak/1_build-deps-flatpakbuilder.sh)"
 
 if [ "$GITLAB_CI" ]; then
   # Extract deps from previous job
diff --git a/build/linux/flatpak/3_dist-gimp-flatpak.sh b/build/linux/flatpak/3_dist-gimp-flatpakbuilder.sh
similarity index 100%
rename from build/linux/flatpak/3_dist-gimp-flatpak.sh
rename to build/linux/flatpak/3_dist-gimp-flatpakbuilder.sh