If we are going to depreciate a vaiable name, at least change them all

Change-Id: I77639f76d94af9ab8c3739f2c4188d93032d3a04