Fix variable and method names

Change-Id: I2f02dbeaa61e959d9420410100c6e958580a6567