Change class and variable names
am: 49ceee408c

Change-Id: I5aa36054eafd5572f576b6fdaf9aeb184a05e99f