ref: 77dc5c65f28e9ee814eaad73479ed5c5d76a0a59
parent: a1168155a748c752b8b19cb539013d8f3cee2fd5
author: Paul Wilkins <paulwilkins@google.com>
date: Wed Aug 15 07:00:53 EDT 2012
Code clean up. Further cases of inconsistent naming convention. Change-Id: Id3411ecec6f01a4c889268a00f0c9fd5a92ea143