Add -package-id, improve package shadowing behaviour and error messages