make more variables consistently-named