update to variable names used w/ jjb

Change-Id: I07ea0ca74f14c0c4f8afa6b1ffe127b11bfd1b34