Fixed old variable names.