Renamed and harmonized packages