Simplify the code to append the bits to the title as well as only apply it to packages when there are multiple instances.
