Fix names of class again