Issue #21818: Fixed references to classes that have names matching with module
names.
27 files changed