[Hexagon] Renaming classes in preparation for replacement.