CBLT-82:  fix typos in variable expressions

Change-Id: I65b0ab57dff2f1b72a362ada6d32476c030d1237