Merge "Adjust strings in modes list to match latest mocks" into main