Package adjustments and renaming