Updated naming for classes