need to rename packages to match "master" convention