Renamed packages to reflect changes in master branch