hotspot2: fix class/function/variable names to comply with API guideline am: da8a67e8a6 am: 7fec249699
am: 57375308dc

Change-Id: I897cd2c051d7c4b3b5165114d975f5e7398f4556