Completed Package remapping