Fix references to old variable names