Renamed class and data structures for uniqueness.