Fix package shadowing order (#4072)