Fix missing variable renames