SOS-1662 Fix compile problem when renaming variable