Renamed packages adequately