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

Change-Id: Ib37832f30b5174f52e71ef2e3f796c669ba7bda9