Minor fixes to style/variable naming

Change-Id: I89452dca7d87c5de55af0227d33e3530d5fbfcb7