Updated naming of archive handling