Added name and version to file names