Fix some more naming violations

Test: presubmit
Bug: 134388083
Change-Id: I9e57476a171966d5e856dad643fbc3a1f479add5
5 files changed