STYLE: Fix member variable names

Change-Id: I70e2178d8ed0ccc82e9483036c4f572583d9951f
Merge topic 'MemberVariableNames'

4124acc STYLE: Fix member variable names