Fix interface name conflicts