corrected package names according to new nomenclature