fix #23366: more fixes for capitalization

and some more fixes.