- allow simple passing of the label bools for this
- rename member to match code conventions while at it

Change-Id: I1e754f7f09cd28197185c294a3a8deefc29d05c3