Update naming of variables in helper