Summary: Fix naming style to be consistent with the predominant hotspot style.
Reviewed-by: ysr, brutisso