Merge "Consistent naming." into master-skia

https://skia.googlesource.com/skia/+/729b58296282da00fb9c0f92db2e2e8a8347d431

Change-Id: I86cd1c6c1063c1b7796786c10e5fe6ed07563128