Renaming class members for improved readability

Renaming class members to reflect their true purpose

CRs-fixed: 601353

Change-Id: I1eb2bc111a52845c515d1b9ca10fb800402c7c3d
6 files changed