hotspot2: fix class/function/variable names to comply with API guideline am: da8a67e8a6 am: 7fec249699 am: 57375308dc
am: 97f04b5efa  -s ours

Change-Id: Ie33e7db651aa4de47ffcc06ab1e7cf93e94c3c48