Updated names of private variables
Merge remote-tracking branch 'origin/DavidWin' into Sherry