Also some renaming.
Created attachment 409871 [details] patch
Created attachment 409872 [details] patch
Created attachment 409873 [details] patch
Created attachment 409879 [details] patch
Committed r267697: <https://trac.webkit.org/changeset/267697> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409879 [details].
<rdar://problem/69696149>