var and function name changes

no functional changes, just cleaning up before taking a run at the refactor branch