Renames and cleanup; archive templates take flags as template parameter
Test fix. Revert: archive templates take flags as template parameter