more correct names for classes