MDL-47146 core_grades: fix class names (contd)

Part of: MDL-46576