Rename soinfo methods and fields

Change-Id: If68fbe287d3ad954238b1688f71013371f3f7fae
Merge "Rename soinfo methods and fields"