added short names of classes