Normalize RoundTrip imports to Roundtrip