Variable name changes, prep work for PiP writing code.