Merge "Change default backup filename and terminology"