Rework package identifier handling