Fixed names for classes.