Shorten some class names