Classes Renamed

Renamed according to logical naming convention