Clean up var naming
2 files changed