Renaming packages appropriately