Removed underscores from the end of some variables

Change-Id: Iff664cef5ec580de6a33db1503a6e567701418a3