Merge "Better naming for created archives." into arc-apps