HHH-8027 Switching classmate to provided scope