[SF] Rename variables to match style

This CL renames the variables so they are more readable and changes
snake case to camel case.

Test: m
Bug: 153991408
Change-Id: I80faa91ab514395dbf53c52282d62444c9aa579a
3 files changed