diff --git a/client/luascripts/calc_di.lua b/client/luascripts/calc_di.lua
index 7b8c304db..416a3dd0f 100644
--- a/client/luascripts/calc_di.lua
+++ b/client/luascripts/calc_di.lua
@@ -71,11 +71,14 @@ local function exitMsg(msg)
 end
 ---
 -- dumps all keys to file
-local function dumptofile(keys)
+local function dumptofile(uid, keys)
     dbg('dumping keys to file')
 
     if utils.confirm('Do you wish to save the keys to dumpfile?') then
-        local destination = utils.input('Select a filename to store to', 'dumpkeys.bin')
+    
+        local filename = ('hf-mf-%s-key.bin'):format(uid);
+    
+        local destination = utils.input('Select a filename to store to', filename)
         local file = io.open(destination, 'wb')
         if file == nil then
             print('Could not write to file ', destination)
@@ -172,7 +175,7 @@ local function main(args)
 
     local keys, err = createKeys( uid )
     printKeys( keys )
-    dumptofile( keys )
+    dumptofile( uid, keys )
 end
 
 main(args)
diff --git a/client/luascripts/calc_mizip.lua b/client/luascripts/calc_mizip.lua
index f0c76bc57..bff493131 100644
--- a/client/luascripts/calc_mizip.lua
+++ b/client/luascripts/calc_mizip.lua
@@ -76,11 +76,12 @@ local function exitMsg(msg)
 end
 --
 -- dumps all keys to file
-local function dumptofile(keys)
+local function dumptofile(uid, keys)
     dbg('dumping keys to file')
 
     if utils.confirm('Do you wish to save the keys to dumpfile?') then
-        local destination = utils.input('Select a filename to store to', 'dumpkeys.bin')
+        local filename = ('hf-mf-%s-key.bin'):format(uid);
+        local destination = utils.input('Select a filename to store to', filename)
         local file = io.open(destination, 'wb')
         if file == nil then
             print('Could not write to file ', destination)
@@ -194,7 +195,7 @@ local function main(args)
 
     local keys, err = createKeys( uid )
     printKeys( keys )
-    dumptofile( keys )
+    dumptofile( uid, keys )
 end
 
 main(args)
diff --git a/client/luascripts/mfckeys.lua b/client/luascripts/mfckeys.lua
index 128967c37..32808b62d 100644
--- a/client/luascripts/mfckeys.lua
+++ b/client/luascripts/mfckeys.lua
@@ -159,9 +159,10 @@ end
 end
 --
 -- dumps all keys to file
-local function dumptofile(keys)
+local function dumptofile(uid, keys)
     if utils.confirm('Do you wish to save the keys to dumpfile?') then
-        local destination = utils.input('Select a filename to store to', 'dumpkeys.bin')
+        local filename = ('hf-mf-%s-key.bin'):format(uid);
+        local destination = utils.input('Select a filename to store to', filename)
         local file = io.open(destination, 'wb')
         if file == nil then
             print('Could not write to file ', destination)
@@ -192,7 +193,7 @@ local function printkeys()
 end
 ---
 --
-local function perform_check(numsectors)
+local function perform_check(uid, numsectors)
 
     local keyType = 0 -- A=0, B=1
 
@@ -237,7 +238,7 @@ local function perform_check(numsectors)
     display_results(keys)
 
     -- save to dumpkeys.bin
-    dumptofile(keys)
+    dumptofile(uid, keys)
 end
 --
 -- shows tag information
@@ -282,7 +283,7 @@ local function main(args)
     -- detect sectors and print taginfo
     numsectors = taginfo(tag)
 
-    perform_check(numsectors)
+    perform_check(tag.uid, numsectors)
 end
 
 main( args)
diff --git a/client/luascripts/mifare_autopwn.lua b/client/luascripts/mifare_autopwn.lua
index 2c9146e2b..624cea419 100644
--- a/client/luascripts/mifare_autopwn.lua
+++ b/client/luascripts/mifare_autopwn.lua
@@ -97,7 +97,7 @@ local function nested(key,sak)
     core.console(cmd)
 end
 
-local function dump(uid, numsectors)
+local function dump_tag(uid, numsectors)
     dbg('dumping tag memory')
 
     local typ = 1
@@ -203,7 +203,7 @@ local function main(args)
                 -- Use nested attack
                 nested(key, sak)
                 -- Dump info
-                dump(uid, sak)
+                dump_tag(uid, sak)
 
                 if #key == 12 then _exit = true end
             else
diff --git a/client/luascripts/tnp3dump.lua b/client/luascripts/tnp3dump.lua
index 488d2f5f9..9a7a9bc8f 100644
--- a/client/luascripts/tnp3dump.lua
+++ b/client/luascripts/tnp3dump.lua
@@ -109,7 +109,6 @@ local function main(args)
     local useNested = false
     local usePreCalc = false
     local cmdReadBlockString = 'hf mf rdbl %d A %s'
-    local input = "dumpkeys.bin"
     local outputTemplate = os.date("toydump_%Y-%m-%d_%H%M%S");
 
     -- Arguments for the script
@@ -132,13 +131,13 @@ local function main(args)
     core.console( cmdSetDbgOff)
     utils.Sleep(0.5)
 
-    result, err = lib14a.read(false, true)
-    if not result then return oops(err) end
+    tag, err = lib14a.read(false, true)
+    if not tag then return oops(err) end
 
     core.clearCommandBuffer()
 
     -- Show tag info
-    print((' Found tag %s'):format(result.name))
+    print((' Found tag %s'):format(tag.name))
 
     dbg(('Using keyA : %s'):format(keyA))
 
@@ -152,13 +151,18 @@ local function main(args)
     local akeys = ''
     if usePreCalc then
         local pre = require('precalc')
-        akeys = pre.GetAll(result.uid)
+        akeys = pre.GetAll(tag.uid)
         dbg(akeys)
     else
-        print('Loading dumpkeys.bin')
-        local hex, err = utils.ReadDumpFile(input)
+        local filename = ('hf-mf-%s-key.bin'):format(tag.uid);
+        print('loading '..filename)
+        local hex, err = utils.ReadDumpFile(filename)
         if not hex then
-            return oops(err)
+            print('loading dumpkeys.bin')
+            hex, err = utils.ReadDumpFile('dumpkeys.bin')
+            if not hex then
+                return oops(err)
+            end
         end
         akeys = hex:sub(0,12*16)
     end