Fix lingering old-style variable names.