Adapt variables to C naming convention.

Change-Id: I107e8a17b029b74de6b89385c6961859262e1bb6