Get rid of old variable names