rename packages to more appropriate names