Renamed Model::Package as Model::PackageExpr.