Clean up var names