configure: name some variables more consistently