Package name changes to better reflect what is tested.