Updating filenames to follow convention