minor var name changes