Simplify final package name

This is mostly because I have a personal script on my laptop that will deal with it in a few ways, and this makes things easier for the script.

Once I get the script tweaked more, and add some features, I might release it to the public, or include it in the source sync.