Refactoring: named vars are now called base vars