[5.7] Fix API naming mismatches from proposals #582

Azoy merged 2 commits intoswiftlang:swift/release/5.7swiftlang/swift-experimental-string-processing:swift/release/5.7from

Azoy:last-fixes-57Azoy/swift-experimental-string-processing:last-fixes-57Copy head branch name to clipboard