Made the naming of classes more consistent.