fixed some classes & names