Change variable names to match other code changes
Change variable names to match other code changes

Some variable names were updated in the solver while this PR was outstanding; now fixed.

econ-ark/HARK,econ-ark/HARK