Improve naming
Update use of tar functions