Changed save calls to function calls to use dynamically generated
strings as filenames