some changes in the package names