Tidy up package naming in products integration tests.