Name duplication conflict fix