Replace className scope with name into class
#3038
Merged
className scope with name into class
#3038