adjust variable names to match new specs