diff --git a/Makefile b/Makefile
index 3a15b940..54386398 100644
--- a/Makefile
+++ b/Makefile
@@ -143,9 +143,9 @@ ifdef ARCH_WIN
 endif
 
 DIST_RES := res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt
-DIST_NAME := RackFree-"$(VERSION)"-$(ARCH_FULL_NAME)
+DIST_NAME := RackFree-"$(VERSION)"-$(ARCH_NAME)
 DIST_SDK_DIR := Rack-SDK
-DIST_SDK := Rack-SDK-"$(VERSION)"-$(ARCH_FULL_NAME).zip
+DIST_SDK := Rack-SDK-"$(VERSION)"-$(ARCH_NAME).zip
 ifdef ARCH_MAC
 	DIST_BUNDLE := VCV Rack $(VERSION_MAJOR) Free.app
 else
diff --git a/arch.mk b/arch.mk
index 6aa03e10..7e942b41 100644
--- a/arch.mk
+++ b/arch.mk
@@ -2,33 +2,25 @@ MACHINE := $(shell $(CC) -dumpmachine)
 
 ifneq (,$(findstring x86_64-,$(MACHINE)))
 	ARCH_X64 := 1
-	ARCH_NAME := x64
+	ARCH_CPU := x64
 else ifneq (,$(findstring arm64-,$(MACHINE)))
 	ARCH_ARM64 := 1
-	ARCH_NAME := arm64
+	ARCH_CPU := arm64
 else
 $(error Could not determine CPU architecture of $(MACHINE))
 endif
 
 ifneq (,$(findstring -darwin,$(MACHINE)))
 	ARCH_MAC := 1
-	ARCH_OS_NAME := mac
+	ARCH_OS := mac
 else ifneq (,$(findstring -mingw32,$(MACHINE)))
 	ARCH_WIN := 1
-	ARCH_OS_NAME := win
+	ARCH_OS := win
 else ifneq (,$(findstring -linux,$(MACHINE)))
 	ARCH_LIN := 1
-	ARCH_OS_NAME := lin
+	ARCH_OS := lin
 else
 $(error Could not determine operating system of $(MACHINE))
 endif
 
-
-# The architecture "full name" is used in package filenames.
-# Examples: win, lin, mac, mac_arm64
-ifdef ARCH_X64
-	# Omit arch name for x64
-	ARCH_FULL_NAME := $(ARCH_OS_NAME)
-else
-	ARCH_FULL_NAME := $(ARCH_OS_NAME)_$(ARCH_NAME)
-endif
+ARCH_NAME := $(ARCH_OS)_$(ARCH_CPU)
diff --git a/plugin.mk b/plugin.mk
index a16b3649..88a51f51 100644
--- a/plugin.mk
+++ b/plugin.mk
@@ -79,7 +79,7 @@ else
 	cp -r --parents $(DISTRIBUTABLES) dist/$(SLUG)/
 endif
 	@# Create ZIP package
-	cd dist && tar -c $(SLUG) | zstd -$(ZSTD_COMPRESSION_LEVEL) -o "$(SLUG)"-"$(VERSION)"-$(ARCH_FULL_NAME).vcvplugin
+	cd dist && tar -c $(SLUG) | zstd -$(ZSTD_COMPRESSION_LEVEL) -o "$(SLUG)"-"$(VERSION)"-$(ARCH_NAME).vcvplugin
 
 install: dist
 	mkdir -p "$(RACK_USER_DIR)"/plugins/