Rename variables according to camelCase convention.

Consolidate multiple variable declarations into a single hoist
statement.