Rename remaining symbols to avoid linker issues.