New model and model import use different naming conventions for overlapping names