fix #23366 2nd batch

Almost certainly a 3rd batch to follow, for many of the CamelCase
strings