hotspot2: rename classes to comply with API guideline am: a77809766c am: c4f4a1ac9e
am: 9bddb8ccd8

Change-Id: I78d0edc46b89683832f26061f97f3ebebe245f93