diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
index b1384a266..e54efe5fa 100644
--- a/.github/workflows/build_docker.yml
+++ b/.github/workflows/build_docker.yml
@@ -22,8 +22,8 @@ jobs:
 
       - name: Build Docker image (Windows)
         run: |
-          docker build -t "rrdash/tomb1main:latest" . -f docker/game-win/Dockerfile
-          docker push "rrdash/tomb1main:latest"
+          docker build -t "rrdash/tr1x:latest" . -f docker/game-win/Dockerfile
+          docker push "rrdash/tr1x:latest"
 
   publish_docker_image_linux:
     name: Build Linux Docker toolchain
@@ -43,5 +43,5 @@ jobs:
 
       - name: Build Docker image (Linux)
         run: |
-          docker build -t "rrdash/tomb1main-linux:latest" . -f docker/game-linux/Dockerfile
-          docker push "rrdash/tomb1main-linux:latest"
+          docker build -t "rrdash/tr1x-linux:latest" . -f docker/game-linux/Dockerfile
+          docker push "rrdash/tr1x-linux:latest"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f5a4ec152..2f6e5e407 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -70,7 +70,7 @@ jobs:
         run: |
           mv artifacts/game-win.zip artifacts/TR1X-${{ steps.get_version.outputs.VERSION }}-Windows.zip
           mv artifacts/game-linux.zip artifacts/TR1X-${{ steps.get_version.outputs.VERSION }}-Linux.zip
-          mv artifacts/Tomb1Main_Installer.exe artifacts/TR1X-${{ steps.get_version.outputs.VERSION }}-Installer.exe
+          mv artifacts/TR1X_Installer.exe artifacts/TR1X-${{ steps.get_version.outputs.VERSION }}-Installer.exe
 
       - name: Generate Changelog
         run: |
@@ -120,7 +120,7 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: configtool
-          path: tools/config/out/Tomb1Main_ConfigTool.exe
+          path: tools/config/out/TR1X_ConfigTool.exe
 
   build_game_win:
     name: Build the game (Windows)
@@ -276,4 +276,4 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: installer
-          path: tools/installer/out/Tomb1Main_Installer.exe
+          path: tools/installer/out/TR1X_Installer.exe