Rename variables to reflect linker split (NFC)