fix #23366: some more capitalization issues