diff --git a/infra/APPIMAGE/README.md b/infra/APPIMAGE/README.md
index f385a0e1..7d07bf47 100644
--- a/infra/APPIMAGE/README.md
+++ b/infra/APPIMAGE/README.md
@@ -3,7 +3,7 @@
 ### Instructions
 This directory contains files to generate an .AppImage of Thorium.
 
-You __must__ place the .deb file (generated from running `package.sh`) in this directory, and then run `./build_appimage.sh`
+You __must__ place the .deb file (generated from running `package.sh`) in this directory, and then run `./make_appimage.sh`
 
 When it is done, you will have an appimage in *out*, I.E. it should be something like `//thorium/infra/APPIMAGE/out/Thorium_Browser-104.0.5107.0.glibc2.17-x86_64.AppImage`
 
diff --git a/infra/APPIMAGE/extract_appimage.sh b/infra/APPIMAGE/extract_appimage.sh
index 4e8e8c43..eaa4104e 100755
--- a/infra/APPIMAGE/extract_appimage.sh
+++ b/infra/APPIMAGE/extract_appimage.sh
@@ -18,7 +18,7 @@ try() { "$@" || die "${RED}Failed $*"; }
 displayHelp () {
 	printf "\n" &&
 	printf "${bold}${GRE}Script to extract Thorium .AppImage on Linux.${c0}\n" &&
-	printf "${bold}${YEL}Please run build_appimage.sh in this directory before running.${c0}\n" &&
+	printf "${bold}${YEL}Please run make_appimage.sh in this directory before running.${c0}\n" &&
 	printf "\n"
 }
 case $1 in
@@ -26,7 +26,7 @@ case $1 in
 esac
 
 printf "\n" &&
-printf "${bold}${RED}NOTE: You must run build_appimage.sh in this directory before running.${c0}\n" &&
+printf "${bold}${RED}NOTE: You must run make_appimage.sh in this directory before running.${c0}\n" &&
 printf "${YEL}Extracting Thorium*.Appimage...\n" &&
 printf "${c0}\n" &&
 
diff --git a/infra/APPIMAGE/build_appimage.sh b/infra/APPIMAGE/make_appimage.sh
similarity index 100%
rename from infra/APPIMAGE/build_appimage.sh
rename to infra/APPIMAGE/make_appimage.sh
diff --git a/infra/set_exec.sh b/infra/set_exec.sh
index 69ed4fb9..c2d3def4 100755
--- a/infra/set_exec.sh
+++ b/infra/set_exec.sh
@@ -99,7 +99,7 @@ sudo chmod -v +x infra/portable/make_portable_win.sh &&
 
 sudo chmod -v +x infra/APPIMAGE/pkg2appimage &&
 
-sudo chmod -v +x infra/APPIMAGE/build_appimage.sh &&
+sudo chmod -v +x infra/APPIMAGE/make_appimage.sh &&
 
 sudo chmod -v +x infra/APPIMAGE/extract_appimage.sh &&
 
diff --git a/setup.sh b/setup.sh
index b68f024f..1609156a 100755
--- a/setup.sh
+++ b/setup.sh
@@ -111,6 +111,7 @@ esac
 copyRaspi () {
 	printf "\n" &&
 	printf "${YEL}Copying Raspberry Pi build files...${c0}\n" &&
+	cp -r -v arm/build/* ${CR_SRC_DIR}/build/ &&
 	cp -r -v arm/media/* ${CR_SRC_DIR}/media/ &&
 	cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
 	cp -r -v arm/raspi/* ${CR_SRC_DIR}/ &&
@@ -130,6 +131,7 @@ esac
 copyWOA () {
 	printf "\n" &&
 	printf "${YEL}Copying Windows on ARM build files...${c0}\n" &&
+	cp -r -v arm/build/* ${CR_SRC_DIR}/build/ &&
 	cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
 	# Use regular arm.gni from src, pending further testing
 	# cp -v arm/woa_arm.gni ${CR_SRC_DIR}/build/config/arm.gni &&
@@ -192,6 +194,7 @@ esac
 copyAndroid () {
 	printf "\n" &&
 	printf "${YEL}Copying Android (ARM64 and ARM32) build files...${c0}\n" &&
+	cp -r -v arm/build/* ${CR_SRC_DIR}/build/ &&
 	cp -r -v arm/media/* ${CR_SRC_DIR}/media/ &&
 	cp -r -v arm/third_party/* ${CR_SRC_DIR}/third_party/ &&
 	printf "\n" &&