Fix default names for saving