small mod on var names