Fix: Rename vars

Change-Id: Ia7d5be8a9a39ccde1cf4fcfc586ab3d6c88501c0