Rename symbols that were causing a conflict in simulator builds