Remove package loop by some code duplication
Somewhat more consistent naming