diff --git a/Info.plist b/Info.plist
index 52c26b06..673aa958 100644
--- a/Info.plist
+++ b/Info.plist
@@ -7,12 +7,12 @@
 	<key>CFBundleName</key><string>VCV Rack 2 Free</string>
 	<key>CFBundleDisplayName</key><string>VCV Rack 2 Free</string>
 	<key>CFBundleIdentifier</key><string>com.vcvrack.rack2</string>
-	<key>CFBundleVersion</key><string>{VERSION}</string>
+	<key>CFBundleVersion</key><string>{RACK_VERSION}</string>
 	<key>CFBundlePackageType</key><string>APPL</string>
 	<key>CFBundleSignature</key><string>RACK</string>
 	<key>CFBundleExecutable</key><string>Rack</string>
 	<key>CFBundleIconFile</key><string>icon</string>
-	<key>CFBundleShortVersionString</key><string>{VERSION}</string>
+	<key>CFBundleShortVersionString</key><string>{RACK_VERSION}</string>
 	<key>NSHumanReadableCopyright</key><string>Copyright © VCV</string>
 	<key>NSPrincipalClass</key><string>NSApplication</string>
 	<key>NSHighResolutionCapable</key><true/>
diff --git a/Makefile b/Makefile
index 1d6accc6..2699aee2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RACK_DIR ?= .
-EDITION := Free
-VERSION_MAJOR := 2
-VERSION ?= $(patsubst v%,%,$(shell git describe --tags --match "v$(VERSION_MAJOR).*"))
+RACK_EDITION := Free
+RACK_VERSION_MAJOR := 2
+RACK_VERSION ?= $(patsubst v%,%,$(shell git describe --tags --match "v$(RACK_VERSION_MAJOR).*"))
 
 FLAGS += -Iinclude -Idep/include
 
@@ -17,7 +17,7 @@ SOURCES += dep/tinyexpr/tinyexpr.c
 SOURCES += $(wildcard src/*.c src/*/*.c)
 SOURCES += $(wildcard src/*.cpp src/*/*.cpp)
 
-build/src/common.cpp.o: FLAGS += -D_APP_VERSION=$(VERSION)
+build/src/common.cpp.o: FLAGS += -D_RACK_VERSION=$(RACK_VERSION)
 build/dep/tinyexpr/tinyexpr.c.o: FLAGS += -DTE_POW_FROM_RIGHT -DTE_NAT_LOG
 
 FLAGS += -fPIC
@@ -164,17 +164,17 @@ endif
 
 # The following targets are not supported for public use
 
-DIST_NAME = Rack$(EDITION)-$(VERSION)-$(ARCH_NAME)
+DIST_NAME = Rack$(RACK_EDITION)-$(RACK_VERSION)-$(ARCH_NAME)
 ifdef ARCH_MAC
-	DIST_BUNDLE := VCV Rack $(VERSION_MAJOR) $(EDITION).app
+	DIST_BUNDLE := VCV Rack $(RACK_VERSION_MAJOR) $(RACK_EDITION).app
 else
-	DIST_DIR := Rack$(VERSION_MAJOR)$(EDITION)
+	DIST_DIR := Rack$(RACK_VERSION_MAJOR)$(RACK_EDITION)
 endif
 DIST_MD := $(wildcard *.md)
 DIST_HTML := $(patsubst %.md, build/%.html, $(DIST_MD))
 DIST_RES := res cacert.pem Core.json template.vcv LICENSE-GPLv3.txt $(DIST_HTML) translations
 DIST_SDK_DIR := Rack-SDK
-DIST_SDK = Rack-SDK-$(VERSION)-$(ARCH_NAME).zip
+DIST_SDK = Rack-SDK-$(RACK_VERSION)-$(ARCH_NAME).zip
 FUNDAMENTAL_VERSION ?= 2.6.1
 FUNDAMENTAL_FILENAME := Fundamental-$(FUNDAMENTAL_VERSION)-$(ARCH_NAME).vcvplugin
 
