diff --git a/scripts/rename_fw.py b/scripts/rename_fw.py
index 7b4d42299..c8a9a5a02 100644
--- a/scripts/rename_fw.py
+++ b/scripts/rename_fw.py
@@ -1,8 +1,7 @@
 #!/usr/bin/env python
-from subprocess import call
-import os
 Import("env")
 
 # see http://docs.platformio.org/en/latest/projectconf/advanced_scripting.html#before-pre-and-after-post-actions
 # env.Replace(PROGNAME="firmware_%s" % defines.get("VERSION"))
-env.Replace(PROGNAME="firmware_%s" % env['BOARD'])
+# print env.Dump()
+env.Replace(PROGNAME="firmware_%s" % env['BOARD'] + "_" + env['PIOENV'])