Rename several variable/machine names

Change-Id: I12732a5360024d1cfa744c96f58e9c4ebfa212c6
Merge "Rename several variable/machine names"