Merge pull request #119086 from KoBeWi/typical_naming_issue