Changed name of some packages