diff --git a/.github/workflows/dev_build.yml b/.github/workflows/dev_build.yml
index 892aa6b4..1b5994a0 100644
--- a/.github/workflows/dev_build.yml
+++ b/.github/workflows/dev_build.yml
@@ -29,7 +29,6 @@ jobs:
 
       - name: Build the project
         run: |
-          cd Porytiles-1.x
           export CXX=clang++-16
           cmake -B build
           cd build
@@ -37,7 +36,7 @@ jobs:
 
       - name: Run test suite
         run: |
-          ./Porytiles-1.x/build/test/PorytilesTestSuite
+          ./build/Porytiles-1.x/test/Porytiles1xTestSuite
 
   build-linux-amd64-gcc:
     name: Build on linux-amd64 with gcc
@@ -61,7 +60,6 @@ jobs:
 
       - name: Build the project
         run: |
-          cd Porytiles-1.x
           export CXX=g++-13
           cmake -B build
           cd build
@@ -69,13 +67,13 @@ jobs:
 
       - name: Run test suite
         run: |
-          ./Porytiles-1.x/build/test/PorytilesTestSuite
+          ./build/Porytiles-1.x/test/Porytiles1xTestSuite
 
   build-macos-arm64-clang-llvm:
     name: Build on macos-arm64 with clang
     runs-on: macos-latest
     # GitHub removed Intel Mac runners, so macos-latest is now arm64
-    # We don't need to install zlib since it is shipped with MacOS, CMake will find it
+    # We don't need to install zlib since it is shipped with macOS, CMake will find it
     steps:
       - name: Install Clang+LLVM 16 and dependencies
         run: |
@@ -90,10 +88,9 @@ jobs:
         uses: actions/checkout@v3
 
       # Use -DCMAKE_FIND_FRAMEWORK=NEVER, otherwise CMake sometimes picks up outdated
-      # package versions deeply buried in some ancient MacOS system framework
+      # package versions deeply buried in some ancient macOS system framework
       - name: Build the project
         run: |
-          cd Porytiles-1.x
           export CXX=/opt/homebrew/opt/llvm@16/bin/clang++
           cmake -DCMAKE_FIND_FRAMEWORK=NEVER -B build
           cd build
@@ -101,4 +98,4 @@ jobs:
 
       - name: Run test suite
         run: |
-          ./Porytiles-1.x/build/test/PorytilesTestSuite
+          ./build/Porytiles-1.x/test/Porytiles1xTestSuite
diff --git a/Scripts/package.sh b/Scripts/package.sh
index 88548072..f9446334 100755
--- a/Scripts/package.sh
+++ b/Scripts/package.sh
@@ -5,8 +5,8 @@ set -eu
 # FIXME : build version and date not correctly passed, need to find idiomatic CMake way to handle this
 
 package_release() {
-  cp Porytiles-1.x/build/cli/porytiles "$output_directory/porytiles-$mode"
-  cp Porytiles-1.x/build/test/PorytilesTestSuite "$output_directory/porytiles-$mode"
+  cp build/Porytiles-1.x/cli/porytiles "$output_directory/porytiles-$mode"
+  cp build/Porytiles-1.x/test/Porytiles1xTestSuite "$output_directory/porytiles-$mode"
   cp CHANGELOG.md "$output_directory/porytiles-$mode"
   cp README.md "$output_directory/porytiles-$mode"
   cp LICENSE "$output_directory/porytiles-$mode"
@@ -17,7 +17,7 @@ package_release() {
 
   # Run the tests, bail package script if they fail
   pushd "$output_directory/porytiles-$mode"
-  ./PorytilesTestSuite
+  ./Porytiles1xTestSuite
   popd
 
   # Everything OK, make the zip
@@ -27,36 +27,33 @@ package_release() {
 macos_arm64() {
   echo "Packaging release macos-arm64..."
   mkdir -p "$output_directory/porytiles-$mode"
-  cd Porytiles-1.x
   export CXX="/opt/homebrew/opt/llvm@16/bin/clang++"
   cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_FIND_FRAMEWORK=NEVER -B build
-  cd build
+  pushd build
   cmake --build .
-  cd ../..
+  popd
   package_release
 }
 
 linux_aarch64() {
   echo "Packaging release linux-aarch64..."
   mkdir -p "$output_directory/porytiles-$mode"
-  cd Porytiles-1.x
   export CXX="clang++-16"
   cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_FIND_FRAMEWORK=NEVER -B build
-  cd build
+  pushd build
   cmake --build .
-  cd ../..
+  popd
   package_release
 }
 
 linux_amd64() {
   echo "Packaging release linux-amd64..."
   mkdir -p "$output_directory/porytiles-$mode"
-  cd Porytiles-1.x
   export CXX="clang++-16"
   cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_FIND_FRAMEWORK=NEVER -B build
-  cd build
+  pushd build
   cmake --build .
-  cd ../..
+  popd
   package_release
 }