fix type collisions with generated code