[Classes] Update classes used names