diff --git a/.github/workflows/other.yml b/.github/workflows/other.yml
index 1caca5f7179..62fb297f61c 100644
--- a/.github/workflows/other.yml
+++ b/.github/workflows/other.yml
@@ -76,7 +76,7 @@ jobs:
             make install DESTDIR="/tmp/supertux" VERBOSE=1
             ./test_supertux2
 
-  ubports:
+  clickable:
     strategy:
       fail-fast: false
       matrix:
@@ -109,18 +109,18 @@ jobs:
         env:
           BUILD_TYPE: ${{ (matrix.build_type == 'Debug') && '--debug' || '' }}
           ARCH: ${{ matrix.arch }}
-        run: ~/.local/bin/clickable build --verbose ${BUILD_TYPE} --arch ${ARCH} --config mk/ubports/clickable.json
+        run: ~/.local/bin/clickable build --verbose ${BUILD_TYPE} --arch ${ARCH} --config mk/clickable/clickable.json
       - uses: actions/upload-artifact@v2
         with:
-          name: "ubports-${{ matrix.arch }}-${{ matrix.build_type }}-click"
-          path: build.ubports/*.click
+          name: "clickable-${{ matrix.arch }}-${{ matrix.build_type }}-click"
+          path: build.clickable/*.click
           if-no-files-found: ignore
       - name: Publish to Open Store
         if: ${{ github.ref == 'refs/heads/master' && matrix.build_type == 'Release' }}
         env:
           ARCH: ${{ matrix.arch }}
           OPENSTORE_KEY: ${{ secrets.OPENSTORE_KEY }}
-        run: ~/.local/bin/clickable publish "* $(git log -1 --pretty=%B | head -1)" --apikey ${OPENSTORE_KEY} --config mk/ubports/clickable.json --arch ${ARCH}
+        run: ~/.local/bin/clickable publish "* $(git log -1 --pretty=%B | head -1)" --apikey ${OPENSTORE_KEY} --config mk/clickable/clickable.json --arch ${ARCH}
 
   wasm:
     strategy:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34af008ab6d..6a3060b0f75 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1066,8 +1066,8 @@ else(WIN32 AND NOT UNIX)
       set(LINUX_DESKTOP_ICON "assets/supertux-256x256.png")
       # FIXME: The "install" folder is a folder managed by Clickable and shouldn't be hardcoded here
       configure_file(${CMAKE_CURRENT_SOURCE_DIR}/supertux2.desktop.in "install/supertux2.desktop")
-      install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mk/ubports/supertux2.apparmor DESTINATION ".")
-      configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mk/ubports/manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/install/manifest.json)
+      install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mk/clickable/supertux2.apparmor DESTINATION ".")
+      configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mk/clickable/manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/install/manifest.json)
       set(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/supertux2")
       install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux-256x256.png DESTINATION "assets")
     else(UBUNTU_TOUCH)
diff --git a/mk/ubports/clickable.json b/mk/clickable/clickable.json
similarity index 100%
rename from mk/ubports/clickable.json
rename to mk/clickable/clickable.json
diff --git a/mk/ubports/manifest.json.in b/mk/clickable/manifest.json.in
similarity index 100%
rename from mk/ubports/manifest.json.in
rename to mk/clickable/manifest.json.in
diff --git a/mk/ubports/supertux2.apparmor b/mk/clickable/supertux2.apparmor
similarity index 100%
rename from mk/ubports/supertux2.apparmor
rename to mk/clickable/supertux2.apparmor