rename packages and test