Updating some comments and variables

Change-Id: Ib3223c66e9ce187cebc6ce26a46b228f95787778
6 files changed