main
Reduce the use of class names (#16326)
Avoid using CJS globals in internal source files (#12963)