fixing naming overlap in integration tests