More packaging headers
Rename private functions to use -- convention