Change var names to match formatting