Code refactoring, no behavior change.

Changed a couple of member variables to be more descriptive.  Unified setting of signature metadata into one function.

Change-Id: I4b4730d8159b8a67a4d9d39713dc2bec8eb8d01a
3 files changed