Fix a couple of wrong variable names

Change-Id: I2a0cd21ee11c4bf0200eb43eae28f5096060f312