Fix incompletely renamed variables

Connection, et al, need to be specced out.