Correct remaining variables names changes

Change-Id: I70b3fec54941171f31c9675863e346fd3a031aa2