Correct package mapping