Update references to new variable names

Signed-off-by: Bimal Yashodha <kb.yashodha@gmail.com>