gh-144285: Use "instead of" technique for clearer name suggestions

gh-144285: Use "instead of" technique for clearer name suggestions #234495