Added "package_name_map" param