Variable name fixes

Change-Id: Id147cffd39bea3ddbd118cd71f1f428895dbe3fa