Cleanup more auto mapping names 
# What does this PR do?

Just a follow-up PR of #21903.

Rebase on main once #21911 (or a fix from your side) being merged will be OK.
_The documentation is not available anymore as the PR was closed or merged._