Renamend some classes.