Fixed the filenames for saving