PIM-3323: Variable renaming