IOS Naming Change Conflict