MCOP-67 make variable name more helpful
MCOP-67 fix syntax per comment on PR
MCOP-67 - fix previous commit