Rename symbols to avoid conflicts