more packaging name tweaks