Fixed some of the remaining terminology to Connection