Change logic of creating name for new files