Rename variable to avoid confusion of what class the object is

Change-Id: I335020de93f3fb0b78a303bff81516b819ce8194
Merge "Rename variable to avoid confusion of what class the object is"