Minor renaming of event name and a variable name

Change-Id: I5b00976235c50bf0b6776d4fdefe51139d320716