replaced outdated variable names