More cleanup prior to unhiding

Rename public SubInfoRecord instance variables

Change-Id: I25a56d779c63a3f483d7a43c5c123404bf489fa3
1 file changed