Renamed packages to correct spec