change variable/function to better name (re #926)