Description and names of classes improved