@@ -211,7 +211,7 @@ ifdef ARCH_MAC
 	otool -L dist/"$(DIST_BUNDLE)"/Contents/MacOS/$(STANDALONE_TARGET)
 	# Copy resources
 	cp Info.plist dist/"$(DIST_BUNDLE)"/Contents/
-	$(SED) 's/{VERSION}/$(VERSION)/g' dist/"$(DIST_BUNDLE)"/Contents/Info.plist
+	$(SED) 's/{RACK_VERSION}/$(RACK_VERSION)/g' dist/"$(DIST_BUNDLE)"/Contents/Info.plist
 	cp -R icon.icns dist/"$(DIST_BUNDLE)"/Contents/Resources/
 	cp -R $(DIST_RES) dist/"$(DIST_BUNDLE)"/Contents/Resources/
 	cp "$(FUNDAMENTAL_FILENAME)" dist/"$(DIST_BUNDLE)"/Contents/Resources/
@@ -273,7 +273,7 @@ endif
 ifdef ARCH_WIN
 	# Make NSIS installer
 	# pacman -S mingw-w64-x86_64-nsis
-	makensis -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION=$(VERSION) "-XOutFile dist/$(DIST_NAME).exe" installer.nsi
+	makensis -DRACK_VERSION_MAJOR=$(RACK_VERSION_MAJOR) -DRACK_VERSION=$(RACK_VERSION) "-XOutFile dist/$(DIST_NAME).exe" installer.nsi
 endif
 
 
diff --git a/installer.nsi b/installer.nsi
index 1c28be6a..870451cb 100644
--- a/installer.nsi
+++ b/installer.nsi
@@ -1,10 +1,10 @@
 !include "MUI2.nsh"
 
-!define NAME_FULL "VCV Rack Free ${VERSION}"
-!define NAME "VCV Rack ${VERSION_MAJOR} Free"
-!define RACK_DIR "Rack${VERSION_MAJOR}Free"
-!define INSTALL_REG "Software\VCV\Rack${VERSION_MAJOR}Free"
-!define UNINSTALL_REG "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCVRack${VERSION_MAJOR}Free"
+!define NAME_FULL "VCV Rack Free ${RACK_VERSION}"
+!define NAME "VCV Rack ${RACK_VERSION_MAJOR} Free"
+!define RACK_DIR "Rack${RACK_VERSION_MAJOR}Free"
+!define INSTALL_REG "Software\VCV\Rack${RACK_VERSION_MAJOR}Free"
+!define UNINSTALL_REG "Software\Microsoft\Windows\CurrentVersion\Uninstall\VCVRack${RACK_VERSION_MAJOR}Free"
 
 Name "${NAME_FULL}"
 Unicode True
@@ -94,7 +94,7 @@ Section "${NAME}" INSTALL_SECTION
 	; Write uninstaller info
 	WriteRegStr HKLM "${UNINSTALL_REG}" "DisplayName" "${NAME}"
 	WriteRegStr HKLM "${UNINSTALL_REG}" "DisplayIcon" '"$INSTDIR\Rack.exe"'
-	WriteRegStr HKLM "${UNINSTALL_REG}" "DisplayVersion" "${VERSION}"
+	WriteRegStr HKLM "${UNINSTALL_REG}" "DisplayVersion" "${RACK_VERSION}"
 	WriteRegStr HKLM "${UNINSTALL_REG}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
 	WriteRegStr HKLM "${UNINSTALL_REG}" "QuietUninstallString" '"$INSTDIR\Uninstall.exe" /S'
 	WriteRegStr HKLM "${UNINSTALL_REG}" "InstallLocation" '"$INSTDIR"'
diff --git a/src/common.cpp b/src/common.cpp
index 4f2869c0..aad8aeab 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -19,7 +19,7 @@ const std::string APP_NAME = "VCV Rack";
 const std::string APP_EDITION = "Free";
 const std::string APP_EDITION_NAME = "Free";
 const std::string APP_VERSION_MAJOR = "2";
-const std::string APP_VERSION = TOSTRING(_APP_VERSION);
+const std::string APP_VERSION = TOSTRING(_RACK_VERSION);
 #if defined ARCH_WIN
 	const std::string APP_OS = "win";
 	const std::string APP_OS_NAME = "Windows";