Added methods and class for type conflict renaming