More fixes to class naming.