Update var names
4 files changed