Repackage and rename everything