Correct repackaged imports