Improve archive naming