Some classes were renamed