diff --git a/Makefile b/Makefile
index ab81152..bfa6a1a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,12 @@ appName = Coffee Crisis
 releaseFolder = cc_release
 version = v2.1b
 
+# Release names
+windowsRelease = $(executable)-$(version)-win32-x64.zip
+macosIntelRelease = $(executable)-$(version)-macos-intel.dmg
+macosAppleSiliconRelease = $(executable)-$(version)-macos-apple-silicon.dmg
+linuxRelease = $(executable)-$(version)-linux.tar.gz
+
 windows:
 	@echo off
 	powershell if (Test-Path data\config\config.bin) {Remove-Item data\config\config.bin -Recurse -Force}
@@ -34,8 +40,8 @@ windows_release:
 	strip -s -R .comment -R .gnu.version "$(releaseFolder)/$(executable).exe" --strip-unneeded
 
 # Create ZIP
-	powershell if (Test-Path $(executable)_win_$(version).zip) {Remove-Item $(executable)_win_$(version).zip}
-	powershell Compress-Archive -Path "$(releaseFolder)"/* -DestinationPath $(executable)_win_$(version).zip
+	powershell if (Test-Path $(windowsRelease)) {Remove-Item $(windowsRelease)}
+	powershell Compress-Archive -Path "$(releaseFolder)"/* -DestinationPath $(windowsRelease)
 
 # Remove folder
 	powershell if (Test-Path $(releaseFolder)) {Remove-Item $(releaseFolder) -Recurse -Force}
@@ -46,10 +52,14 @@ macos:
 	clang++ $(source) -D DEBUG  -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -o $(executable)_macos
 
 macos_release:
-# Remove data
+# Remove data and possible data
 	rm -f data/config/config.bin
 	rm -f data/config/score.bin
 	rm -rdf "$(releaseFolder)"
+	rm -rdf Frameworks
+	rm -f tmp.dmg
+	rm -f "$(macosIntelRelease)"
+	rm -f "$(macosAppleSiliconRelease)"
 
 # Create folders
 	mkdir -p "$(releaseFolder)/$(appName).app/Contents/Frameworks"
@@ -59,8 +69,8 @@ macos_release:
 
 # Copy folders
 	cp -R data "$(releaseFolder)/$(appName).app/Contents/Resources"
-	cp -R /Library/Frameworks/SDL2.framework "$(releaseFolder)/$(appName).app/Contents/Frameworks"
-	cp -R /Library/Frameworks/SDL2.framework Frameworks
+	cp -R release/SDL2.framework "$(releaseFolder)/$(appName).app/Contents/Frameworks"
+	cp -R release/SDL2.framework Frameworks
 
 # Copy files
 	cp release/*.icns "$(releaseFolder)/$(appName).app/Contents/Resources"
@@ -73,7 +83,7 @@ macos_release:
 # Build INTEL DMG
 	rm -f "$(executable)_macos_intel_$(version).dmg"
 	hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" 
-	hdiutil convert tmp.dmg -format UDZO -o "$(executable)_macos_intel_$(version).dmg"
+	hdiutil convert tmp.dmg -format UDZO -o "$(macosIntelRelease)"
 	rm tmp.dmg
 
 # Build APPLE SILICON	
@@ -82,7 +92,7 @@ macos_release:
 # Build APPLE SILICON DMG
 	rm -f "$(executable)_macos_apple_silicon_$(version).dmg"
 	hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" 
-	hdiutil convert tmp.dmg -format UDZO -o "$(executable)_macos_apple_silicon_$(version).dmg"
+	hdiutil convert tmp.dmg -format UDZO -o "$(macosAppleSiliconRelease)"
 	rm tmp.dmg
 
 # Remove data
@@ -115,7 +125,8 @@ linux_release:
 	strip -s -R .comment -R .gnu.version $(releaseFolder)/$(executable) --strip-unneeded
 
 # Pack files
-	cd $(releaseFolder) &&	tar -czvf ../$(executable)_linux_$(version).tar.gz *
+	rm -f $(linuxRelease)
+	cd $(releaseFolder) &&	tar -czvf ../$(linuxRelease) *
 
 # Remove data
 	rm -rdf $(releaseFolder)
\ No newline at end of file