Rename classes to shorter and more consistent names.