Changed the package and source names